From eda96259fe97d86c0284e3f8ce751620feaa0a38 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@apache.org>
Date: Tue, 28 Mar 2023 14:16:27 +0530
Subject: [PATCH] Add service ip to listManagementServers API response

---
 .../java/org/apache/cloudstack/api/ApiConstants.java |  1 +
 .../api/response/ManagementServerResponse.java       | 12 ++++++++++++
 .../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 2b77b9b0b0d0..9f0418a8d9ca 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 0289e8f9e3b7..330f91e69f31 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 Date getLastBoot() {
         return lastBoot;
     }
 
+    public String getServiceIp() {
+        return serviceIp;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -155,4 +163,8 @@ public void setLastBoot(Date lastBoot) {
     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 047c6b5b69fb..211e6db19c0a 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 @@ protected ManagementServerResponse createManagementServerResponse(ManagementServ
         mgmtResponse.setLastServerStart(mgmt.getLastJvmStart());
         mgmtResponse.setLastServerStop(mgmt.getLastJvmStop());
         mgmtResponse.setLastBoot(mgmt.getLastSystemBoot());
+        mgmtResponse.setServiceIp(mgmt.getServiceIP());
         mgmtResponse.setObjectName("managementserver");
         return mgmtResponse;
     }