This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-integration in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d8998d083313e96f6853a430a3bb6f7f4f804a10 Merge: e0244e2f56c 7cdf864c71d Author: Pearl Dsilva <[email protected]> AuthorDate: Thu Aug 24 06:36:29 2023 -0400 Merge branch 'main' of https://github.com/apache/cloudstack into nsx-integration .github/workflows/linter.yml | 19 -- .pre-commit-config.yaml | 31 ++- README.md | 2 +- .../main/java/com/cloud/hypervisor/Hypervisor.java | 18 +- .../java/com/cloud/hypervisor/HypervisorGuru.java | 5 + .../com/cloud/network/as/AutoScaleVmProfile.java | 4 + api/src/main/java/com/cloud/storage/GuestOS.java | 2 + .../java/org/apache/cloudstack/api/BaseCmd.java | 17 ++ .../api/command/admin/guest/AddGuestOsCmd.java | 8 +- .../api/command/admin/guest/UpdateGuestOsCmd.java | 11 +- .../admin/internallb/StopInternalLBVMCmd.java | 2 +- .../api/command/admin/router/StopRouterCmd.java | 2 +- .../command/admin/systemvm/StopSystemVmCmd.java | 2 +- .../autoscale/CreateAutoScaleVmProfileCmd.java | 15 ++ .../autoscale/UpdateAutoScaleVmProfileCmd.java | 17 ++ .../api/command/user/guest/ListGuestOsCmd.java | 14 +- .../api/command/user/network/CreateNetworkCmd.java | 4 +- .../command/user/snapshot/CreateSnapshotCmd.java | 2 +- .../command/user/template/RegisterTemplateCmd.java | 9 +- .../api/command/user/vm/DeployVMCmd.java | 28 +-- .../api/command/user/vm/ResetVMUserDataCmd.java | 16 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 15 +- .../cloudstack/api/command/user/vm/StopVMCmd.java | 3 +- .../api/command/user/vm/UpdateVMCmd.java | 14 +- .../api/command/user/vm/UpgradeVMCmd.java | 15 +- .../api/command/user/volume/CreateVolumeCmd.java | 3 +- .../api/command/user/volume/UploadVolumeCmd.java | 2 +- .../api/response/AutoScaleVmProfileResponse.java | 48 ++++ .../cloudstack/api/response/BackupResponse.java | 10 +- .../api/response/BackupRestorePointResponse.java | 10 +- .../cloudstack/api/response/GuestOSResponse.java | 12 + .../api/response/HostForMigrationResponse.java | 5 +- .../cloudstack/api/response/HostResponse.java | 7 +- .../response/HypervisorCapabilitiesResponse.java | 7 +- .../cloudstack/api/response/UserVmResponse.java | 2 +- .../api/response/VMSnapshotResponse.java | 7 +- .../java/org/apache/cloudstack/backup/Backup.java | 14 +- .../engine/orchestration/VolumeOrchestrator.java | 18 +- .../dao/HypervisorCapabilitiesDaoImpl.java | 7 + .../com/cloud/network/as/AutoScaleVmProfileVO.java | 24 ++ .../com/cloud/storage/GuestOSHypervisorVO.java | 3 +- .../src/main/java/com/cloud/storage/GuestOSVO.java | 14 ++ .../java/com/cloud/storage/dao/GuestOSDao.java | 11 +- .../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 78 ++++++- .../cloud/storage/dao/GuestOSHypervisorDao.java | 8 +- .../storage/dao/GuestOSHypervisorDaoImpl.java | 8 +- .../main/java/com/cloud/upgrade/GuestOsMapper.java | 126 +++++++++- .../com/cloud/upgrade/dao/Upgrade41800to41810.java | 131 +++++++++++ .../com/cloud/upgrade/dao/Upgrade41810to41900.java | 111 +++++++++ .../org/apache/cloudstack/backup/BackupVO.java | 12 +- .../resources/META-INF/db/schema-41720to41800.sql | 2 + .../resources/META-INF/db/schema-41800to41810.sql | 11 + .../cloud/network/as/AutoScaleVmProfileVOTest.java | 31 +++ .../src/test/resources/component.xml | 5 + packaging/centos8/cloud.spec | 2 +- .../acl/StaticRoleBasedAPIAccessChecker.java | 10 +- .../NonStrictHostAntiAffinityProcessorTest.java | 4 +- .../command/admin/ratelimit/ResetApiLimitCmd.java | 2 +- .../cloudstack/backup/DummyBackupProvider.java | 2 +- .../cloudstack/backup/NetworkerBackupProvider.java | 11 +- .../backup/networker/NetworkerClient.java | 10 +- .../cloudstack/backup/veeam/VeeamClient.java | 10 +- .../java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +- .../cloud/hypervisor/guru/VmwareVmImplementer.java | 16 +- .../hypervisor/vmware/resource/VmwareResource.java | 21 +- .../hypervisor/guru/VmwareVmImplementerTest.java | 46 ++++ .../cloudstack/metrics/MetricsServiceImpl.java | 12 +- .../cloudstack/response/HostMetricsResponse.java | 14 +- .../src/main/resources/components-example.xml | 1 + .../com/cloud/api/commands/StopNetScalerVMCmd.java | 2 +- .../api/command/ListTungstenFabricTagCmd.java | 2 +- .../util/ListElastistorVolumeResponse.java | 2 +- .../api/response/LdapConfigurationResponse.java | 2 +- .../api/response/LinkAccountToLdapResponse.java | 2 +- .../api/response/LinkDomainToLdapResponse.java | 2 +- .../java/com/cloud/api/ApiAsyncJobDispatcher.java | 6 + server/src/main/java/com/cloud/api/ApiDBUtils.java | 5 +- .../main/java/com/cloud/api/ApiResponseHelper.java | 28 ++- server/src/main/java/com/cloud/api/ApiServer.java | 3 + .../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 2 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 8 +- .../com/cloud/api/query/ViewResponseHelper.java | 29 ++- .../api/query/dao/DomainRouterJoinDaoImpl.java | 2 +- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 10 +- .../api/query/dao/StoragePoolJoinDaoImpl.java | 4 +- .../cloud/api/query/dao/TemplateJoinDaoImpl.java | 4 +- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 12 +- .../configuration/ConfigurationManagerImpl.java | 18 ++ .../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +- .../discoverer/CustomServerDiscoverer.java | 22 +- .../com/cloud/network/as/AutoScaleManagerImpl.java | 53 ++++- .../network/security/SecurityGroupManagerImpl.java | 2 +- .../security/SecurityGroupManagerImpl2.java | 2 +- .../com/cloud/resource/ResourceManagerImpl.java | 5 +- .../com/cloud/server/ManagementServerImpl.java | 67 ++---- .../cloud/template/HypervisorTemplateAdapter.java | 16 +- .../com/cloud/template/TemplateManagerImpl.java | 10 +- .../java/com/cloud/user/AccountManagerImpl.java | 7 +- .../src/main/java/com/cloud/vm/UserVmManager.java | 6 + .../main/java/com/cloud/vm/UserVmManagerImpl.java | 82 ++++++- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +- .../spring-server-discoverer-context.xml | 5 + .../java/com/cloud/api/ApiResponseHelperTest.java | 72 ++++++ .../cloud/network/as/AutoScaleManagerImplTest.java | 75 +++++- .../com/cloud/user/AccountManagerImplTest.java | 13 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 29 ++- .../src/test/java/common/ClientTest.java | 8 +- .../org.mockito.plugins.MockMaker | 1 + .../consoleproxy/ConsoleProxyNoVncClient.java | 12 +- .../ConsoleProxyHttpHandlerHelperTest.java | 33 ++- .../org.mockito.plugins.MockMaker | 1 + .../resource/NfsSecondaryStorageResourceTest.java | 46 ++-- .../org.mockito.plugins.MockMaker | 1 + test/integration/smoke/test_internal_lb.py | 7 +- test/integration/smoke/test_vm_autoscaling.py | 69 ++++++ tools/apidoc/build-apidoc.sh | 8 +- ui/package-lock.json | 2 +- ui/package.json | 2 +- ui/public/locales/en.json | 3 +- ui/src/components/header/ProjectMenu.vue | 1 + ui/src/components/view/ListResourceTable.vue | 5 + ui/src/config/section/image.js | 2 +- ui/src/config/section/infra/hosts.js | 4 +- ui/src/store/getters.js | 3 +- ui/src/store/modules/user.js | 27 ++- ui/src/views/compute/AutoScaleVmProfile.vue | 92 ++++++-- ui/src/views/compute/CreateAutoScaleVmGroup.vue | 257 +++++++++++++++++++-- ui/src/views/compute/ResetUserData.vue | 10 +- ui/src/views/image/RegisterOrUploadIso.vue | 149 ++++++++++-- ui/src/views/image/RegisterOrUploadTemplate.vue | 178 ++++++++++++-- ui/src/views/image/TemplateZones.vue | 17 ++ ui/src/views/infra/zone/ZoneWizardAddResources.vue | 7 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +- ui/src/views/network/CreateVlanIpRange.vue | 4 +- ui/src/views/network/GuestIpRanges.vue | 129 +++++++++-- .../apache/cloudstack/utils/CloudStackVersion.java | 17 ++ .../cloudstack/utils/CloudStackVersionTest.java | 20 ++ 138 files changed, 2406 insertions(+), 499 deletions(-)
