You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/09/13 22:24:28 UTC
[1/3] git commit: updated refs/heads/master to 120e1cc
Repository: cloudstack
Updated Branches:
refs/heads/master ff1ce07ae -> 120e1cc93
This is the fix for the JIRA issue CLOUDSTACK-8817. The return values for endpoint and startpoint are now Integer instead of String.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d626c11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d626c11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d626c11
Branch: refs/heads/master
Commit: 4d626c11bc4f029788ddc0e12340d8e880521f8b
Parents: ff1ce07
Author: Ashwin Swaroop <as...@gmail.com>
Authored: Fri Sep 11 18:27:31 2015 -0400
Committer: Ashwin Swaroop <as...@gmail.com>
Committed: Fri Sep 11 18:27:31 2015 -0400
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d626c11/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 4c1342a..368f732 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")
[3/3] git commit: updated refs/heads/master to 120e1cc
Posted by wi...@apache.org.
Merge pull request #810 from ashwinswaroop/feature_x
This is the fix for the JIRA issue CLOUDSTACK-8817.This is my first contribution to Apache CloudStack. The return values for endpoint and startpoint have now been changed to Integer instead of String. Please let me know if this is the only change that is required or if there are additional files which will be impacted by this change which require modification also.
* pr/810:
CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int
This is the fix for the JIRA issue CLOUDSTACK-8817. The return values for endpoint and startpoint are now Integer instead of String.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/120e1cc9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/120e1cc9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/120e1cc9
Branch: refs/heads/master
Commit: 120e1cc934815ad9a58c4b5e89f5222251114bb3
Parents: ff1ce07 221624d
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Sun Sep 13 22:24:00 2015 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Sun Sep 13 22:24:00 2015 +0200
----------------------------------------------------------------------
.../org/apache/cloudstack/api/response/FirewallResponse.java | 8 ++++----
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 120e1cc
Posted by wi...@apache.org.
CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/221624d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/221624d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/221624d2
Branch: refs/heads/master
Commit: 221624d2fe70289f1a70eb908027167634858012
Parents: 4d626c1
Author: Ashwin Swaroop <as...@gmail.com>
Authored: Sun Sep 13 14:45:44 2015 -0400
Committer: Ashwin Swaroop <as...@gmail.com>
Committed: Sun Sep 13 14:45:44 2015 -0400
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++--
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221624d2/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 368f732..462bd1b 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221624d2/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 06c68c4..6ee7c26 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<String> cidrs = ApiDBUtils.findFirewallSourceCidrs(fwRule.getId());