From 8f2cd77c87b3eb0f4a49e8d44d8693fbc4a12398 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 10 Jan 2012 11:47:49 -0800
Subject: [PATCH] bug 12931: Add conserve mode in network offering response

---
 .../com/cloud/api/response/NetworkOfferingResponse.java    | 7 +++++++
 server/src/com/cloud/api/ApiResponseHelper.java            | 1 +
 2 files changed, 8 insertions(+)

diff --git a/api/src/com/cloud/api/response/NetworkOfferingResponse.java b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
index 763fbd0137d..ca34c6c2254 100644
--- a/api/src/com/cloud/api/response/NetworkOfferingResponse.java
+++ b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
@@ -52,6 +52,9 @@ public class NetworkOfferingResponse extends BaseResponse{
     @SerializedName(ApiConstants.SPECIFY_VLAN) @Param(description="true if network offering supports vlans, false otherwise")
     private Boolean specifyVlan;
     
+    @SerializedName(ApiConstants.CONSERVE_MODE) @Param(description="true if network offering is ip conserve mode enabled")
+    private Boolean conserveMode;
+    
     @SerializedName(ApiConstants.AVAILABILITY) @Param(description="availability of the network offering")
     private String availability;
     
@@ -102,6 +105,10 @@ public class NetworkOfferingResponse extends BaseResponse{
         this.specifyVlan = specifyVlan;
     }
 
+    public void setConserveMode(Boolean conserveMode) {
+        this.conserveMode = conserveMode;
+    }
+
     public void setAvailability(String availability) {
         this.availability = availability;
     }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 0a8f5218a07..5151204839c 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2583,6 +2583,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         response.setTrafficType(offering.getTrafficType().toString());
         response.setIsDefault(offering.isDefault());
         response.setSpecifyVlan(offering.getSpecifyVlan());
+        response.setConserveMode(offering.isConserveMode());
         response.setAvailability(offering.getAvailability().toString());
         response.setNetworkRate(ApiDBUtils.getNetworkRate(offering.getId()));
         if (offering.getServiceOfferingId() != null) {