This is an automated email from the ASF dual-hosted git repository. weizhou pushed a change to branch healthcheck-main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 477820a15df 4.20/main Health Check, please don't merge this! add d5ba23c8482 Introduce volume allocation algorithm global configuration (#10696) add b17808bfba1 Introducing Storage Access Groups for better management for host and storage connections (#10381) add 95489b8bddf Direct agents rebalance improvements with multiple management server nodes (#10674) add 52d986081b3 Updated Endpoint Selector to pick the Cluster in Enabled state (in addition to Host state) (#10757) add d55aa70f7ef Restore single backed-up volume on a live instance attaches the volume as a Raw image making it unreadable (#10844) add 3df83da86c7 Get backup offering details from listVirtualMachinesMetrics in UI (#10867) add 4259e0b51bf linstor: fix host connect recursion regression (#10878) add 8d3ae3e0574 [Vmware] Improve listing of Vmware Datacenter VMs for migration to KVM (#10770) add a4cce70e284 List usage records for network offering (usage type 13) when offering id is specified in usage id (#10852) add 005afde24ec ssvm: reset fields on destroy (#10253) add f199783c751 VMware import - logs sanitation (#10433) add 1507a5633e7 Correct typo in exception (#10876) add 13ab8a04d13 Fix for Vlan doesn't match issue while adding IP range for the shared network without any IP range (#10837) add c183fc9859e Prevent data corruption for StorPool volumes (#10799) add 112dfddd40b Reset the pool id when create volume fails on the allocated pool, and update the resize error when no endpoint exists (#10777) add 951863c3fe9 ui: add an infinite scroll select component (#10840) add 39a0ba96704 Fix issue with security group selection box display (#10849) add 8f8c685d178 Merge branch '4.19' into 4.20 add 90316b2e90f VMware 80u2 and 80u3 updates/fixes (#10586) add badf3e18dae test: Update test ubuntu template for VMware to deployasis=False (#10881) add 538e35f8adb test: fix test_restore_vm failure on vmware (#10885) add 5444261902a test: fix several simulator CI failures (#10890) add 842b2f8c243 Merge remote-tracking branch 'apache/4.20' add 96b8e23767e kvm: fix vm deployment from RAW template (#10880) add fb49fd42d89 Merge branch 'main' into healthcheck-main No new revisions were added by this update. Summary of changes: .../cloud/configuration/ConfigurationService.java | 3 +- api/src/main/java/com/cloud/dc/Pod.java | 2 + .../com/cloud/deploy/DeploymentClusterPlanner.java | 2 +- api/src/main/java/com/cloud/event/EventTypes.java | 1 + api/src/main/java/com/cloud/host/Host.java | 2 + api/src/main/java/com/cloud/org/Cluster.java | 2 + .../java/com/cloud/resource/ResourceService.java | 7 + .../java/com/cloud/storage/StorageService.java | 3 + .../org/apache/cloudstack/api/ApiConstants.java | 5 + .../apache/cloudstack/api/ResponseGenerator.java | 4 + .../api/command/admin/cluster/AddClusterCmd.java | 10 + .../api/command/admin/cluster/ListClustersCmd.java | 17 + .../command/admin/cluster/UpdateClusterCmd.java | 2 +- .../api/command/admin/host/AddHostCmd.java | 10 + .../api/command/admin/host/ListHostsCmd.java | 17 + .../api/command/admin/pod/CreatePodCmd.java | 14 +- .../api/command/admin/pod/ListPodsByCmd.java | 17 + .../admin/storage/ConfigureStorageAccessCmd.java | 135 ++++ .../admin/storage/CreateStoragePoolCmd.java | 8 + ...agsCmd.java => ListStorageAccessGroupsCmd.java} | 19 +- .../command/admin/storage/ListStoragePoolsCmd.java | 17 +- .../api/command/admin/zone/CreateZoneCmd.java | 11 + .../api/command/user/zone/ListZonesCmd.java | 17 + .../cloudstack/api/response/ClusterResponse.java | 36 + .../cloudstack/api/response/HostResponse.java | 48 ++ .../cloudstack/api/response/PodResponse.java | 24 + .../api/response/ServiceOfferingResponse.java | 2 +- .../api/response/StorageAccessGroupResponse.java | 108 +++ .../api/response/StoragePoolResponse.java | 12 + .../api/response/UnmanagedInstanceResponse.java | 24 + .../cloudstack/api/response/ZoneResponse.java | 20 +- .../org/apache/cloudstack/query/QueryService.java | 4 + .../apache/cloudstack/vm/UnmanagedInstanceTO.java | 19 + .../api/agent/test/CheckOnHostCommandTest.java | 5 + .../service/VolumeOrchestrationService.java | 11 + .../api/storage/PrimaryDataStoreParameters.java | 16 + .../api/storage/StoragePoolAllocator.java | 1 + .../cloud/configuration/ConfigurationManager.java | 9 +- .../java/com/cloud/resource/ResourceManager.java | 10 + .../java/com/cloud/storage/StorageManager.java | 5 + .../agent/manager/ClusteredAgentManagerImpl.java | 50 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 13 + .../datacenter/entity/api/db/EngineClusterVO.java | 8 + .../datacenter/entity/api/db/EngineHostPodVO.java | 8 + .../datacenter/entity/api/db/EngineHostVO.java | 12 + .../engine/orchestration/VolumeOrchestrator.java | 22 +- .../manager/ClusteredAgentManagerImplTest.java | 150 ++++ .../orchestration/VolumeOrchestratorTest.java | 390 +++++++++- .../java/com/cloud/capacity/dao/CapacityDao.java | 2 +- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 11 +- .../src/main/java/com/cloud/dc/ClusterVO.java | 12 + .../src/main/java/com/cloud/dc/DataCenterVO.java | 11 + .../src/main/java/com/cloud/dc/HostPodVO.java | 11 + .../src/main/java/com/cloud/dc/dao/ClusterDao.java | 2 + .../main/java/com/cloud/dc/dao/ClusterDaoImpl.java | 32 + .../main/java/com/cloud/dc/dao/DataCenterDao.java | 2 + .../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 33 + .../src/main/java/com/cloud/dc/dao/HostPodDao.java | 2 + .../main/java/com/cloud/dc/dao/HostPodDaoImpl.java | 32 + .../src/main/java/com/cloud/host/HostVO.java | 12 + .../src/main/java/com/cloud/host/dao/HostDao.java | 10 + .../main/java/com/cloud/host/dao/HostDaoImpl.java | 94 ++- .../StoragePoolAndAccessGroupMapVO.java} | 48 +- ...o.java => StoragePoolAndAccessGroupMapDao.java} | 17 +- .../dao/StoragePoolAndAccessGroupMapDaoImpl.java | 105 +++ .../storage/datastore/db/PrimaryDataStoreDao.java | 20 +- .../datastore/db/PrimaryDataStoreDaoImpl.java | 220 +++++- ...n-daos-between-management-and-usage-context.xml | 1 + .../resources/META-INF/db/schema-42010to42100.sql | 15 + .../META-INF/db/views/cloud.data_center_view.sql | 1 + .../META-INF/db/views/cloud.host_view.sql | 4 + .../META-INF/db/views/cloud.storage_pool_view.sql | 24 +- .../cloud/capacity/dao/CapacityDaoImplTest.java | 266 ++++++- .../motion/StorageSystemDataMotionStrategy.java | 74 +- .../allocator/AbstractStoragePoolAllocator.java | 84 ++- .../ClusterScopeStoragePoolAllocator.java | 38 +- .../allocator/ZoneWideStoragePoolAllocator.java | 19 +- .../storage/endpoint/DefaultEndPointSelector.java | 2 +- .../volume/datastore/PrimaryDataStoreHelper.java | 19 +- .../AbstractStoragePoolAllocatorTest.java | 88 ++- .../ZoneWideStoragePoolAllocatorTest.java | 71 ++ .../datastore/provider/DefaultHostListener.java | 39 +- .../storage/volume/VolumeServiceImpl.java | 24 +- .../cloudstack/backup/NASBackupProvider.java | 2 + .../LibvirtRestoreBackupCommandWrapper.java | 2 +- .../kvm/storage/LibvirtStorageAdaptor.java | 4 +- .../vmware/manager/VmwareManagerImpl.java | 91 ++- .../hypervisor/vmware/resource/VmwareResource.java | 132 ++-- .../resource/VmwareStorageLayoutHelper.java | 40 +- .../storage/resource/VmwareStorageProcessor.java | 30 +- .../api/command/admin/zone/ListVmwareDcVmsCmd.java | 19 + .../contrail/management/ManagementServerMock.java | 2 +- .../allocator/RandomStoragePoolAllocator.java | 2 +- .../ElastistorPrimaryDataStoreLifeCycle.java | 26 +- .../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 40 +- .../CloudStackPrimaryDataStoreDriverImpl.java | 11 +- .../CloudStackPrimaryDataStoreLifeCycleImpl.java | 29 +- ...loudStackPrimaryDataStoreLifeCycleImplTest.java | 12 +- .../LinstorPrimaryDataStoreLifeCycleImpl.java | 26 +- .../datastore/provider/LinstorHostListener.java | 4 +- .../NexentaPrimaryDataStoreLifeCycle.java | 19 +- .../ScaleIOPrimaryDataStoreLifeCycle.java | 78 +- .../ScaleIOPrimaryDataStoreLifeCycleTest.java | 16 +- .../SolidFirePrimaryDataStoreLifeCycle.java | 26 +- .../SolidFireSharedPrimaryDataStoreLifeCycle.java | 20 +- .../StorPoolPrimaryDataStoreLifeCycle.java | 10 +- .../manager/allocator/impl/FirstFitAllocator.java | 39 +- server/src/main/java/com/cloud/api/ApiDBUtils.java | 12 + .../main/java/com/cloud/api/ApiResponseHelper.java | 30 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 182 ++++- .../com/cloud/api/query/ViewResponseHelper.java | 31 +- .../com/cloud/api/query/dao/DataCenterJoinDao.java | 2 + .../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 10 + .../java/com/cloud/api/query/dao/HostJoinDao.java | 2 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 15 + .../cloud/api/query/dao/StoragePoolJoinDao.java | 2 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 41 +- .../com/cloud/api/query/vo/DataCenterJoinVO.java | 9 +- .../java/com/cloud/api/query/vo/HostJoinVO.java | 28 + .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 7 + .../configuration/ConfigurationManagerImpl.java | 129 ++-- .../deploy/DeploymentPlanningManagerImpl.java | 9 +- .../com/cloud/resource/ResourceManagerImpl.java | 793 ++++++++++++++++++++- .../com/cloud/server/ManagementServerImpl.java | 35 + .../java/com/cloud/storage/StorageManagerImpl.java | 388 +++++++++- .../com/cloud/storage/VolumeApiServiceImpl.java | 15 + .../cloud/storage/listener/StoragePoolMonitor.java | 68 +- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- .../java/com/cloud/usage/UsageServiceImpl.java | 17 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 52 +- .../allocator/impl/FirstFitAllocatorTest.java | 159 +++++ .../configuration/ConfigurationManagerTest.java | 8 +- .../cloud/resource/MockResourceManagerImpl.java | 40 ++ .../cloud/resource/ResourceManagerImplTest.java | 591 +++++++++++++++ .../com/cloud/storage/StorageManagerImplTest.java | 639 ++++++++++++++++- .../cloud/storage/VolumeApiServiceImplTest.java | 2 + .../storage/listener/StoragePoolMonitorTest.java | 31 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 131 +++- .../cloud/vpc/MockConfigurationManagerImpl.java | 8 +- .../networkoffering/ChildTestConfiguration.java | 6 + .../src/test/resources/createNetworkOffering.xml | 1 + .../SecondaryStorageManagerImpl.java | 8 +- test/integration/smoke/test_restore_vm.py | 10 +- test/integration/smoke/test_ssvm.py | 6 + tools/apidoc/gen_toc.py | 2 + tools/marvin/marvin/config/test_data.py | 6 +- ui/.env.qa | 1 + ui/public/locales/en.json | 11 + ui/src/components/header/ProjectMenu.vue | 117 ++- ui/src/components/widgets/InfiniteScrollSelect.vue | 298 ++++++++ ui/src/config/section/infra/clusters.js | 10 +- ui/src/config/section/infra/hosts.js | 2 +- ui/src/config/section/infra/pods.js | 5 +- ui/src/config/section/infra/primaryStorages.js | 2 +- ui/src/config/section/infra/zones.js | 6 +- ui/src/config/section/offering.js | 4 +- ui/src/views/AutogenView.vue | 6 +- ui/src/views/compute/EditVM.vue | 8 +- ui/src/views/infra/ClusterUpdate.vue | 234 ++++++ ui/src/views/infra/HostInfo.vue | 8 + ui/src/views/infra/HostUpdate.vue | 69 +- .../views/infra/{HostUpdate.vue => PodUpdate.vue} | 106 ++- ui/src/views/infra/UpdatePrimaryStorage.vue | 76 +- ui/src/views/infra/ZoneUpdate.vue | 268 +++++++ ui/src/views/network/CreateNetworkPermission.vue | 124 +--- ui/src/views/tools/ManageInstances.vue | 28 + ui/src/views/tools/SelectVmwareVcenter.vue | 7 + .../src/main/java/com/cloud/utils/StringUtils.java | 15 + .../main/java/com/cloud/utils/script/Script.java | 27 +- .../com/cloud/hypervisor/vmware/mo/BaseMO.java | 107 +++ .../cloud/hypervisor/vmware/mo/DatacenterMO.java | 44 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 29 +- .../cloud/hypervisor/vmware/util/VmwareHelper.java | 13 + 173 files changed, 7651 insertions(+), 958 deletions(-) create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ConfigureStorageAccessCmd.java copy api/src/main/java/org/apache/cloudstack/api/command/admin/storage/{ListStorageTagsCmd.java => ListStorageAccessGroupsCmd.java} (69%) create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/StorageAccessGroupResponse.java create mode 100644 engine/orchestration/src/test/java/com/cloud/agent/manager/ClusteredAgentManagerImplTest.java copy engine/schema/src/main/java/com/cloud/{vm/UserVmCloneSettingVO.java => storage/StoragePoolAndAccessGroupMapVO.java} (65%) copy engine/schema/src/main/java/com/cloud/storage/dao/{BucketDao.java => StoragePoolAndAccessGroupMapDao.java} (68%) create mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolAndAccessGroupMapDaoImpl.java create mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocatorTest.java create mode 100644 server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java create mode 100644 ui/.env.qa create mode 100644 ui/src/components/widgets/InfiniteScrollSelect.vue create mode 100644 ui/src/views/infra/ClusterUpdate.vue copy ui/src/views/infra/{HostUpdate.vue => PodUpdate.vue} (52%) create mode 100644 ui/src/views/infra/ZoneUpdate.vue