Cameron & Ed | Fix EC2RuleTransformer constructor use, updated security group rule integration test

ec2driver.py

@@ -173,7 +173,7 @@ class EC2Driver(driver.ComputeDriver):
                 ),
                 ec2_rule_service=EC2RuleService(
                     ec2_connection=self.ec2_conn,
-                    ec2_rule_transformer=EC2RuleTransformer()
+                    ec2_rule_transformer=EC2RuleTransformer(self.ec2_conn)
                 )
             )
         )

tests/integration/test_security_groups.py

@@ -3,7 +3,7 @@ import unittest
 from random import randint
 
 from ...ec2driver_config import *
-from tests.integration.ec2_test_base import EC2TestBase
+from ec2_test_base import EC2TestBase
 
 
 class TestSecurityGroups(EC2TestBase):
@@ -36,9 +36,9 @@ class TestSecurityGroups(EC2TestBase):
 
         updated_matching_ec2_security_group = self._wait_for_ec2_group_to_have_no_instances(self.security_group)
         self.assertEqual(updated_matching_ec2_security_group.instances(), [])
-
-    def test_should_add_rule_to_ec2_security_group_when_group_is_added_to_an_instance(self):
-
+        
+    @unittest.skipIf(os.environ.get('MOCK_EC2'), 'Not supported by moto')
+    def test_should_add_rule_to_ec2_security_group_when_rule_is_added_to_openstack_group_associated_with_instance(self):
         security_group_rule = self.nova.security_group_rules.create(
             parent_group_id=self.security_group.id,
             ip_protocol='tcp',
@@ -47,13 +47,13 @@ class TestSecurityGroups(EC2TestBase):
             cidr='0.0.0.0/0'
         )
 
-        updated_security_group = self.nova.security_groups.get(self.security_group.id)
-
         ec2_security_group = self.ec2_conn.get_all_security_groups(groupnames=self.security_group.name)[0]
         ec2_rule = ec2_security_group.rules[0]
 
-        self.assertEqual(ec2_rule.ip_protocol, security_group_rule.ip_protocol)
-        #etc
+        self.assertEqual(ec2_rule.ip_protocol, security_group_rule['ip_protocol'])
+        self.assertEqual(ec2_rule.from_port, security_group_rule['from_port'])
+        self.assertEqual(ec2_rule.to_port, security_group_rule['to_port'])
+        self.assertEqual(ec2_rule.grants[0].cidr_ip, security_group_rule['ip_range']['cidr'])
 
     def _destroy_security_group(self):
         print "Cleanup: Destroying security group"