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 b37a9f7ee826beb3904e498efceb0638d28d434e Merge: 937b34b200d f563c165cb3 Author: Pearl Dsilva <[email protected]> AuthorDate: Fri Aug 25 15:01:37 2023 -0400 Merge branch 'main' of https://github.com/apache/cloudstack into nsx-integration .../java/com/cloud/network/IpAddressManager.java | 4 + .../engine/orchestration/VolumeOrchestrator.java | 4 +- .../LibvirtReplugNicCommandWrapperTest.java | 6 + .../vmware/manager/VmwareStorageManagerImpl.java | 30 ++- .../hypervisor/vmware/resource/VmwareResource.java | 5 + .../storage/resource/VmwareStorageProcessor.java | 12 +- .../manager/VmwareStorageManagerImplTest.java | 11 + .../ListTungstenFabricAddressGroupCmdTest.java | 1 + .../driver/SolidFirePrimaryDataStoreDriver.java | 30 ++- .../main/java/com/cloud/api/ApiResponseHelper.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 8 +- .../com/cloud/network/IpAddressManagerImpl.java | 272 +++++++++++---------- .../cloud/network/router/NetworkHelperImpl.java | 38 ++- .../com/cloud/server/ManagementServerImpl.java | 16 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 25 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 29 ++- test/integration/component/test_update_vm.py | 124 ++++++++-- test/integration/smoke/test_public_ip_range.py | 3 +- ui/public/locales/en.json | 1 + ui/src/components/header/HeaderNotice.vue | 2 +- ui/src/components/header/ProjectMenu.vue | 14 +- ui/src/config/section/compute.js | 4 +- ui/src/store/getters.js | 1 + ui/src/store/modules/app.js | 13 +- ui/src/store/modules/user.js | 6 +- ui/src/store/mutation-types.js | 1 + ui/src/utils/plugins.js | 9 +- ui/src/utils/request.js | 8 +- ui/src/views/AutogenView.vue | 30 ++- ui/src/views/compute/DeployVM.vue | 16 +- ui/src/views/infra/network/IpRangesTabPublic.vue | 6 +- .../vmware/mo/HostDatastoreSystemMO.java | 17 +- .../cloud/hypervisor/vmware/util/VmwareHelper.java | 1 + 33 files changed, 526 insertions(+), 223 deletions(-)
