This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a change to branch nsx-integration in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 9b517a759ff NSX: Fix VPC form to ignore source NAT IP when creating VPCs and fix label add 9b18243b876 Fix merge forward bug (#8636) add 3291a62fc12 Allow locking and unlocking users via UI (#8337) add 27520f83fec packaging: bundle cmk in cloudstack-management package (#8574) add 2729ee110eb Enable over provisioning for SharedMountPoint primary storages (#8481) add 393f3d7727a linstor: use relative hostname path (#8633) add af2e277999a Merge remote-tracking branch 'apache/4.18' into 4.19 add a924a110e18 Veeam: revert unnecessary state change if restore backup and attach to another VM (#8614) add d7362dd332f Migrating volumes filter (#8631) add 70b634fff21 Linstor: add HA support and small cleanups (#8407) add 1955d8f3db0 Add advance settings to fine tune DRS imbalance calculation (#8521) add d8cd1228496 zone wizard: allow only one untagged physical network with guest traffic type (#8625) add 672206c3124 kvm: ITCO watchdog added (#8282) add e47a910019d VR: fix issue between VPC VMs and other Public IPs in the same subnet as additional Public IPs (#8599) add a8028eecbdb Merge remote-tracking branch 'origin/4.18' into 4.19 add bda49ab08ff Merge remote-tracking branch 'shapeblue/merged-4-18' into 4.19 add 93406f5582b Merge remote-tracking branch 'apache/4.19' add 90526419a3d fix build error after merge-forward add 187f17c216d fix build errors with DRS plugins after merge-forward add e6cddc549ca Merge branch 'main' into nsx-integration No new revisions were added by this update. Summary of changes: api/src/main/java/com/cloud/storage/Storage.java | 20 ++- .../cloudstack/cluster/ClusterDrsAlgorithm.java | 192 +++++++++++++++------ .../cloudstack/cluster/ClusterDrsService.java | 23 +++ .../test/java/com/cloud/storage/StorageTest.java | 4 +- .../cluster/ClusterDrsAlgorithmTest.java | 97 +++++++++++ debian/cloudstack-management.install | 1 + debian/rules | 4 + packaging/centos7/cloud.spec | 4 + packaging/centos8/cloud.spec | 4 + .../org/apache/cloudstack/cluster/Balanced.java | 77 ++++----- .../apache/cloudstack/cluster/BalancedTest.java | 53 ++---- .../org/apache/cloudstack/cluster/Condensed.java | 80 ++++----- .../apache/cloudstack/cluster/CondensedTest.java | 46 ++--- .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +- .../cloudstack/metrics/MetricsServiceImpl.java | 23 ++- .../response/ClusterMetricsResponse.java | 12 ++ .../kvm/storage/LinstorStorageAdaptor.java | 73 +------- .../hypervisor/kvm/storage/LinstorStoragePool.java | 133 +++++++++++++- .../driver/LinstorPrimaryDataStoreDriverImpl.java | 2 +- .../datastore/provider/LinstorHostListener.java} | 20 +-- .../LinstorPrimaryDatastoreProviderImpl.java | 2 +- .../storage/datastore/util/LinstorUtil.java | 27 +-- .../configuration/ConfigurationManagerImpl.java | 1 + .../VpcVirtualNetworkApplianceManagerImpl.java | 17 +- .../cloudstack/backup/BackupManagerImpl.java | 4 - .../cloudstack/cluster/ClusterDrsServiceImpl.java | 28 +-- .../cluster/ClusterDrsServiceImplTest.java | 6 +- systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 7 +- systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 6 + ui/public/locales/en.json | 11 +- ui/public/locales/pt_BR.json | 3 + ui/src/components/view/ListView.vue | 3 + ui/src/components/view/SearchView.vue | 51 +++--- ui/src/config/section/infra/clusters.js | 4 +- ui/src/config/section/user.js | 16 +- ui/src/views/AutogenView.vue | 36 ++-- ui/src/views/infra/ClusterDRSTab.vue | 18 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 3 + .../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 69 ++++++-- 39 files changed, 774 insertions(+), 410 deletions(-) create mode 100644 api/src/test/java/org/apache/cloudstack/cluster/ClusterDrsAlgorithmTest.java copy plugins/storage/volume/{flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java => linstor/src/main/java/org/apache/cloudstack/storage/datastore/provider/LinstorHostListener.java} (64%)