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

Return type/trafficType in the listNetworks response

Browse Source
This commit is contained in:
alena 2010-12-03 13:48:06 -08:00
parent a587d3cd4a
commit 2759e422f5
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/com/cloud/api/response/NetworkResponse.java
View File

@ -47,6 +47,13 @@ public class NetworkResponse extends BaseResponse{
@SerializedName("networkofferingdisplaytext")
private String networkOfferingDisplayText;
//TODO - add description
@SerializedName("isshared")
private Boolean isShared;
@SerializedName("isdefault") @Param(description="true if network offering is default, false otherwise")
private Boolean isDefault;
//TODO - add description
@SerializedName("state")
private String state;
@ -228,4 +235,12 @@ public class NetworkResponse extends BaseResponse{
public void setDisplaytext(String displaytext) {
this.displaytext = displaytext;
}
public Boolean getIsShared() {
return isShared;
}
public void setIsShared(Boolean isShared) {
this.isShared = isShared;
}
}

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

@ -2323,12 +2323,12 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setBroadcastUri(network.getBroadcastUri().toString());
}
if (response.getTrafficType() != null) {
response.setTrafficType(network.getTrafficType().toString());
if (network.getTrafficType() != null) {
response.setTrafficType(network.getTrafficType().name());
}
if (response.getType() != null) {
response.setType(network.getGuestType().toString());
if (network.getGuestType() != null) {
response.setType(network.getGuestType().name());
}
response.setGateway(network.getGateway());
response.setCidr(network.getCidr());
@ -2340,6 +2340,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setNetworkOfferingId(networkOffering.getId());
response.setNetworkOfferingName(networkOffering.getName());
response.setNetworkOfferingDisplayText(networkOffering.getDisplayText());
response.setIsShared(networkOffering.isShared());
}
response.setState(network.getState().toString());
response.setRelated(network.getRelated());