Răsfoiți Sursa

Removing default cleanup

almahmoud 7 ani în urmă
părinte
comite
252e63eee9

+ 1 - 1
cloudbridge/cloud/providers/azure/services.py

@@ -955,7 +955,7 @@ class AzureSubnetService(BaseSubnetService):
                                      self._list_subnets(network),
                                      limit=limit, marker=marker)
 
-    def _list_subnets(self, network="bla"):
+    def _list_subnets(self, network=None):
         result_list = []
         if network:
             network_id = network.id \

+ 3 - 12
test/test_network_service.py

@@ -3,7 +3,6 @@ from test.helpers import ProviderTestBase
 from test.helpers import get_provider_test_data
 from test.helpers import standard_interface_tests as sit
 
-from cloudbridge.cloud.base.resources import BaseNetwork
 from cloudbridge.cloud.interfaces.resources import FloatingIP
 from cloudbridge.cloud.interfaces.resources import Network
 from cloudbridge.cloud.interfaces.resources import RouterState
@@ -195,14 +194,6 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
 
     @helpers.skipIfNoService(['networking.networks'])
     def test_default_network(self):
-        subnet = None
-        with helpers.cleanup_action(lambda: subnet.delete()):
-            subnet = self.provider.networking.subnets.get_or_create_default(
-                zone=get_provider_test_data(self.provider, 'placement'))
-            self.assertIsInstance(subnet, Subnet)
-        networks = self.provider.networking.networks.find(
-            name=BaseNetwork.CB_DEFAULT_NETWORK_NAME)
-
-        if networks:
-            network = networks[0]
-            network.delete()
+        subnet = self.provider.networking.subnets.get_or_create_default(
+            zone=get_provider_test_data(self.provider, 'placement'))
+        self.assertIsInstance(subnet, Subnet)