return netmask in listStorageNetworkIpRangeCmd

frank · frank · commit b59c3c595e2b · 2012-02-06T14:37:56.000-08:00
diff --git a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java b/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
@@ -12,20 +12,23 @@ public class StorageNetworkIpRangeResponse extends BaseResponse {
     @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
     private Integer vlan;
     
-    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod uuid for the VLAN IP range")
+    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod uuid for the storage network IP range")
     private String podUuid;
 
-    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the VLAN IP range")
+    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the storage network IP range")
     private String startIp;
 
-    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the VLAN IP range")
+    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the storage network IP range")
     private String endIp;
     
-    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network uuid of vlan range")
+    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network uuid of storage network IP range")
     private String networkUuid;
     
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone uuid of the VLAN IP range")
+    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone uuid of the storage network IP range")
     private String zoneUuid;
+    
+    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the storage network IP range")
+    private String netmask;
      
 	public void setUuid(String uuId) {
 		this.uuid = uuid;
@@ -54,4 +57,8 @@ public void setEndIp(String endIp) {
     public void setNetworkUuid(String networkUuid) {
         this.networkUuid = networkUuid;
     }
+    
+    public void setNetmask(String netmask) {
+    	this.netmask = netmask;
+    }
 }
diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/com/cloud/dc/StorageNetworkIpRange.java
@@ -14,4 +14,6 @@ public interface StorageNetworkIpRange {
     String getNetworkUuid();
 
     String getZoneUuid();
+    
+    String getNetmask();
 }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3284,6 +3284,7 @@ public StorageNetworkIpRangeResponse createStorageNetworkIpRangeResponse(Storage
         response.setPodUuid(result.getPodUuid());
         response.setZoneUuid(result.getZoneUuid());
         response.setNetworkUuid(result.getNetworkUuid());
+        response.setNetmask(result.getNetmask());
         response.setObjectName("storagenetworkiprange");
         return response;
     }

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ public interface StorageNetworkIpRange {`
`14`	`14`	`String getNetworkUuid();`
`15`	`15`
`16`	`16`	`String getZoneUuid();`
	`17`	`+`
	`18`	`+ String getNetmask();`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3284,6 +3284,7 @@ public StorageNetworkIpRangeResponse createStorageNetworkIpRangeResponse(Storage`
`3284`	`3284`	`response.setPodUuid(result.getPodUuid());`
`3285`	`3285`	`response.setZoneUuid(result.getZoneUuid());`
`3286`	`3286`	`response.setNetworkUuid(result.getNetworkUuid());`
	`3287`	`+ response.setNetmask(result.getNetmask());`
`3287`	`3288`	`response.setObjectName("storagenetworkiprange");`
`3288`	`3289`	`return response;`
`3289`	`3290`	`}`