Fixed authorizeSecurityGroupIngressRule to work with "name" parameter

alena11081 · alena11081 · commit 8a68e8148e1e · 2011-05-25T18:59:30.000-07:00
diff --git a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java b/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
@@ -120,6 +120,11 @@ public Long getSecurityGroupId() {
             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
@@ -59,6 +59,10 @@ public Long getId() {
             }
         }
         
+        if (id == null) {
+            throw new InvalidParameterValueException("Either id or name parameter is requred by deleteSecurityGroup command");
+        }
+        
         return id;
     }
 
@@ -105,4 +109,4 @@ public void execute(){
             throw new ServerApiException(BaseCmd.RESOURCE_IN_USE_ERROR, ex.getMessage());
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,11 @@ public Long getSecurityGroupId() {`
`120`	`120`	`if (securityGroupId == null) {`
`121`	`121`	`throw new InvalidParameterValueException("Unable to find security group " + securityGroupName + " for account id=" + getEntityOwnerId());`
`122`	`122`	`}`
	`123`	`+ securityGroupName = null;`
	`124`	`+ }`
	`125`	`+`
	`126`	`+ if (securityGroupId == null) {`
	`127`	`+ throw new InvalidParameterValueException("Either securityGroupId or securityGroupName is required by authorizeSecurityGroupIngress command");`
`123`	`128`	`}`
`124`	`129`
`125`	`130`	`return securityGroupId;`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@ public Long getId() {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ if (id == null) {`
	`63`	`+ throw new InvalidParameterValueException("Either id or name parameter is requred by deleteSecurityGroup command");`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`return id;`
`63`	`67`	`}`
`64`	`68`
`@@ -105,4 +109,4 @@ public void execute(){`
`105`	`109`	`throw new ServerApiException(BaseCmd.RESOURCE_IN_USE_ERROR, ex.getMessage());`
`106`	`110`	`}`
`107`	`111`	`}`
`108`		`-}`
	`112`	`+}`