CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int

ipudo · ipudo · commit 221624d2fe70 · 2015-09-13T14:45:44.000-04:00
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -87,11 +87,11 @@ public void setProtocol(String protocol) {
         this.protocol = protocol;
     }
 
-    public void setStartPort(String startPort) {
+    public void setStartPort(Integer startPort) {
         this.startPort = startPort;
     }
 
-    public void setEndPort(String endPort) {
+    public void setEndPort(Integer endPort) {
         this.endPort = endPort;
     }
 
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2124,11 +2124,11 @@ public FirewallResponse createFirewallResponse(FirewallRule fwRule) {
         response.setId(fwRule.getUuid());
         response.setProtocol(fwRule.getProtocol());
         if (fwRule.getSourcePortStart() != null) {
-            response.setStartPort(Integer.toString(fwRule.getSourcePortStart()));
+            response.setStartPort(fwRule.getSourcePortStart());
         }
 
         if (fwRule.getSourcePortEnd() != null) {
-            response.setEndPort(Integer.toString(fwRule.getSourcePortEnd()));
+            response.setEndPort(fwRule.getSourcePortEnd());
         }
 
         List<String> cidrs = ApiDBUtils.findFirewallSourceCidrs(fwRule.getId());

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,11 @@ public void setProtocol(String protocol) {`
`87`	`87`	`this.protocol = protocol;`
`88`	`88`	`}`
`89`	`89`
`90`		`- public void setStartPort(String startPort) {`
	`90`	`+ public void setStartPort(Integer startPort) {`
`91`	`91`	`this.startPort = startPort;`
`92`	`92`	`}`
`93`	`93`
`94`		`- public void setEndPort(String endPort) {`
	`94`	`+ public void setEndPort(Integer endPort) {`
`95`	`95`	`this.endPort = endPort;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -2124,11 +2124,11 @@ public FirewallResponse createFirewallResponse(FirewallRule fwRule) {`
`2124`	`2124`	`response.setId(fwRule.getUuid());`
`2125`	`2125`	`response.setProtocol(fwRule.getProtocol());`
`2126`	`2126`	`if (fwRule.getSourcePortStart() != null) {`
`2127`		`- response.setStartPort(Integer.toString(fwRule.getSourcePortStart()));`
	`2127`	`+ response.setStartPort(fwRule.getSourcePortStart());`
`2128`	`2128`	`}`
`2129`	`2129`
`2130`	`2130`	`if (fwRule.getSourcePortEnd() != null) {`
`2131`		`- response.setEndPort(Integer.toString(fwRule.getSourcePortEnd()));`
	`2131`	`+ response.setEndPort(fwRule.getSourcePortEnd());`
`2132`	`2132`	`}`
`2133`	`2133`
`2134`	`2134`	`List<String> cidrs = ApiDBUtils.findFirewallSourceCidrs(fwRule.getId());`