Removed unused network object during tests

test/helpers/__init__.py

@@ -112,15 +112,12 @@ def get_provider_test_data(provider, key):
     return None
 
 
-def get_or_create_default_network(provider):
+def get_or_create_default_subnet(provider):
     """
-    Get the default network with the default subnet, if already created,
-    or create then return them
+    Return the default subnet to be used for tests
     """
-    sn = provider.networking.subnets.get_or_create_default(
+    return provider.networking.subnets.get_or_create_default(
         zone=get_provider_test_data(provider, 'placement'))
-    net = provider.networking.networks.get(sn.network_id)
-    return net, sn
 
 
 def delete_test_network(network):
@@ -197,15 +194,13 @@ def delete_test_instance(instance):
                           terminal_states=[InstanceState.ERROR])
 
 
-def cleanup_test_resources(instance=None, network=None, vm_firewall=None,
+def cleanup_test_resources(instance=None, vm_firewall=None,
                            key_pair=None):
     """Clean up any combination of supplied resources."""
-    with cleanup_action(lambda: delete_test_network(network)
-                        if network else None):
-        with cleanup_action(lambda: key_pair.delete() if key_pair else None):
-            with cleanup_action(lambda: vm_firewall.delete()
-                                if vm_firewall else None):
-                delete_test_instance(instance)
+    with cleanup_action(lambda: key_pair.delete() if key_pair else None):
+        with cleanup_action(lambda: vm_firewall.delete()
+                            if vm_firewall else None):
+            delete_test_instance(instance)
 
 
 def get_uuid():

test/test_block_store_service.py

@@ -50,7 +50,7 @@ class CloudBlockStoreServiceTestCase(ProviderTestBase):
         test_instance = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 test_instance)):
-            net, subnet = helpers.get_or_create_default_network(
+            subnet = helpers.get_or_create_default_subnet(
                 self.provider)
             test_instance = helpers.get_test_instance(
                 self.provider, label, subnet=subnet)
@@ -80,7 +80,7 @@ class CloudBlockStoreServiceTestCase(ProviderTestBase):
         test_instance = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 test_instance)):
-            net, subnet = helpers.get_or_create_default_network(
+            subnet = helpers.get_or_create_default_subnet(
                 self.provider)
             test_instance = helpers.get_test_instance(
                 self.provider, label, subnet=subnet)

test/test_compute_service.py

@@ -24,7 +24,6 @@ class CloudComputeServiceTestCase(ProviderTestBase):
         label = "cb-instcrud-{0}".format(helpers.get_uuid())
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         subnet = None
 
         def create_inst(label):
@@ -48,7 +47,7 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                 "Instance %s should have been deleted but still exists." %
                 label)
 
-        net, subnet = helpers.get_or_create_default_network(self.provider)
+        subnet = helpers.get_or_create_default_subnet(self.provider)
 
         sit.check_crud(self, self.provider.compute.instances, Instance,
                        "cb-instcrud", create_inst, cleanup_inst,
@@ -74,7 +73,8 @@ class CloudComputeServiceTestCase(ProviderTestBase):
         kp = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 test_instance, fw, kp)):
-            net, subnet = helpers.get_or_create_default_network(self.provider)
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             kp = self.provider.security.key_pairs.create(name=label)
             fw = self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
@@ -273,7 +273,7 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                 for _ in range(vm_type.num_ephemeral_disks):
                     lc.add_ephemeral_device()
 
-                net, subnet = helpers.get_or_create_default_network(
+                subnet = helpers.get_or_create_default_subnet(
                     self.provider)
 
                 inst = helpers.create_test_instance(
@@ -304,7 +304,8 @@ class CloudComputeServiceTestCase(ProviderTestBase):
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 test_inst, fw)):
-            net, subnet = helpers.get_or_create_default_network(self.provider)
+            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_image_service.py

@@ -79,7 +79,7 @@ class CloudImageServiceTestCase(ProviderTestBase):
 
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 test_instance)):
-            net, subnet = helpers.get_or_create_default_network(
+            subnet = helpers.get_or_create_default_subnet(
                 self.provider)
             test_instance = helpers.get_test_instance(
                 self.provider, instance_label, subnet=subnet)

test/test_security_service.py

@@ -61,6 +61,9 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
     @helpers.skipIfNoService(['security.vm_firewalls'])
     def test_crud_vm_firewall(self):
 
+        subnet = helpers.get_or_create_default_subnet(self.provider)
+        net = subnet.network
+
         def create_fw(label):
             return self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
@@ -69,8 +72,6 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
             if fw:
                 fw.delete()
 
-        net, _ = helpers.get_or_create_default_network(self.provider)
-
         sit.check_crud(self, self.provider.security.vm_firewalls,
                        VMFirewall, "cb-crudfw", create_fw, cleanup_fw)
 
@@ -83,7 +84,8 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 vm_firewall=fw)):
-            net, _ = helpers.get_or_create_default_network(self.provider)
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             fw = self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
 
@@ -93,7 +95,8 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
     def test_crud_vm_firewall_rules(self):
         label = 'cb-crudfw-rules-{0}'.format(helpers.get_uuid())
 
-        net, _ = helpers.get_or_create_default_network(self.provider)
+        subnet = helpers.get_or_create_default_subnet(self.provider)
+        net = subnet.network
 
         fw = None
         with helpers.cleanup_action(lambda: fw.delete()):
@@ -119,11 +122,11 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
 
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 vm_firewall=fw)):
-            net, _ = helpers.get_or_create_default_network(self.provider)
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             fw = self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
 
@@ -142,12 +145,12 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
 
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 vm_firewall=fw)):
 
-            net, _ = helpers.get_or_create_default_network(self.provider)
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             fw = self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
 
@@ -166,11 +169,11 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
 
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
-        net = None
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
                 vm_firewall=fw)):
-            net, _ = helpers.get_or_create_default_network(self.provider)
+            subnet = helpers.get_or_create_default_subnet(self.provider)
+            net = subnet.network
             fw = self.provider.security.vm_firewalls.create(
                 label=label, description=label, network_id=net.id)
             rules = list(fw.rules)