Merge lp:~therve/txaws/security-group-fix into lp:txaws

[Thomas Herve]

[Kapil Thangavelu (hazmat)]

looks good to me, +1

review: Approve

=== modified file 'txaws/ec2/client.py'
--- txaws/ec2/client.py	2009-12-08 04:08:53 +0000
+++ txaws/ec2/client.py	2010-03-18 14:46:33 +0000
@@ -218,18 +218,16 @@
             name = group_info.findtext("groupName")
             description = group_info.findtext("groupDescription")
             owner_id = group_info.findtext("ownerId")
-            allowed_groups = {}
+            allowed_groups = []
             allowed_ips = []
             ip_permissions = group_info.find("ipPermissions") or []
             for ip_permission in ip_permissions:
                 user_id = ip_permission.findtext("groups/item/userId")
                 group_name = ip_permission.findtext("groups/item/groupName")
                 if user_id and group_name:
-                    key = (user_id, group_name)
-                    if key not in allowed_groups:
-                        user_group_pair = model.UserIDGroupPair(
-                            user_id, group_name)
-                        allowed_groups.setdefault(user_id, user_group_pair)
+                    user_group_pair = model.UserIDGroupPair(
+                        user_id, group_name)
+                    allowed_groups.append(user_group_pair)
                 else:
                     ip_protocol = ip_permission.findtext("ipProtocol")
                     from_port = int(ip_permission.findtext("fromPort"))
@@ -241,7 +239,7 @@
 
             security_group = model.SecurityGroup(
                 name, description, owner_id=owner_id,
-                groups=allowed_groups.values(), ips=allowed_ips)
+                groups=allowed_groups, ips=allowed_ips)
             result.append(security_group)
         return result
 

=== modified file 'txaws/ec2/tests/test_client.py'
--- txaws/ec2/tests/test_client.py	2009-11-28 00:43:07 +0000
+++ txaws/ec2/tests/test_client.py	2010-03-18 14:46:33 +0000
@@ -422,7 +422,8 @@
             self.assertEquals(security_group.description, "Web Servers")
             self.assertEquals([(pair.user_id, pair.group_name)
                                for pair in security_group.allowed_groups],
-                              [("group-user-id", "group-name")])
+                              [("group-user-id", "group-name1"),
+                               ("group-user-id", "group-name2")])
             self.assertEquals(
                 [(ip.ip_protocol, ip.from_port, ip.to_port, ip.cidr_ip)
                  for ip in security_group.allowed_ips],

=== modified file 'txaws/testing/payload.py'
--- txaws/testing/payload.py	2009-11-23 00:55:44 +0000
+++ txaws/testing/payload.py	2010-03-18 14:46:33 +0000
@@ -247,12 +247,28 @@
         </item>
         <item>
           <ipProtocol>udp</ipProtocol>
-          <fromPort>81</fromPort>
-          <toPort>81</toPort>
-          <groups>
-            <item>
-              <userId>group-user-id</userId>
-              <groupName>group-name</groupName>
+          <fromPort>0</fromPort>
+          <toPort>0</toPort>
+          <groups>
+            <item>
+              <userId>group-user-id</userId>
+              <groupName>group-name1</groupName>
+            </item>
+          </groups>
+          <ipRanges>
+            <item>
+              <cidrIp>0.0.0.0/16</cidrIp>
+            </item>
+          </ipRanges>
+        </item>
+        <item>
+          <ipProtocol>udp</ipProtocol>
+          <fromPort>0</fromPort>
+          <toPort>0</toPort>
+          <groups>
+            <item>
+              <userId>group-user-id</userId>
+              <groupName>group-name2</groupName>
             </item>
           </groups>
           <ipRanges>