From 134520ad205642b94149cf6297b90dd5418c04bc Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Fri, 10 Mar 2017 11:49:49 +0100 Subject: [PATCH] CLOUDSTACK-8873: add zonename in load balancer response --- .../cloudstack/api/response/LoadBalancerResponse.java | 8 ++++++++ server/src/com/cloud/api/ApiResponseHelper.java | 1 + 2 files changed, 9 insertions(+) diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java index 21e1dab450e6..1eb8fca5087b 100644 --- a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java @@ -95,6 +95,10 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti @Param(description = "the id of the zone the rule belongs to") private String zoneId; + @SerializedName(ApiConstants.ZONE_NAME) + @Param(description = "the name of the zone the load balancer rule belongs to", since = "4.11") + private String zoneName; + @SerializedName(ApiConstants.PROTOCOL) @Param(description = "the protocol of the loadbalanacer rule") private String lbProtocol; @@ -166,6 +170,10 @@ public void setZoneId(String zoneId) { this.zoneId = zoneId; } + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + @Override public void setProjectId(String projectId) { this.projectId = projectId; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 71047f955642..18b427985892 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -883,6 +883,7 @@ public LoadBalancerResponse createLoadBalancerResponse(LoadBalancer loadBalancer DataCenter zone = ApiDBUtils.findZoneById(publicIp.getDataCenterId()); if (zone != null) { lbResponse.setZoneId(zone.getUuid()); + lbResponse.setZoneName(zone.getName()); } //set tag information