This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from a9caee3c6f8 add readratemax and writeratemax (#9227) add ed86dc973b1 protect against missing service offering (#9235) add 00fe25ab01c Fix allocation of VMs with multiple clusters (#8611) add 96288ecf1fa fix: domain limits tab ui is now able to present 0 to the user (#9166) add bb0c1f93afe Add volume encryption checks during the disk offering change (#9209) add 7e71e505788 [Quota] Improve Quota balance calculation flow (#8581) add f360f7048da vmware: do not tear down vm disks if deploy-as-is vm has vm snapshots (#9243) add 591cc4f0027 Add action button to enable/disable Oauth provider (#9242) add a10eee25b34 Add method for decrypting values accordingly (#9088) add 75341963614 UI: Fix Userdata registration from UI (#8791) add 6c7426e3a7e Prevent network disruption on adding a VPC tier for redundant VRs (#9251) add 4e7c6682fd4 While starting VM with considerlasthost enabled, don't load host tags/details for the last host when it doesn't exist (#9037) add 56b69b157ea prevent duplicate ip table rules in SSVM (#8530) add 7c5b7ca0777 Extra parameter for UpdateImageStore (#8941) add 050ee44137a Merge branch '4.18' into 4.19 new 373f0170020 Merge branch '4.19' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../network/VpcVirtualNetworkApplianceService.java | 22 ++- .../java/com/cloud/storage/StorageService.java | 3 + .../command/admin/storage/UpdateImageStoreCmd.java | 21 ++- .../api/response/ImageStoreResponse.java | 14 +- .../agent/resource/virtualnetwork/VRScripts.java | 1 + .../virtualnetwork/VirtualRoutingResource.java | 19 ++ .../agent/routing/ManageServiceCommand.java} | 26 +-- .../subsystem/api/storage/VolumeService.java | 2 + .../java/com/cloud/storage/StorageManager.java | 2 + .../com/cloud/domain/dao/DomainDetailsDao.java | 2 + .../com/cloud/domain/dao/DomainDetailsDaoImpl.java | 15 +- .../com/cloud/service/dao/ServiceOfferingDao.java | 4 +- .../cloud/service/dao/ServiceOfferingDaoImpl.java | 4 +- .../java/com/cloud/user/AccountDetailsDao.java | 2 + .../java/com/cloud/user/AccountDetailsDaoImpl.java | 15 +- .../storage/volume/VolumeServiceImpl.java | 80 +++++---- .../storage/volume/VolumeServiceTest.java | 72 ++++++-- .../apache/cloudstack/quota/QuotaManagerImpl.java | 102 +++++------ .../manager/allocator/impl/RandomAllocator.java | 16 +- .../hypervisor/vmware/resource/VmwareResource.java | 4 +- .../cloudstack/oauth2/OAuth2AuthManagerImpl.java | 12 +- .../manager/allocator/impl/FirstFitAllocator.java | 46 +++-- .../allocator/impl/RecreateHostAllocator.java | 3 +- server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 2 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 24 ++- .../deploy/DeploymentPlanningManagerImpl.java | 61 ++++--- .../java/com/cloud/deploy/FirstFitPlanner.java | 18 +- .../network/element/VpcVirtualRouterElement.java | 91 +++++----- .../VpcVirtualNetworkApplianceManagerImpl.java | 50 ++++++ .../com/cloud/server/ManagementServerImpl.java | 103 ++++++----- .../main/java/com/cloud/server/StatsCollector.java | 17 +- .../java/com/cloud/storage/StorageManagerImpl.java | 75 ++++---- .../com/cloud/storage/VolumeApiServiceImpl.java | 4 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 7 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 42 ----- .../vpc/MockVpcVirtualNetworkApplianceManager.java | 14 ++ .../SecondaryStorageManagerImpl.java | 4 +- .../storage/resource/IpTablesHelper.java | 67 ++++++++ .../resource/NfsSecondaryStorageResource.java | 24 +-- .../storage/template/DownloadManagerImpl.java | 40 ++--- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 2 +- .../debian/opt/cloud/bin/manage_service.sh | 6 +- .../plugins/quota/test_quota_balance.py | 191 +++++++++++++++++++++ ui/public/locales/en.json | 1 + ui/src/components/view/ResourceLimitTab.vue | 1 + ui/src/config/section/config.js | 20 ++- ui/src/config/section/infra/secondaryStorages.js | 17 +- ui/src/utils/plugins.js | 12 +- ui/src/views/AutogenView.vue | 1 - ui/src/views/compute/RegisterUserData.vue | 9 +- .../java/com/cloud/usage/UsageManagerImpl.java | 7 +- .../main/java/com/cloud/utils/script/Script.java | 11 +- 53 files changed, 955 insertions(+), 457 deletions(-) copy core/src/main/java/{com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java => org/apache/cloudstack/agent/routing/ManageServiceCommand.java} (67%) create mode 100644 services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/IpTablesHelper.java copy core/src/main/resources/META-INF/cloudstack/allocator/module.properties => systemvm/debian/opt/cloud/bin/manage_service.sh (95%) mode change 100644 => 100755 create mode 100644 test/integration/plugins/quota/test_quota_balance.py