apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2120: mixed zone management - extend listNetworks API to return zone type.

Browse Source
This commit is contained in:
Jessica Wang 2013-04-23 12:25:34 -07:00
parent 35e2072660
commit 16ba999bf1
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/org/apache/cloudstack/api/response/NetworkResponse.java
View File

@ -66,6 +66,9 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
@SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the network belongs to") @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the network belongs to")
private String zoneName; private String zoneName;
@SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the networktype of the zone the network belongs to")
private String zoneType;
@SerializedName("networkofferingid") @Param(description="network offering id the network is created from") @SerializedName("networkofferingid") @Param(description="network offering id the network is created from")
private String networkOfferingId; private String networkOfferingId;
@ -291,6 +294,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
this.zoneName = zoneName; this.zoneName = zoneName;
} }
public void setZoneType(String zoneType) {
this.zoneType = zoneType;
}
public void setCidr(String cidr) { public void setCidr(String cidr) {
this.cidr = cidr; this.cidr = cidr;
} }

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

@ -2354,6 +2354,7 @@ public class ApiResponseHelper implements ResponseGenerator {
if (zone != null) { if (zone != null) {
response.setZoneId(zone.getUuid()); response.setZoneId(zone.getUuid());
response.setZoneName(zone.getName()); response.setZoneName(zone.getName());
response.setZoneType(zone.getNetworkType().toString());
} }
if (network.getPhysicalNetworkId() != null) { if (network.getPhysicalNetworkId() != null) {
PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(network.getPhysicalNetworkId()); PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(network.getPhysicalNetworkId());