etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPC: added zoneName to the VPC api response

This commit is contained in:
Alena Prokharchyk 2012-07-03 17:14:07 -07:00
parent 3a56e3c55c
commit 3383c79452
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/com/cloud/api/response/VpcResponse.java
View File

@ -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;
}
}

5
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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");