Update tests for networking structure change

cloudbridge/cloud/providers/aws/resources.py

@@ -1109,7 +1109,7 @@ class AWSSubnet(BaseSubnet):
             self._subnet.state, NetworkState.UNKNOWN)
 
     def refresh(self):
-        subnet = self._provider.network.subnets.get(self.id)
+        subnet = self._provider.networking.subnets.get(self.id)
         if subnet:
             # pylint:disable=protected-access
             self._subnet = subnet._subnet

cloudbridge/cloud/providers/openstack/resources.py

@@ -757,7 +757,7 @@ class OpenStackNetwork(BaseNetwork):
 
     def refresh(self):
         """Refresh the state of this network by re-querying the provider."""
-        network = self._provider.network.get(self.id)
+        network = self._provider.networking.networks.get(self.id)
         if network:
             # pylint:disable=protected-access
             self._network = network._network
@@ -823,7 +823,7 @@ class OpenStackSubnet(BaseSubnet):
              else self.SubnetState.AVAILABLE
 
     def refresh(self):
-        subnet = self._provider.network.subnets.get(self.id)
+        subnet = self._provider.networking.subnets.get(self.id)
         if subnet:
             # pylint:disable=protected-access
             self._subnet = subnet._subnet

test/test_network_service.py

@@ -8,35 +8,35 @@ from cloudbridge.cloud.interfaces.resources import RouterState
 
 class CloudNetworkServiceTestCase(ProviderTestBase):
 
-    @helpers.skipIfNoService(['network'])
+    @helpers.skipIfNoService(['networking.networks'])
     def test_crud_network_service(self):
         name = 'cb_crudnetwork-{0}'.format(helpers.get_uuid())
         subnet_name = 'cb_crudsubnet-{0}'.format(helpers.get_uuid())
-        net = self.provider.network.create(name=name)
+        net = self.provider.networking.networks.create(name=name)
         with helpers.cleanup_action(
             lambda:
-                self.provider.network.delete(network_id=net.id)
+                self.provider.networking.networks.delete(network_id=net.id)
         ):
             sit.check_standard_behaviour(
-                self, self.provider.network, net)
+                self, self.provider.networking.networks, net)
 
             # check subnet
-            subnet = self.provider.network.subnets.create(
+            subnet = self.provider.networking.subnets.create(
                 network=net, cidr_block="10.0.0.1/24", name=subnet_name)
             with helpers.cleanup_action(
                 lambda:
-                    self.provider.network.subnets.delete(subnet=subnet)
+                    self.provider.networking.subnets.delete(subnet=subnet)
             ):
                 sit.check_standard_behaviour(
-                    self, self.provider.network.subnets, subnet)
+                    self, self.provider.networking.subnets, subnet)
 
-            sit.check_delete(self, self.provider.network.subnets, subnet)
+            sit.check_delete(self, self.provider.networking.subnets, subnet)
 
             # Check floating IP address
-            ip = self.provider.network.create_floating_ip()
+            ip = self.provider.networking.networks.create_floating_ip()
             ip_id = ip.id
             with helpers.cleanup_action(lambda: ip.delete()):
-                ipl = self.provider.network.floating_ips()
+                ipl = self.provider.networking.networks.floating_ips()
                 self.assertTrue(
                     ip in ipl,
                     "Floating IP address {0} should exist in the list {1}"
@@ -57,20 +57,20 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                 self.assertFalse(
                     ip.in_use(),
                     "Newly created floating IP address should not be in use.")
-            ipl = self.provider.network.floating_ips()
+            ipl = self.provider.networking.networks.floating_ips()
             found_ip = [a for a in ipl if a.id == ip_id]
             self.assertTrue(
                 len(found_ip) == 0,
                 "Floating IP {0} should have been deleted but still exists."
                 .format(ip_id))
 
-        sit.check_delete(self, self.provider.network, net)
+        sit.check_delete(self, self.provider.networking.networks, net)
 
-    @helpers.skipIfNoService(['network'])
+    @helpers.skipIfNoService(['networking.networks'])
     def test_network_properties(self):
         name = 'cb_propnetwork-{0}'.format(helpers.get_uuid())
         subnet_name = 'cb_propsubnet-{0}'.format(helpers.get_uuid())
-        net = self.provider.network.create(name=name)
+        net = self.provider.networking.networks.create(name=name)
         with helpers.cleanup_action(
             lambda: net.delete()
         ):
@@ -107,7 +107,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                     "Subnet's CIDR %s should match the specified one %s." % (
                         sn.cidr_block, cidr))
 
-    @helpers.skipIfNoService(['network.routers'])
+    @helpers.skipIfNoService(['networking.networks.routers'])
     def test_crud_router(self):
 
         def _cleanup(net, subnet, router):
@@ -124,8 +124,8 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
         sn = None
         router = None
         with helpers.cleanup_action(lambda: _cleanup(net, sn, router)):
-            router = self.provider.network.create_router(name=name)
-            net = self.provider.network.create(name=name)
+            router = self.provider.networking.networks.create_router(name=name)
+            net = self.provider.networking.networks.create(name=name)
             cidr = '10.0.1.0/24'
             sn = net.create_subnet(cidr_block=cidr, name=name,
                                    zone=helpers.get_provider_test_data(
@@ -133,9 +133,9 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
 
             # Check basic router properties
             self.assertIn(
-                router, self.provider.network.routers(),
+                router, self.provider.networking.networks.routers(),
                 "Router {0} should exist in the router list {1}.".format(
-                    router.id, self.provider.network.routers()))
+                    router.id, self.provider.networking.networks.routers()))
             self.assertIn(
                 router.id, repr(router),
                 "repr(obj) should contain the object id so that the object"
@@ -157,7 +157,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
             # On OpenStack only one network is external and on AWS every
             # network is external, yet we need to use the one we've created?!
             if self.provider.PROVIDER_ID == 'openstack':
-                for n in self.provider.network:
+                for n in self.provider.networking.networks:
                     if n.external:
                         external_net = n
                         break
@@ -172,7 +172,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
             router.add_route(sn.id)
             # TODO: add a check for routes after that's been implemented
 
-        routerl = self.provider.network.routers()
+        routerl = self.provider.networking.networks.routers()
         found_router = [r for r in routerl if r.name == name]
         self.assertEqual(
             len(found_router), 0,