From 050282632ed2cf5706f9a6244331777a5b6b3b08 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 19 May 2025 15:22:24 +0200 Subject: [PATCH 1/2] mgmt: add back serviceip in ManagementServerResponse --- .../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 efb1ca929caf..89c9a194e3ff 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -448,6 +448,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 4165ea257784..9186aa94eb51 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 @@ -74,6 +74,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. This is deprecated, please use 'ipaddress' instead.") + private String serviceIp; + @SerializedName(ApiConstants.IP_ADDRESS) @Param(description = "the IP Address for this Management Server") private String ipAddress; @@ -122,6 +126,10 @@ public Date getLastBoot() { return lastBoot; } + public String getServiceIp() { + return serviceIp; + } + public String getIpAddress() { return ipAddress; } @@ -170,6 +178,10 @@ public void setKernelVersion(String kernelVersion) { this.kernelVersion = kernelVersion; } + public void setServiceIp(String serviceIp) { + this.serviceIp = serviceIp; + } + public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } 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 729c65cdc637..89f50b6b2e7d 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -5445,6 +5445,7 @@ protected ManagementServerResponse createManagementServerResponse(ManagementServ mgmtResponse.addPeer(createPeerManagementServerNodeResponse(peer)); } } + mgmtResponse.setServiceIp(mgmt.getServiceIP()); mgmtResponse.setIpAddress(mgmt.getServiceIP()); mgmtResponse.setObjectName("managementserver"); return mgmtResponse; From dfd1c46bbdb921fd19ed49079ea9c28a9ab25393 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 20 May 2025 11:29:51 +0200 Subject: [PATCH 2/2] api: add Deprecated annotation to serviceip --- .../apache/cloudstack/api/response/ManagementServerResponse.java | 1 + 1 file changed, 1 insertion(+) 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 9186aa94eb51..d3f1096d39ea 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 @@ -74,6 +74,7 @@ public class ManagementServerResponse extends BaseResponse { @Param(description = "the running OS kernel version for this Management Server") private String kernelVersion; + @Deprecated @SerializedName(ApiConstants.SERVICE_IP) @Param(description = "the IP Address for this Management Server. This is deprecated, please use 'ipaddress' instead.") private String serviceIp;