Tests use default net/sn to avoid VPC limit

cloudbridge/cloud/providers/aws/services.py

@@ -261,7 +261,7 @@ class AWSSnapshotService(BaseSnapshotService):
 
     def list(self, limit=None, marker=None):
         return self.svc.list(limit=limit, marker=marker,
-                             OwnerIds=['self', 'amazon'])
+                             OwnerIds=['self'])
 
     def create(self, label, volume, description=None):
         """

test/helpers/__init__.py

@@ -138,16 +138,15 @@ def get_test_gateway(provider):
     """
     sn = get_or_create_default_subnet(provider)
     net = sn.network
-    return net, net.gateways.get_or_create_inet_gateway()
+    return net.gateways.get_or_create_inet_gateway()
 
 
-def delete_test_gateway(network, gateway):
+def delete_test_gateway(gateway):
     """
     Delete the supplied network and gateway.
     """
-    with cleanup_action(lambda: network.delete()):
-        with cleanup_action(lambda: gateway.delete()):
-            pass
+    with cleanup_action(lambda: gateway.delete()):
+        pass
 
 
 def create_test_instance(

test/test_compute_service.py

@@ -300,17 +300,12 @@ class CloudComputeServiceTestCase(ProviderTestBase):
 
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         test_inst = None
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
-                test_inst, fw, network=net)):
-            net = self.provider.networking.networks.create(
-                label=label, cidr_block='10.0.0.0/16')
-            subnet = net.create_subnet(
-                label=label, cidr_block='10.0.1.0/24',
-                zone=helpers.get_provider_test_data(self.provider,
-                                                    'placement'))
+                test_inst, fw)):
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             test_inst = helpers.get_test_instance(self.provider, label,
                                                   subnet=subnet)
             fw = self.provider.security.vm_firewalls.create(

test/test_network_service.py

@@ -110,7 +110,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                            "cb-crudsubnet", create_subnet, cleanup_subnet)
 
     def test_crud_floating_ip(self):
-        net, gw = helpers.get_test_gateway(
+        gw = helpers.get_test_gateway(
             self.provider)
 
         def create_fip(label):
@@ -122,18 +122,18 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                 gw.floating_ips.delete(fip.id)
 
         with helpers.cleanup_action(
-                lambda: helpers.delete_test_gateway(net, gw)):
+                lambda: helpers.delete_test_gateway(gw)):
             sit.check_crud(self, gw.floating_ips, FloatingIP,
                            "cb-crudfip", create_fip, cleanup_fip,
                            skip_name_check=True)
 
     def test_floating_ip_properties(self):
         # Check floating IP address
-        net, gw = helpers.get_test_gateway(
+        gw = helpers.get_test_gateway(
             self.provider)
         fip = gw.floating_ips.create()
         with helpers.cleanup_action(
-                lambda: helpers.delete_test_gateway(net, gw)):
+                lambda: helpers.delete_test_gateway(gw)):
             with helpers.cleanup_action(lambda: fip.delete()):
                 fipl = list(gw.floating_ips)
                 self.assertIn(fip, fipl)
@@ -154,30 +154,23 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
     @helpers.skipIfNoService(['networking.routers'])
     def test_crud_router(self):
 
-        def _cleanup(net, subnet, router, gateway):
-            with helpers.cleanup_action(lambda: net.delete()):
-                with helpers.cleanup_action(lambda: subnet.delete()):
-                    with helpers.cleanup_action(lambda: gateway.delete()):
-                        with helpers.cleanup_action(lambda: router.delete()):
-                            router.detach_subnet(subnet)
-                            router.detach_gateway(gateway)
+        def _cleanup(subnet, router, gateway):
+            with helpers.cleanup_action(lambda: gateway.delete()):
+                with helpers.cleanup_action(lambda: router.delete()):
+                    router.detach_subnet(subnet)
+                    router.detach_gateway(gateway)
 
         label = 'cb-crudrouter-{0}'.format(helpers.get_uuid())
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         sn = None
         router = None
         gteway = None
-        with helpers.cleanup_action(lambda: _cleanup(net, sn, router, gteway)):
-            net = self.provider.networking.networks.create(
-                label=label, cidr_block='10.0.0.0/16')
+        with helpers.cleanup_action(lambda: _cleanup(sn, router, gteway)):
+            sn = helpers.get_or_create_default_subnet(self.provider)
+            net = sn.network
             router = self.provider.networking.routers.create(label=label,
                                                              network=net)
-            cidr = '10.0.1.0/24'
-            sn = net.create_subnet(label=label, cidr_block=cidr,
-                                   zone=helpers.get_provider_test_data(
-                                       self.provider, 'placement'))
 
             # Check basic router properties
             sit.check_standard_behaviour(