From c130768b9486796540d167bd258a5b894dfa6ccb Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Wed, 18 Apr 2012 18:22:41 +0530 Subject: [PATCH] DescribeSecurityGroup: Use String instead of Long for RuleId RevokeSecurityGroupIngress: Match the response name that CloudBridge uses with that provided by Cloudstack --- .../com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java | 2 +- awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java | 4 ++-- .../cloud/stack/models/CloudStackSecurityGroupIngress.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java b/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java index b72923573e2..7e272acc71e 100644 --- a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java +++ b/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java @@ -31,7 +31,7 @@ import com.cloud.user.Account; public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupIngressCmd.class.getName()); - private static final String s_name = "revokesecuritygroupingress"; + private static final String s_name = "revokesecuritygroupingressresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java b/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java index 68b3b53b93c..4f54114e8fc 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java @@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName; public class CloudStackIngressRule { @SerializedName(ApiConstants.RULE_ID) - private Long ruleId; + private String ruleId; @SerializedName(ApiConstants.PROTOCOL) private String protocol; @@ -49,7 +49,7 @@ public class CloudStackIngressRule { public CloudStackIngressRule() { } - public Long getRuleId() { + public String getRuleId() { return ruleId; } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java index 608887a18e5..f4d4291637a 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java @@ -36,7 +36,7 @@ public class CloudStackSecurityGroupIngress { @SerializedName(ApiConstants.PROTOCOL) private String protocol; @SerializedName(ApiConstants.RULE_ID) - private Long ruleId; + private String ruleId; @SerializedName(ApiConstants.SECURITY_GROUP_NAME) private String securityGroupName; @SerializedName(ApiConstants.START_PORT) @@ -102,7 +102,7 @@ public class CloudStackSecurityGroupIngress { /** * @return the ruleId */ - public Long getRuleId() { + public String getRuleId() { return ruleId; }