From 4d626c11bc4f029788ddc0e12340d8e880521f8b Mon Sep 17 00:00:00 2001 From: Ashwin Swaroop Date: Fri, 11 Sep 2015 18:27:31 -0400 Subject: [PATCH 1/2] This is the fix for the JIRA issue CLOUDSTACK-8817. The return values for endpoint and startpoint are now Integer instead of String. --- .../org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java index 4c1342a7ecb..368f732b197 100644 --- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java @@ -37,11 +37,11 @@ public class FirewallResponse extends BaseResponse { @SerializedName(ApiConstants.START_PORT) @Param(description = "the starting port of firewall rule's port range") - private String startPort; + private Integer startPort; @SerializedName(ApiConstants.END_PORT) @Param(description = "the ending port of firewall rule's port range") - private String endPort; + private Integer endPort; @SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description = "the public ip address id for the firewall rule") From 221624d2fe70289f1a70eb908027167634858012 Mon Sep 17 00:00:00 2001 From: Ashwin Swaroop Date: Sun, 13 Sep 2015 14:45:44 -0400 Subject: [PATCH 2/2] CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int --- .../org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++-- server/src/com/cloud/api/ApiResponseHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java index 368f732b197..462bd1bd1b0 100644 --- 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 class FirewallResponse extends BaseResponse { 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 index 06c68c4e1b2..6ee7c26d581 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -2124,11 +2124,11 @@ public class ApiResponseHelper implements ResponseGenerator { 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 cidrs = ApiDBUtils.findFirewallSourceCidrs(fwRule.getId());