From 8a68e8148e1e12df8d1a3de653008ef0399ef28d Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 25 May 2011 18:54:11 -0700 Subject: [PATCH] Fixed authorizeSecurityGroupIngressRule to work with "name" parameter --- .../api/commands/AuthorizeSecurityGroupIngressCmd.java | 5 +++++ api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java b/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java index fe1f9ee1b55..d192f5d06b6 100644 --- a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java @@ -120,6 +120,11 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd { if (securityGroupId == null) { throw new InvalidParameterValueException("Unable to find security group " + securityGroupName + " for account id=" + getEntityOwnerId()); } + securityGroupName = null; + } + + if (securityGroupId == null) { + throw new InvalidParameterValueException("Either securityGroupId or securityGroupName is required by authorizeSecurityGroupIngress command"); } return securityGroupId; diff --git a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java b/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java index b654fa8e511..c29647592a4 100644 --- a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java +++ b/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java @@ -59,6 +59,10 @@ public class DeleteSecurityGroupCmd extends BaseCmd { } } + if (id == null) { + throw new InvalidParameterValueException("Either id or name parameter is requred by deleteSecurityGroup command"); + } + return id; } @@ -105,4 +109,4 @@ public class DeleteSecurityGroupCmd extends BaseCmd { throw new ServerApiException(BaseCmd.RESOURCE_IN_USE_ERROR, ex.getMessage()); } } -} \ No newline at end of file +}