You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2025/05/22 06:36:06 UTC
(cloudstack) branch main updated (97c96a55ba9 -> f496ed6eaf1)
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 97c96a55ba9 .github: fix sonar checks (#10894)
add 34896a1ada1 Address `assignVm` regression (#10875)
add d0dc6d8093a mgmt: add back serviceip in ManagementServerResponse (#10891)
add 4748c3fd4d2 test: cleanup acl in test_global_acls.py (#10893)
add 6e19c07da10 Fixed typos (#10882)
add f99fb3ecde3 Merge remote-tracking branch 'origin/4.19' into 4.20
new f496ed6eaf1 Merge branch '4.20' of https://github.com/apache/cloudstack
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:
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/response/ManagementServerResponse.java | 13 ++
.../vmware/manager/VmwareManagerImpl.java | 14 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 1 +
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 146 ++++++++++++++-------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 109 +++++++--------
test/integration/smoke/test_global_acls.py | 1 +
.../main/java/com/cloud/utils/net/NetUtils.java | 2 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 4 +-
10 files changed, 179 insertions(+), 114 deletions(-)
(cloudstack) 01/01: Merge branch '4.20' of https://github.com/apache/cloudstack
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f496ed6eaf18a30c5c3b75781cdfd3750f949667
Merge: 97c96a55ba9 f99fb3ecde3
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu May 22 12:05:47 2025 +0530
Merge branch '4.20' of https://github.com/apache/cloudstack
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/response/ManagementServerResponse.java | 13 ++
.../vmware/manager/VmwareManagerImpl.java | 14 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 1 +
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 146 ++++++++++++++-------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 109 +++++++--------
test/integration/smoke/test_global_acls.py | 1 +
.../main/java/com/cloud/utils/net/NetUtils.java | 2 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 4 +-
10 files changed, 179 insertions(+), 114 deletions(-)
diff --cc server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 288465b0e60,89f50b6b2e7..ec1c02b384c
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@@ -5657,12 -5445,7 +5657,13 @@@ public class QueryManagerImpl extends M
mgmtResponse.addPeer(createPeerManagementServerNodeResponse(peer));
}
}
+ List<String> lastAgents = hostDao.listByLastMs(mgmt.getMsid());
+ mgmtResponse.setLastAgents(lastAgents);
+ List<String> agents = hostDao.listByMs(mgmt.getMsid());
+ mgmtResponse.setAgents(agents);
+ mgmtResponse.setAgentsCount((long) agents.size());
+ mgmtResponse.setPendingJobsCount(jobManager.countPendingNonPseudoJobs(mgmt.getMsid()));
+ mgmtResponse.setServiceIp(mgmt.getServiceIP());
mgmtResponse.setIpAddress(mgmt.getServiceIP());
mgmtResponse.setObjectName("managementserver");
return mgmtResponse;