This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch fix-persistent-ntwk-host-setup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d186b15fe28 Fix Host setup when persistent networks exist
add c3d6a8cff72 server: fix templatetype during iso upload (#12151)
add db836229564 ui: fix create network from global create menu (#12677)
add 7aa0558c5b9 ui: avoid 404 after deleting template zones (#12681)
add 71daf84c9e8 Show security group selection in Basic zone VM deployment
and fix SG listing for cross-domain deployments (#12775)
add 7f7d0b02e14 Remove unnecessary stubbings in
ManagementServerMaintenanceManagerImplTest (#11914) (#12623)
add 2359061f663 api: remove required flag of gatewayid in
CreateStaticRouteCmd (#12786)
add 27bce46a8e3 Clear System VM IP from NICs for PublicNetworkGuru (#11992)
add 3b42fbf3b24 Fixing CI failures (#12789)
add 70489448831 [Fix] VMware to KVM migration instances listing failure
(#12766)
add 09ee0927e9b [4.22] Prevent Load Balancer rule creation when adding a
VM from a different network (#12785)
add e93ae1a4f45 New config key "allow.import.volume.with.backing.file" to
skip volume backing (#12809)
add bce55945ece Mark VMs in error state when expunge fails during destroy
operation (#12749)
add 7107d28db82 [VMware to KVM] Add guest OS for importing VM based on the
source VM OS (#12802)
add 7c3637a2f58 Fix duplicate dummy templates, and update guest os for
dummy template (#12780)
add d6c39772b21 Set management server id from cookies after saml login
(#12858)
add 84676afd5cc Check for null host before proceeding with VM volume
operations in managed storage while restoring VM (#12879)
add c1af36f8fc9 [4.22] Prevent unmanaging or reinstalling a VM if it is
part of a CKS cluster (#12800)
add 131ea9f7ace Fix PowerFlex 4.x issues with take & revert instance
snapshots (#12880)
add 6ca6aa1c3f0 Fix NPE in NASBackupProvider when no running KVM host is
available (#12805)
add 68030df10b1 VM start error handling improvements and config to expose
error to users (#12894)
add 71bd26ff7cd PowerFlex/ScaleIO storage - the MDMs validation
improvements (#12893)
add 4ebe3349b77 add user-agent header to template downloader request
(#12791)
add 59b6c32b60c [UI] Fix create backup notification (#12903)
add 14cb6aa01e5 Merge branch '4.22' into fix-persistent-ntwk-host-setup
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 +
.../api/command/admin/vm/ImportVmCmd.java | 12 ++
.../api/command/user/guest/ListGuestOsCmd.java | 9 ++
.../api/command/user/vpc/CreateStaticRouteCmd.java | 1 -
.../api/response/UnmanagedInstanceResponse.java | 24 ++++
.../volume/VolumeImportUnmanageService.java | 13 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 19 +++
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 2 +
.../storage/template/HttpTemplateDownloader.java | 2 +
.../template/MetalinkTemplateDownloader.java | 4 +
.../template/SimpleHttpMultiFileDownloader.java | 3 +
.../download/HttpDirectTemplateDownloader.java | 5 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 53 ++++++--
.../engine/orchestration/NetworkOrchestrator.java | 7 +-
.../java/com/cloud/storage/dao/GuestOSDao.java | 2 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 ++
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 12 ++
.../com/cloud/upgrade/dao/Upgrade42200to42210.java | 51 ++++++++
.../datastore/db/SnapshotDataStoreDaoImpl.java | 14 +--
.../resources/META-INF/db/schema-42200to42210.sql | 2 +
.../motion/StorageSystemDataMotionStrategy.java | 4 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 33 ++++-
.../cloudstack/backup/NASBackupProvider.java | 11 ++
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 2 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 2 +
.../kvm/storage/ScaleIOStorageAdaptor.java | 31 +++--
...ManagementServerMaintenanceManagerImplTest.java | 2 -
.../datastore/client/ScaleIOGatewayClientImpl.java | 61 +++++++++-
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 3 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 17 ++-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 14 ++-
.../com/cloud/server/ManagementServerImpl.java | 33 +++--
.../com/cloud/template/TemplateManagerImpl.java | 3 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 134 +++++++++++++--------
.../volume/VolumeImportUnmanageManagerImpl.java | 15 ++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 103 ++++------------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 56 +++++++++
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 55 ++++++++-
test/integration/smoke/test_secondary_storage.py | 16 ++-
ui/public/locales/en.json | 1 +
ui/src/permission.js | 1 +
ui/src/views/compute/DeployVM.vue | 6 +
ui/src/views/compute/StartBackup.vue | 2 +-
.../compute/wizard/SecurityGroupSelection.vue | 26 +++-
ui/src/views/image/TemplateZones.vue | 14 ++-
ui/src/views/network/CreateNetwork.vue | 2 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 37 +++++-
ui/src/views/tools/ManageInstances.vue | 21 +++-
utils/src/main/java/com/cloud/utils/HttpUtils.java | 5 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 3 +
.../HttpClientCloudStackUserAgent.java} | 22 ++--
.../java/com/cloud/utils/storage/QCOW2Utils.java | 2 +
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 27 ++++-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 16 ++-
.../hypervisor/vmware/util/VmwareHelperTest.java | 23 ++++
60 files changed, 851 insertions(+), 222 deletions(-)
copy
utils/src/main/java/com/cloud/utils/{exception/HypervisorVersionChangedException.java
=> net/HttpClientCloudStackUserAgent.java} (61%)
