[cloudstack] branch master updated: CLOUDSTACK-8873: add zonename in load balancer response

[bhaisaab]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 256c193  CLOUDSTACK-8873: add zonename in load balancer response
256c193 is described below

commit 256c193e92c75d9752281b7542db69880c91053c
Author: Rene Moser <re...@apache.org>
AuthorDate: Fri Mar 10 11:49:49 2017 +0100

    CLOUDSTACK-8873: add zonename in load balancer response
---
 .../org/apache/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 21e1dab..1eb8fca 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 class LoadBalancerResponse extends BaseResponse 
implements ControlledEnti
         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 fd7c67d..d9fd01c 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -888,6 +888,7 @@ public class ApiResponseHelper implements ResponseGenerator 
{
         DataCenter zone = ApiDBUtils.findZoneById(publicIp.getDataCenterId());
         if (zone != null) {
             lbResponse.setZoneId(zone.getUuid());
+            lbResponse.setZoneName(zone.getName());
         }
 
         //set tag information

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].