This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch 4.20 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 5aa79a6e05d UI: Add offer ha column to system offerings table (#10297) add 60af31c9c0b Decrypt zone, cluster, storage details for configuration values (#10237) add fa5c11e6b2e UI: list backup offerings by zoneid when assign vm to backup offering (#10217) add c1bc57b844b List default network offerings when multiple physical networks for guest traffic type exists (#10222) add 238d0c5e30a Fix NPE while checking for user data provider (#10255) add 37c29f82eda server: fix snapshot physical size (#10216) add 1b2f6c99985 Hide register template, create/upload volume and create vpc buttons when zone is not created. (#10243) add 55e8eaab89c Linstor: encryption support (#10126) add 90c960eeed9 VPC VR: fix ACL between tier and private gateway (#10268) add df99a294832 linstor: Fix using multiple primary storage with same linstor-controller (#10280) add 802bf5fce7c Revert "server: fix attach uploaded volume (#10267)" (#10323) add a627ab67c29 server: fix pod retrieval during volume attach (#10324) add c09720a19a4 systemvm-registration: update seeded template_store_ref sizes (#10317) add 3337f425ffd Primera pure patches & various small fixes (#10132) add a1117acbdfb List only untagged offerings for Shared networks when tag isn't passed (#10320) add 58a63f64fd6 Fix VMWare leftovers when deleting VM without root disk (#9735) add d453c63848f cleanup VM IP after expunge in redundant VPC (#10183) add d920aba176c server: fix scale vm with same disk offering id (#10235) add d3170bfa165 UI: Fixup missing buttons (#10357) add 4f604c00b65 Support virtio-blk root disk controller (#10229) add aa6c581e405 Add the option to filter by host when retrieving of unregistered VMs (#9925) add ae1d7cc8609 Fix private gateway acl on static routes (#10262) add 4f3e8e8c5a6 Merge branch '4.19' into 4.20 No new revisions were added by this update. Summary of changes: .../cloud/exception/StorageAccessException.java | 4 +- api/src/main/java/com/cloud/storage/Storage.java | 141 ++--- .../org/apache/cloudstack/api/ApiConstants.java | 10 +- .../cloudstack/api/response/HostResponse.java | 8 +- ...egisterVMCommand.java => CleanupVMCommand.java} | 19 +- .../engine/orchestration/VolumeOrchestrator.java | 6 +- .../main/java/com/cloud/dc/ClusterDetailsDao.java | 3 +- .../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 16 +- .../main/java/com/cloud/dc/ClusterDetailsVO.java | 18 +- .../main/java/com/cloud/domain/DomainDetailVO.java | 18 +- .../com/cloud/domain/dao/DomainDetailsDao.java | 5 +- .../com/cloud/domain/dao/DomainDetailsDaoImpl.java | 26 +- .../storage/dao/StoragePoolDetailsDaoImpl.java | 2 +- .../upgrade/SystemVmTemplateRegistration.java | 33 +- .../main/java/com/cloud/user/AccountDetailVO.java | 18 +- .../java/com/cloud/user/AccountDetailsDao.java | 5 +- .../java/com/cloud/user/AccountDetailsDaoImpl.java | 28 +- .../resourcedetail/ResourceDetailsDao.java | 20 +- .../resourcedetail/ResourceDetailsDaoBase.java | 34 +- .../datastore/db/ImageStoreDetailsDaoImpl.java | 10 +- .../datastore/db/PrimaryDataStoreDaoImpl.java | 2 +- .../motion/StorageSystemDataMotionStrategy.java | 15 +- .../storage/volume/VolumeServiceImpl.java | 9 +- .../lifecycle/CloudStackExtendedLifeCycle.java | 21 +- .../lifecycle/registry/RegistryLifecycle.java | 17 +- .../acl/DynamicRoleBasedAPIAccessChecker.java | 4 +- .../kvm/resource/LibvirtComputingResource.java | 5 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 6 +- ...LibvirtGetUnmanagedInstancesCommandWrapper.java | 5 +- .../kvm/storage/KVMStorageProcessor.java | 51 +- .../kvm/storage/MultipathSCSIAdapterBase.java | 23 + .../kvm/resource/LibvirtComputingResourceTest.java | 10 + .../java/com/cloud/hypervisor/guru/VMwareGuru.java | 8 + .../hypervisor/vmware/VmwareDatacenterService.java | 7 +- .../vmware/manager/VmwareManagerImpl.java | 268 +++++--- .../hypervisor/vmware/resource/VmwareResource.java | 23 + .../api/command/admin/zone/AddVmwareDcCmd.java | 12 +- .../zone/ImportVsphereStoragePoliciesCmd.java | 13 +- ...wareDcVmsCmd.java => ListVmwareDcHostsCmd.java} | 55 +- .../api/command/admin/zone/ListVmwareDcItems.java | 12 +- .../api/command/admin/zone/ListVmwareDcVmsCmd.java | 52 +- .../api/command/admin/zone/ListVmwareDcsCmd.java | 26 +- .../admin/zone/ListVsphereStoragePoliciesCmd.java | 15 +- ...ListVsphereStoragePolicyCompatiblePoolsCmd.java | 2 +- .../api/command/admin/zone/RemoveVmwareDcCmd.java | 6 +- .../api/command/admin/zone/UpdateVmwareDcCmd.java | 9 +- .../command/admin/zone/VmwareRequestResponse.java | 30 +- .../KubernetesClusterActionWorker.java | 18 +- .../cluster/utils/KubernetesClusterUtil.java | 2 +- plugins/storage/volume/linstor/CHANGELOG.md | 11 + .../LinstorBackupSnapshotCommandWrapper.java | 18 +- .../kvm/storage/LinstorStorageAdaptor.java | 123 +++- .../driver/LinstorPrimaryDataStoreDriverImpl.java | 330 ++++++++-- .../storage/datastore/util/LinstorUtil.java | 115 ++++ .../LinstorPrimaryDataStoreDriverImplTest.java | 87 +++ .../storage/datastore/util/LinstorUtilTest.java | 127 ++++ .../datastore/adapter/primera/PrimeraAdapter.java | 51 +- pom.xml | 2 +- scripts/storage/multipath/cleanStaleMaps.sh | 10 +- scripts/storage/multipath/disconnectVolume.sh | 3 + .../java/com/cloud/api/query/QueryManagerImpl.java | 333 +++++----- .../com/cloud/api/query/dao/SnapshotJoinDao.java | 6 +- .../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 43 +- .../configuration/ConfigurationManagerImpl.java | 17 +- .../java/com/cloud/network/NetworkModelImpl.java | 6 +- .../network/element/ConfigDriveNetworkElement.java | 21 +- .../network/element/VirtualRouterElement.java | 7 +- .../java/com/cloud/storage/StorageManagerImpl.java | 4 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 18 +- .../java/com/cloud/user/AccountManagerImpl.java | 82 +-- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 10 +- .../api/query/dao/SnapshotJoinDaoImplTest.java | 109 ++++ .../cloud/storage/VolumeApiServiceImplTest.java | 51 +- .../resource/LocalNfsSecondaryStorageResource.java | 11 +- systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 24 +- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 3 +- test/integration/smoke/test_dynamicroles.py | 1 + ui/public/locales/en.json | 1 + ui/src/config/section/compute.js | 9 + ui/src/config/section/image.js | 8 +- ui/src/config/section/network.js | 17 +- ui/src/config/section/storage.js | 5 +- ui/src/{style/frame/content.less => utils/zone.js} | 12 +- ui/src/views/network/CreateSharedNetworkForm.vue | 4 + ui/src/views/tools/ManageInstances.vue | 1 + ui/src/views/tools/SelectVmwareVcenter.vue | 64 +- .../com/cloud/hypervisor/vmware/mo/BaseMO.java | 64 +- .../vmware/mo/CustomFieldsManagerMO.java | 7 +- .../cloud/hypervisor/vmware/mo/DatacenterMO.java | 159 +++-- .../com/cloud/hypervisor/vmware/mo/HostMO.java | 156 +++-- .../hypervisor/vmware/mo/VirtualMachineMO.java | 704 +++++---------------- .../cloud/hypervisor/vmware/util/VmwareClient.java | 72 ++- .../vmware/util/VmwareClientException.java | 22 +- 93 files changed, 2496 insertions(+), 1582 deletions(-) copy core/src/main/java/com/cloud/agent/api/{UnregisterVMCommand.java => CleanupVMCommand.java} (74%) copy plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/{ListVmwareDcVmsCmd.java => ListVmwareDcHostsCmd.java} (73%) copy api/src/main/java/com/cloud/configuration/ResourceCount.java => plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java (77%) copy api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java => plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/VmwareRequestResponse.java (64%) create mode 100644 plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImplTest.java create mode 100644 plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorUtilTest.java create mode 100644 server/src/test/java/com/cloud/api/query/dao/SnapshotJoinDaoImplTest.java copy ui/src/{style/frame/content.less => utils/zone.js} (83%) copy server/src/main/java/com/cloud/agent/manager/authn/AgentAuthnException.java => vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClientException.java (68%)