From 20f96398420a7664e651e966a792b7dae10f7fa9 Mon Sep 17 00:00:00 2001 From: Rakesh Date: Sat, 13 Jun 2020 02:30:46 +0200 Subject: [PATCH] api: Display network name for IP in shared networks (#4073) In the list publicipaddress api call, display the network name if ip is associated to shared network Co-authored-by: Rakesh Venkatesh --- .../apache/cloudstack/api/response/IPAddressResponse.java | 8 ++++++++ server/src/main/java/com/cloud/api/ApiResponseHelper.java | 1 + 2 files changed, 9 insertions(+) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java index d3d98c87f17..8d87f06a8e4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java @@ -150,6 +150,10 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR @Param(description = "is public ip for display to the regular user", since = "4.4", authorized = {RoleType.Admin}) private Boolean forDisplay; + @SerializedName(ApiConstants.NETWORK_NAME) + @Param(description="the name of the Network where ip belongs to") + private String networkName; + /* @SerializedName(ApiConstants.JOB_ID) @Param(description="shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the volume") private IdentityProxy jobId = new IdentityProxy("async_job"); @@ -288,4 +292,8 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR public void setForDisplay(Boolean forDisplay) { this.forDisplay = forDisplay; } + + public void setNetworkName(String networkName) { + this.networkName = networkName; + } } diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 9bec40894c9..69678fd8c96 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -894,6 +894,7 @@ public class ApiResponseHelper implements ResponseGenerator { NetworkVO nw = ApiDBUtils.findNetworkById(networkId); if (nw != null) { ipResponse.setNetworkId(nw.getUuid()); + ipResponse.setNetworkName(nw.getName()); } } ipResponse.setState(ipAddr.getState().toString());