Typo fix with security group selection; enable relevant tests

cloudbridge/cloud/providers/aws/services.py

@@ -561,7 +561,7 @@ class AWSInstanceService(BaseInstanceService):
                         subnet_id, zone_id = _deduce_subnet_and_zone(
                             vpc, zone_id)
             else:
-                sg_ids = sg_ids
+                sg_ids = _sg_ids
             if not subnet_id:
                 raise AttributeError("Supplied security group(s) ({0}) must "
                                      "be associated with a VPC."

test/test_compute_service.py

@@ -133,14 +133,13 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                 test_instance.key_pair_name,
                 kp.name)
             self.assertIsInstance(test_instance.security_groups, list)
-            # EA FIXME: diff sg gets assigned than supplied?!?
-            # self.assertEqual(
-            #     test_instance.security_groups[0],
-            #     sg)
+            self.assertEqual(
+                test_instance.security_groups[0],
+                sg)
             self.assertIsInstance(test_instance.security_group_ids, list)
-            # self.assertEqual(
-            #     test_instance.security_group_ids[0],
-            #     sg.id)
+            self.assertEqual(
+                test_instance.security_group_ids[0],
+                sg.id)
             # Must have either a public or a private ip
             ip_private = test_instance.private_ips[0] \
                 if test_instance.private_ips else None

test/test_network_service.py

@@ -68,6 +68,12 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                     ip in ipl,
                     "Floating IP address {0} should exist in the list {1}"
                     .format(ip.id, ipl))
+                # 2016-08: address filtering not implemented in moto
+                # empty_ipl = self.provider.network.floating_ips('dummy-net')
+                # self.assertFalse(
+                #     empty_ipl,
+                #     "Bogus network should not have any floating IPs: {0}"
+                #     .format(empty_ipl))
                 self.assertIn(
                     ip.public_ip, repr(ip),
                     "repr(obj) should contain the address public IP value.")