This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1be7c2f348869fc7812a03b4971b22735cf42eb9 Merge: 66747d04c4b 4de66f98555 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Dec 12 13:29:28 2022 +0530 Merge remote-tracking branch 'origin/4.17' .../apache/cloudstack/api/ListVMsMetricsCmd.java | 13 +-- .../cloudstack/api/ListVMsMetricsCmdByAdmin.java | 73 +++++++++++++++++ .../cloudstack/metrics/MetricsServiceImpl.java | 34 ++++---- .../java/com/cloud/api/query/QueryManagerImpl.java | 26 ++++-- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 10 +-- systemvm/debian/opt/cloud/bin/setup/init.sh | 1 + systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 5 -- .../smoke/test_vm_lifecycle_unmanage_import.py | 92 ++++++++++++++++++---- 8 files changed, 201 insertions(+), 53 deletions(-) diff --cc server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index fbf9525993a,d5ce58b6c88..827a41eeb02 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@@ -1035,9 -1046,8 +1047,9 @@@ public class QueryManagerImpl extends M Object securityGroupId = cmd.getSecurityGroupId(); Object backupOfferingId = cmd.getBackupOfferingId(); Object isHaEnabled = cmd.getHaEnabled(); + Object autoScaleVmGroupId = cmd.getAutoScaleVmGroupId(); Object pod = null; - Long clusterId = null; + Object clusterId = null; Object hostId = null; Object storageId = null; if (_accountMgr.isRootAdmin(caller.getId())) {
