CLOUDSTACK-1127: [EC2 Query API] DescribeSecurityGroups, support for additional filters

Likitha Shetty · Prachi Damle · commit 52b81f8bffb0 · 2013-02-11T15:26:49.000-08:00
Add support for filters ip-permission.group-name and ip-permission.user-id
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
@@ -41,6 +41,8 @@ public EC2GroupFilterSet()
 		filterTypes.put( "ip-permission.from-port", "string" );
 		filterTypes.put( "ip-permission.to-port",   "string" ); 
 		filterTypes.put( "ip-permission.protocol",  "string" ); 
+        filterTypes.put( "ip-permission.group-name","string" );
+        filterTypes.put( "ip-permission.user-id",   "string" );
 		filterTypes.put( "owner-id",                "string" );
 	}
 
@@ -126,7 +128,7 @@ private boolean ipPermissionFilterMatched( EC2SecurityGroup sg, List<EC2Filter>
         EC2IpPermission[] permissionSet = sg.getIpPermissionSet();
 
         for (EC2IpPermission perm : permissionSet) {
-            boolean matched = true;
+            boolean matched = false;
             for (EC2Filter filter : ipPermissionFilterSet) {
                 String filterName = filter.getName();
                 String[] valueSet = filter.getValueSet();
@@ -144,6 +146,24 @@ else if (filterName.equalsIgnoreCase( "ip-permission.from-port" )) {
                         matched = containsString( perm.getToPort().toString(), valueSet );
                 } else if (filterName.equalsIgnoreCase( "ip-permission.protocol" ))
                     matched = containsString( perm.getProtocol(), valueSet );
+                else if (filterName.equalsIgnoreCase( "ip-permission.group-name" )) {
+                    EC2SecurityGroup[] userSet = perm.getUserSet();
+                    for (EC2SecurityGroup user : userSet) {
+                        if (containsString(user.getName(), valueSet)) {
+                            matched = true;
+                            break;
+                        }
+                    }
+                }
+                else if (filterName.equalsIgnoreCase( "ip-permission.user-id" )){
+                    EC2SecurityGroup[] userSet = perm.getUserSet();
+                    for (EC2SecurityGroup user : userSet) {
+                        if (containsString(user.getAccountName(), valueSet)) {
+                            matched = true;
+                            break;
+                        }
+                    }
+                }
                 if (!matched) break;
             }
             if (matched) return true;
