This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch UserVmManagerCleanup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 2ec18d0997c Apply suggestion from @abh1sar
add 87c8e746423 Fix github action workflow (#12675)
add da7ac80dc41 prevent user.uuid from being regenerated on each operation
by reading it from the DB (#12632)
add d0543449a66 Changes to the error message displayed during the removal
of public templates that are used (#12373)
add cf71938473b [UI] Allow change password for native users only. (#12584)
add c748b69e70c Fix NPE during public IP listing when a removed network or
VPC ID is informed for associatenetworkid parameter (#12372)
add 744c8afcf15 fix primary storage maintenance on xcpng (#12694)
add b74f21b9670 Merge branch '4.20' into 4.22
add 6419e1c8257 [VMware to KVM Migration] Fix unused convert env vars
(#11947)
add 9e386a3128b PowerFlex/ScaleIO client initialization, authentication
and command execution improvements (#12391)
add 6516f7f1aa7 Fix query execution in countVgpuVMs (#12713)
add 56dc11980f6 test_accounts.py failure fix - keep the camelCase
parameter "domainId" (#12689)
add 65e54091ff2 Merge branch '4.20' into 4.22
add 120a43648b8 set width of dropdown select items for Network Offering
during add tier dialog (#11899)
add 58916eb6080 Use lateral join (introduced in MySQL 8.0.14) with
subquery on user_statistics table in account_view for netstats (#12631)
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 9694fa68569 Merge branch '4.22' into UserVmManagerCleanup
No new revisions were added by this update.
Summary of changes:
.github/workflows/merge-conflict-checker.yml | 4 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 +
.../apache/cloudstack/api/ApiServerService.java | 2 +
.../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 +
.../cloud/agent/api/ModifyStoragePoolAnswer.java | 4 +
.../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 ++++++++
.../src/main/java/com/cloud/user/UserVO.java | 2 +-
.../main/java/com/cloud/user/dao/AccountDao.java | 2 -
.../java/com/cloud/user/dao/AccountDaoImpl.java | 60 +--------
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 7 +-
.../datastore/db/SnapshotDataStoreDaoImpl.java | 14 +--
.../META-INF/db/schema-42200to42210-cleanup.sql | 2 +
.../resources/META-INF/db/schema-42200to42210.sql | 2 +
.../db/views/cloud.account_netstats_view.sql | 31 -----
.../META-INF/db/views/cloud.account_view.sql | 15 ++-
.../motion/StorageSystemDataMotionStrategy.java | 7 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 33 ++++-
.../cloudstack/framework/config/ConfigKey.java | 8 ++
.../cloudstack/backup/NASBackupProvider.java | 11 ++
.../kvm/resource/LibvirtComputingResource.java | 14 +--
.../LibvirtConvertInstanceCommandWrapper.java | 9 +-
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 2 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 2 +
.../kvm/storage/ScaleIOStorageAdaptor.java | 31 +++--
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 7 +-
.../kvm/storage/ScaleIOStoragePoolTest.java | 13 +-
.../CitrixModifyStoragePoolCommandWrapper.java | 12 +-
...ManagementServerMaintenanceManagerImplTest.java | 2 -
.../client/ScaleIOGatewayClientConnectionPool.java | 89 +++++++-------
.../datastore/client/ScaleIOGatewayClientImpl.java | 83 +++++++++++--
.../driver/ScaleIOPrimaryDataStoreDriver.java | 10 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 32 +++--
.../storage/datastore/util/ScaleIOUtil.java | 35 +++---
.../client/ScaleIOGatewayClientImplTest.java | 21 ++--
.../api/command/OauthLoginAPIAuthenticatorCmd.java | 8 +-
.../command/OauthLoginAPIAuthenticatorCmdTest.java | 19 +++
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 3 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 17 ++-
server/src/main/java/com/cloud/api/ApiServer.java | 20 +++
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 9 +-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 14 ++-
.../com/cloud/server/ManagementServerImpl.java | 64 +++++++---
.../com/cloud/template/TemplateManagerImpl.java | 17 ++-
.../java/com/cloud/user/AccountManagerImpl.java | 134 ++++++++++-----------
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 127 ++++++++++++-------
.../volume/VolumeImportUnmanageManagerImpl.java | 15 ++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 103 ++++------------
...tBase.java => AccountManagentImplTestBase.java} | 8 +-
.../com/cloud/user/AccountManagerImplTest.java | 112 ++++++++---------
.../AccountManagerImplVolumeDeleteEventTest.java | 2 +-
.../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/config/section/user.js | 4 +
ui/src/permission.js | 1 +
ui/src/views/compute/DeployVM.vue | 6 +
.../compute/wizard/SecurityGroupSelection.vue | 26 +++-
ui/src/views/image/TemplateZones.vue | 14 ++-
ui/src/views/network/CreateNetwork.vue | 2 +-
ui/src/views/network/VpcTiersTab.vue | 10 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 37 +++++-
ui/src/views/tools/ManageInstances.vue | 21 +++-
.../main/java/com/cloud/utils/script/Script.java | 20 ++-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 27 ++++-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 16 ++-
.../hypervisor/vmware/util/VmwareHelperTest.java | 23 ++++
83 files changed, 1225 insertions(+), 588 deletions(-)
delete mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
rename server/src/test/java/com/cloud/user/{AccountManagetImplTestBase.java =>
AccountManagentImplTestBase.java} (98%)
