You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/12/12 07:59:52 UTC
[cloudstack] branch main updated (66747d04c4b -> 1be7c2f3488)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 66747d04c4b storpool: fix on remove the Iops limits (#6902)
add b7f845ab134 server: fix nic device id fro imported vm (#6953)
add 11d27a5a3af systemvm: vpc router fix /etc/network/interfaces is misconfigured (#6435)
add 7f760cc395b test: add nic validation in import vm test (#6964)
add 335e26bb1d2 test: fix failure on non-VMware env (#6969)
add 4de66f98555 server: fix listing vm metrics for infra resources (#6851)
new 1be7c2f3488 Merge remote-tracking branch 'origin/4.17'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/cloudstack/api/ListVMsMetricsCmd.java | 13 +--
.../cloudstack/api/ListVMsMetricsCmdByAdmin.java | 32 +++-----
.../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, 141 insertions(+), 72 deletions(-)
copy api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java => plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java (60%)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.17'
Posted by ro...@apache.org.
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 <ro...@shapeblue.com>
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())) {