cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2 to 63b3721
Date Tue, 13 Aug 2013 00:49:24 GMT
Updated Branches:
  refs/heads/4.2 3ad0008c8 -> 63b37214c


CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network
offerings to regular-user. So, add networkofferingconservemode property to listNetworks API
response.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63b37214
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63b37214
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63b37214

Branch: refs/heads/4.2
Commit: 63b37214c34014580d0e8dc4177799bc1c7691d9
Parents: 3ad0008
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Aug 12 17:32:12 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Aug 12 17:49:13 2013 -0700

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/response/NetworkResponse.java | 9 ++++++++-
 server/src/com/cloud/api/ApiResponseHelper.java             | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63b37214/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
index 3102433..e38daf2 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -76,6 +76,9 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
     @SerializedName("networkofferingdisplaytext") @Param(description="display text of the
network offering the network is created from")
     private String networkOfferingDisplayText;
 
+    @SerializedName("networkofferingconservemode") @Param(description="true if network offering
is ip conserve mode enabled")
+    private Boolean networkOfferingConserveMode;
+    
     @SerializedName("networkofferingavailability") @Param(description="availability of the
network offering the network is created from")
     private String networkOfferingAvailability;
 
@@ -247,7 +250,11 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
     public void setNetworkOfferingDisplayText(String networkOfferingDisplayText) {
         this.networkOfferingDisplayText = networkOfferingDisplayText;
     }
-
+    
+    public void setNetworkOfferingConserveMode(Boolean networkOfferingConserveMode) {
+        this.networkOfferingConserveMode = networkOfferingConserveMode;
+    }
+        
     public void setDisplaytext(String displaytext) {
         this.displaytext = displaytext;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63b37214/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 2547bd6..13b331c 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2173,6 +2173,7 @@ public class ApiResponseHelper implements ResponseGenerator {
             response.setNetworkOfferingId(networkOffering.getUuid());
             response.setNetworkOfferingName(networkOffering.getName());
             response.setNetworkOfferingDisplayText(networkOffering.getDisplayText());
+            response.setNetworkOfferingConserveMode(networkOffering.isConserveMode());
             response.setIsSystem(networkOffering.isSystemOnly());
             response.setNetworkOfferingAvailability(networkOffering.getAvailability().toString());
             response.setIsPersistent(networkOffering.getIsPersistent());


Mime
View raw message