diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/com/cloud/api/response/VpcResponse.java index ae5b33d7043..c2f119749bc 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 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; + } } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 7ff97f1b20e..f616f933b18 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3665,7 +3665,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()); @@ -3698,6 +3697,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");