Return the zone name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4940843 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4940843 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4940843 Branch: refs/heads/sf-plugins Commit: a49408431b7c03f6a0a5bdb442b155079a87ed49 Parents: efb00e2 Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Mon Jul 6 15:24:35 2015 -0600 Committer: CloudStack <cloudstack@cloudstack-virtual-machine.(none)> Committed: Tue Jul 28 13:42:40 2015 -0600 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/api/helper/ApiHelper.java | 4 ++++ .../api/response/ApiSolidFireClusterResponse.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4940843/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java b/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java index 1cdebfb..0e29e90 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java @@ -97,6 +97,10 @@ public class ApiHelper { sfResponse.setTotalBurstIops(sfCluster.getTotalBurstIops()); sfResponse.setZoneId(sfCluster.getZoneId()); + DataCenterVO dataCenterVO = _zoneDao.findById(sfCluster.getZoneId()); + + sfResponse.setZoneName(dataCenterVO.getName()); + sfResponse.setObjectName("sfcluster"); return sfResponse; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4940843/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireClusterResponse.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireClusterResponse.java b/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireClusterResponse.java index 08427fc..b959cc3 100644 --- a/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireClusterResponse.java +++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireClusterResponse.java @@ -67,6 +67,10 @@ public class ApiSolidFireClusterResponse extends BaseResponse { @Param(description = "Zone ID that the SolidFire cluster is associated with") private long _zoneId; + @SerializedName("zonename") + @Param(description = "Zone name that the SolidFire cluster is associated with") + private String _zoneName; + public void setId(long id) { _id = id; } @@ -146,4 +150,12 @@ public class ApiSolidFireClusterResponse extends BaseResponse { public long getZoneId() { return _zoneId; } + + public void setZoneName(String zoneName) { + _zoneName = zoneName; + } + + public String getZoneName() { + return _zoneName; + } }
