From 2759e422f51f63d189a0227c50e8cf98ea06d8a0 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 3 Dec 2010 13:48:06 -0800
Subject: [PATCH] Return type/trafficType in the listNetworks response

---
 .../com/cloud/api/response/NetworkResponse.java   | 15 +++++++++++++++
 server/src/com/cloud/api/ApiResponseHelper.java   |  9 +++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/api/src/com/cloud/api/response/NetworkResponse.java b/api/src/com/cloud/api/response/NetworkResponse.java
index 8da95663ac0..753fa16ccd7 100644
--- a/api/src/com/cloud/api/response/NetworkResponse.java
+++ b/api/src/com/cloud/api/response/NetworkResponse.java
@@ -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;
+    }
 }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index fc9b458793f..1a44de10514 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -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());