Merge lp:~clint-fewbar/pyjuju/open-udp-ports into lp:pyjuju

[Clint Byrum]

Opens UDP ports the same way TCP ports are opened

Opens UDP ports the same way TCP ports are opened

[Martin Packman (gz)]

Going by the current contents of nova/compute/api.py you could instead omit the protocol and ports to permit all icmp/tcp/udp traffic internally. Is that preferable?

review: Needs Information

[Clint Byrum (clint-fewbar)]

Perhaps that could work too. I feel that this is a case where being explicit might be a good thing, as I want to specifically make it "just like ec2" not "as awesome as possible".

[Martin Packman (gz)]

It's not completely explict, but by not passing ip_protocol or ports params to .authorize_security_group, the EC2 provider is effectively using the same logic that omitting the protocol and ports would with openstack.

[Kapil Thangavelu (hazmat)]

lgtm

review: Approve

=== modified file 'juju/providers/openstack/ports.py'
--- juju/providers/openstack/ports.py	2012-07-20 16:14:11 +0000
+++ juju/providers/openstack/ports.py	2012-09-19 05:38:17 +0000
@@ -122,6 +122,9 @@
             yield self.nova.add_security_group_rule(
                 parent_group_id=sg['id'], group_id=sg['id'],
                 ip_protocol="tcp", from_port=1, to_port=65535)
+            yield self.nova.add_security_group_rule(
+                parent_group_id=sg['id'], group_id=sg['id'],
+                ip_protocol="udp", from_port=1, to_port=65535)
 
         machine_group = self._machine_group_name(machine_id)
         if machine_group in groups_by_name:

=== modified file 'juju/providers/openstack/tests/test_bootstrap.py'
--- juju/providers/openstack/tests/test_bootstrap.py	2012-09-10 03:20:20 +0000
+++ juju/providers/openstack/tests/test_bootstrap.py	2012-09-19 05:38:17 +0000
@@ -53,6 +53,17 @@
             response={'security_group_rule': {
                 'id': 145, 'parent_group_id': 1,
             }})
+        self.expect_nova_post("os-security-group-rules",
+            {'security_group_rule': {
+                'parent_group_id': 1,
+                'group_id': 1,
+                'ip_protocol': "udp",
+                'from_port': 1,
+                'to_port': 65535,
+            }},
+            response={'security_group_rule': {
+                'id': 146, 'parent_group_id': 1,
+            }})
 
     def expect_create_machine_group(self, machine_id):
         machine = str(machine_id)

=== modified file 'juju/providers/openstack/tests/test_ports.py'
--- juju/providers/openstack/tests/test_ports.py	2012-07-18 21:17:01 +0000
+++ juju/providers/openstack/tests/test_ports.py	2012-09-19 05:38:17 +0000
@@ -209,6 +209,17 @@
             response={'security_group_rule': {
                 'id': 145, 'parent_group_id': 1,
             }})
+        self.expect_nova_post("os-security-group-rules",
+            {'security_group_rule': {
+                'parent_group_id': 1,
+                'group_id': 1,
+                'ip_protocol': "udp",
+                'from_port': 1,
+                'to_port': 65535,
+            }},
+            response={'security_group_rule': {
+                'id': 146, 'parent_group_id': 1,
+            }})
 
     def expect_create_machine_group(self, machine_id):
         machine = str(machine_id)