[cloudstack] branch 4.18 updated: Add service ip to listManagementServers API response (#7374)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 17b86316155 Add service ip to listManagementServers API response 
(#7374)
17b86316155 is described below

commit 17b86316155ff6598643bfae7eda4e8f36d856b6
Author: kishankavala <kishankav...@users.noreply.github.com>
AuthorDate: Wed Mar 29 18:16:39 2023 +0530

    Add service ip to listManagementServers API response (#7374)
---
 .../main/java/org/apache/cloudstack/api/ApiConstants.java    |  1 +
 .../cloudstack/api/response/ManagementServerResponse.java    | 12 ++++++++++++
 .../src/main/java/com/cloud/api/query/QueryManagerImpl.java  |  1 +
 3 files changed, 14 insertions(+)

diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 2b77b9b0b0d..9f0418a8d9c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -384,6 +384,7 @@ public class ApiConstants {
     public static final String SENT = "sent";
     public static final String SENT_BYTES = "sentbytes";
     public static final String SERIAL = "serial";
+    public static final String SERVICE_IP = "serviceip";
     public static final String SERVICE_OFFERING_ID = "serviceofferingid";
     public static final String SESSIONKEY = "sessionkey";
     public static final String SHOW_CAPACITIES = "showcapacities";
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java
 
b/api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java
index 0289e8f9e3b..330f91e69f3 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java
@@ -72,6 +72,10 @@ public class ManagementServerResponse extends BaseResponse {
     @Param(description = "the running OS kernel version for this Management 
Server")
     private String kernelVersion;
 
+    @SerializedName(ApiConstants.SERVICE_IP)
+    @Param(description = "the IP Address for this Management Server")
+    private String serviceIp;
+
     public String getId() {
         return this.id;
     }
@@ -112,6 +116,10 @@ public class ManagementServerResponse extends BaseResponse 
{
         return lastBoot;
     }
 
+    public String getServiceIp() {
+        return serviceIp;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -155,4 +163,8 @@ public class ManagementServerResponse extends BaseResponse {
     public void setKernelVersion(String kernelVersion) {
         this.kernelVersion = kernelVersion;
     }
+
+    public void setServiceIp(String serviceIp) {
+        this.serviceIp = serviceIp;
+    }
 }
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 047c6b5b69f..211e6db19c0 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -4444,6 +4444,7 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
         mgmtResponse.setLastServerStart(mgmt.getLastJvmStart());
         mgmtResponse.setLastServerStop(mgmt.getLastJvmStop());
         mgmtResponse.setLastBoot(mgmt.getLastSystemBoot());
+        mgmtResponse.setServiceIp(mgmt.getServiceIP());
         mgmtResponse.setObjectName("managementserver");
         return mgmtResponse;
     }