You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/04 02:27:52 UTC
[1/6] git commit: VPC: added zoneName to the VPC api response
Updated Branches:
refs/heads/vpc 5bcf73080 -> f2078afbd
VPC: added zoneName to the VPC api response
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f2078afb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f2078afb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f2078afb
Branch: refs/heads/vpc
Commit: f2078afbd8caab2547a318b841d75fd4f7f65168
Parents: 07d478d
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jul 3 17:14:07 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 3 17:28:20 2012 -0700
----------------------------------------------------------------------
api/src/com/cloud/api/response/VpcResponse.java | 7 +++++++
server/src/com/cloud/api/ApiResponseHelper.java | 5 ++++-
2 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f2078afb/api/src/com/cloud/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/com/cloud/api/response/VpcResponse.java
index ae5b33d..c2f1197 100644
--- a/api/src/com/cloud/api/response/VpcResponse.java
+++ b/api/src/com/cloud/api/response/VpcResponse.java
@@ -40,6 +40,9 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
@SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the vpc")
private IdentityProxy zoneId = new IdentityProxy("data_center");
+
+ @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the VPC belongs to")
+ private String zoneName;
@SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
@@ -153,4 +156,8 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
public void setNetworkDomain(String networkDomain) {
this.networkDomain = networkDomain;
}
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f2078afb/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index d9175e5..c1ee590 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3537,7 +3537,6 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setState(vpc.getState().name());
response.setVpcOfferingId(vpc.getVpcOfferingId());
response.setCidr(vpc.getCidr());
- response.setZoneId(vpc.getZoneId());
response.setRestartRequired(vpc.isRestartRequired());
response.setNetworkDomain(vpc.getNetworkDomain());
@@ -3570,6 +3569,10 @@ public class ApiResponseHelper implements ResponseGenerator {
networkResponses.add(ntwkRsp);
}
+ DataCenter zone = ApiDBUtils.findZoneById(vpc.getZoneId());
+ response.setZoneId(vpc.getZoneId());
+ response.setZoneName(zone.getName());
+
response.setNetworks(networkResponses);
response.setServices(serviceResponses);
response.setObjectName("vpc");