net.create_subnet to net.subnets.create

cloudbridge/cloud/base/resources.py

@@ -770,10 +770,6 @@ class BaseNetwork(BaseCloudResource, BaseObjectLifeCycleMixin, Network):
     def delete(self):
         self._provider.networking.networks.delete(self)
 
-    def create_subnet(self, label, cidr_block, zone):
-        return self._provider.networking.subnets.create(
-            label=label, network=self, cidr_block=cidr_block, zone=zone)
-
     def __eq__(self, other):
         return (isinstance(other, Network) and
                 # pylint:disable=protected-access

cloudbridge/cloud/interfaces/resources.py

@@ -961,29 +961,6 @@ class Network(ObjectLifeCycleMixin, LabeledCloudResource):
         """
         pass
 
-    @abstractmethod
-    def create_subnet(self, label, cidr_block, zone):
-        """
-        Create a new network subnet and associate it with this Network.
-
-        :type label: ``str``
-        :param label: The subnet label. The subnet name will be derived from
-                      this label.
-
-        :type cidr_block: ``str``
-        :param cidr_block: CIDR block within this Network to assign to the
-                           subnet.
-
-        :type zone: ``str``
-        :param zone: Placement zone where to create the subnet. Some providers
-                     may not support subnet zones, in which case the value is
-                     ignored.
-
-        :rtype: ``object`` of :class:`.Subnet`
-        :return:  A Subnet object
-        """
-        pass
-
     @abstractproperty
     def gateways(self):
         """

cloudbridge/cloud/providers/azure/resources.py

@@ -798,18 +798,6 @@ class AzureNetwork(BaseNetwork):
     def subnets(self):
         return self._subnet_svc
 
-    def create_subnet(self, label, cidr_block, zone):
-        """
-        Create the subnet with cidr_block
-        :param cidr_block:
-        :param label:
-        :param zone:
-        :return:
-        """
-        return self._provider.networking.subnets. \
-            create(label=label, network=self.id, cidr_block=cidr_block,
-                   zone=zone)
-
     @property
     def gateways(self):
         return self._gateway_service

cloudbridge/cloud/providers/gce/resources.py

@@ -1311,10 +1311,6 @@ class GCENetwork(BaseNetwork):
     def subnets(self):
         return self._subnet_svc
 
-    def create_subnet(self, label, cidr_block, zone):
-        return self._provider.networking.subnets.create(
-            label, self, cidr_block, zone)
-
     def refresh(self):
         net = self._provider.networking.networks.get(self.id)
         if net:

docs/getting_started.rst

@@ -131,7 +131,7 @@ attaching an internet gateway to the subnet via a router.
     net = provider.networking.networks.create(cidr_block='10.0.0.0/16',
                                               label='cb-network')
     zone = provider.compute.regions.get(provider.region_name).zones[0]
-    sn = net.create_subnet(
+    sn = net.subnets.create(
         cidr_block='10.0.0.0/28', label='cb-subnet', zone=zone)
     router = provider.networking.routers.create(network=net, label='cb-router')
     router.attach_subnet(sn)

docs/topics/launch.rst

@@ -64,7 +64,7 @@ that subnet.
 
     net = self.provider.networking.networks.create(
         label='my-network', cidr_block='10.0.0.0/16')
-    sn = net.create_subnet(label='my-subnet', cidr_block='10.0.0.0/28')
+    sn = net.subnets.create(label='my-subnet', cidr_block='10.0.0.0/28')
     # make sure subnet has internet access
     router = self.provider.networking.routers.create(label='my-router', network=net)
     router.attach_subnet(sn)

docs/topics/networking.rst

@@ -74,7 +74,9 @@ subnet (``/28``).
 
     net = provider.networking.networks.create(
         label='my-network', cidr_block='10.0.0.0/16')
-    sn = net.create_subnet(label='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
+    sn = net.subnets.create(label='my-subnet',
+                            cidr_block='10.0.0.0/28',
+                            zone=zone)
     router = provider.networking.routers.create(label='my-router', network=net)
     router.attach_subnet(sn)
     gateway = net.gateways.get_or_create()
@@ -89,7 +91,7 @@ The additional step that's required here is to assign a floating IP to the VM:
 
     net = provider.networking.networks.create(
         label='my-network', cidr_block='10.0.0.0/16')
-    sn = net.create_subnet(label='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
+    sn = net.subnets.create(label='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
 
     vm = provider.compute.instances.create(label='my-inst', subnet=sn, zone=zone, ...)
 

test/test_compute_service.py

@@ -331,10 +331,10 @@ class CloudComputeServiceTestCase(ProviderTestBase):
             net = self.provider.networking.networks.create(
                 label=label, cidr_block=BaseNetwork.CB_DEFAULT_IPV4RANGE)
             cidr = '10.0.1.0/24'
-            subnet = net.create_subnet(label=label, cidr_block=cidr,
-                                       zone=helpers.get_provider_test_data(
-                                                    self.provider,
-                                                    'placement'))
+            subnet = net.subnets.create(label=label, cidr_block=cidr,
+                                        zone=helpers.get_provider_test_data(
+                                                     self.provider,
+                                                     'placement'))
             test_inst = helpers.get_test_instance(self.provider, label,
                                                   subnet=subnet)
             fw = self.provider.security.vm_firewalls.create(

test/test_network_service.py

@@ -89,7 +89,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                 % (net.cidr_block, BaseNetwork.CB_DEFAULT_IPV4RANGE))
 
             cidr = '10.0.20.0/24'
-            sn = net.create_subnet(
+            sn = net.subnets.create(
                 label=subnet_label, cidr_block=cidr,
                 zone=helpers.get_provider_test_data(self.provider,
                                                     'placement'))
@@ -106,7 +106,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
                 )
 
                 self.assertListEqual(
-                    net.subnets, [sn],
+                    list(net.subnets), [sn],
                     "Network should have exactly one subnet: %s." % sn.id)
 
                 self.assertEqual(
@@ -232,9 +232,9 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
             router = self.provider.networking.routers.create(label=label,
                                                              network=net)
             cidr = '10.0.15.0/24'
-            sn = net.create_subnet(label=label, cidr_block=cidr,
-                                   zone=helpers.get_provider_test_data(
-                                       self.provider, 'placement'))
+            sn = net.subnets.create(label=label, cidr_block=cidr,
+                                    zone=helpers.get_provider_test_data(
+                                        self.provider, 'placement'))
 
             # Check basic router properties
             sit.check_standard_behaviour(