Update several remaining references to the old network module structure

cloudbridge/cloud/interfaces/services.py

@@ -641,11 +641,11 @@ class NetworkService(PageableObjectMixin, CloudService):
         .. code-block:: python
 
             # Print all subnets
-            for s in provider.network.subnets:
+            for s in provider.networking.subnets:
                 print(s.id, s.name)
 
             # Get subnet by ID
-            s = provider.network.subnets.get('subnet-id')
+            s = provider.networking.subnets.get('subnet-id')
             print(s.id, s.name)
 
         :rtype: :class:`.SubnetService`

cloudbridge/cloud/providers/aws/services.py

@@ -517,7 +517,7 @@ class AWSInstanceService(BaseInstanceService):
         image_id = image.id if isinstance(image, MachineImage) else image
         instance_size = instance_type.id if \
             isinstance(instance_type, InstanceType) else instance_type
-        subnet = (self.provider.network.subnets.get(subnet)
+        subnet = (self.provider.networking.subnets.get(subnet)
                   if isinstance(subnet, str) else subnet)
         zone_id = zone.id if isinstance(zone, PlacementZone) else zone
         key_pair_name = key_pair.name if isinstance(
@@ -886,7 +886,7 @@ class AWSSubnetService(BaseSubnetService):
             if sn.tags.get('Name') == AWSSubnet.CB_DEFAULT_SUBNET_NAME:
                 return AWSSubnet(self.provider, sn)
         # No provider-default Subnet exists, try to create it (net + subnets)
-        default_net = self.provider.network.create(
+        default_net = self.provider.networking.networks.create(
             name=AWSNetwork.CB_DEFAULT_NETWORK_NAME, cidr_block='10.0.0.0/16')
         # Create a subnet in each of the region's zones
         region = self.provider.compute.regions.get(

cloudbridge/cloud/providers/openstack/services.py

@@ -571,7 +571,7 @@ class OpenStackInstanceService(BaseInstanceService):
             net_id = subnet.network_id
         else:
             subnet_id = subnet
-            net_id = (self.provider.network.subnets.get(subnet_id).network_id
+            net_id = (self.provider.networking.subnets.get(subnet_id).network_id
                       if subnet_id else None)
         zone_id = zone.id if isinstance(zone, PlacementZone) else zone
         key_pair_name = key_pair.name if \

docs/topics/launch.rst

@@ -115,7 +115,7 @@ assign a floating IP address to your instance. This can be done as follows:
 .. code-block:: python
 
     # List all the IP addresses and find the desired one
-    provider.network.floating_ips()
+    provider.networking.networks.floating_ips()
     # Assign the desired IP to the instance
     inst.add_floating_ip('149.165.168.143')
     inst.refresh()

test/test_network_service.py

@@ -44,7 +44,8 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                     "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')
+                # empty_ipl = self.provider.networking.networks.floating_ips(
+                #   'dummy-net')
                 # self.assertFalse(
                 #     empty_ipl,
                 #     "Bogus network should not have any floating IPs: {0}"

test/test_security_service.py

@@ -38,7 +38,8 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
 
     def cleanup_sg(self, sg, net):
         with helpers.cleanup_action(
-                lambda: self.provider.network.delete(network_id=net.id)):
+                lambda: self.provider.networking.network.delete(
+                    network_id=net.id)):
             self.provider.security.security_groups.delete(group_id=sg.id)
 
     @helpers.skipIfNoService(['security.security_groups'])