Bläddra i källkod

Fixed leftover gateway calls and docs

Nuwan Goonasekera 8 år sedan
förälder
incheckning
5c0ca4a93a

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

@@ -1072,7 +1072,7 @@ class AzureFloatingIP(BaseFloatingIP):
 
 
     def refresh(self):
     def refresh(self):
         net = self._provider.networking.networks.get(self._network_id)
         net = self._provider.networking.networks.get(self._network_id)
-        gw = self._provider.networking.gateways.get_or_create_inet_gateway(net)
+        gw = net.gateways.get_or_create_inet_gateway(net)
         fip = gw.floating_ips.get(self.id)
         fip = gw.floating_ips.get(self.id)
         self._ip = fip._ip
         self._ip = fip._ip
 
 

+ 1 - 2
cloudbridge/cloud/providers/openstack/resources.py

@@ -956,8 +956,7 @@ class OpenStackFloatingIP(BaseFloatingIP):
     def refresh(self):
     def refresh(self):
         net = self._provider.networking.networks.get(
         net = self._provider.networking.networks.get(
             self._ip.floating_network_id)
             self._ip.floating_network_id)
-        gw = self._provider.networking.gateways.get_or_create_inet_gateway(
-            net)
+        gw = net.gateways.get_or_create_inet_gateway(net)
         fip = gw.floating_ips.get(self.id)
         fip = gw.floating_ips.get(self.id)
         # pylint:disable=protected-access
         # pylint:disable=protected-access
         self._ip = fip._ip
         self._ip = fip._ip

+ 3 - 5
cloudbridge/cloud/providers/openstack/services.py

@@ -892,11 +892,9 @@ class OpenStackSubnetService(BaseSubnetService):
             router = self.provider.networking.routers.create(
             router = self.provider.networking.routers.create(
                 network=net, name=OpenStackRouter.CB_DEFAULT_ROUTER_NAME)
                 network=net, name=OpenStackRouter.CB_DEFAULT_ROUTER_NAME)
             router.attach_subnet(sn)
             router.attach_subnet(sn)
-            gteway = (self.provider.networking.gateways
-                      .get_or_create_inet_gateway(
-                          net,
-                          OpenStackInternetGateway.CB_DEFAULT_INET_GATEWAY_NAME
-                          ))
+            gteway = (net.gateways.get_or_create_inet_gateway(
+                        net,
+                        OpenStackInternetGateway.CB_DEFAULT_INET_GATEWAY_NAME))
             router.attach_gateway(gteway)
             router.attach_gateway(gteway)
             return sn
             return sn
         except NeutronClientException:
         except NeutronClientException:

+ 1 - 1
docs/getting_started.rst

@@ -121,7 +121,7 @@ attaching an internet gateway to the subnet via a router.
     sn = net.create_subnet(name='my-subnet', cidr_block='10.0.0.0/28')
     sn = net.create_subnet(name='my-subnet', cidr_block='10.0.0.0/28')
     router = self.provider.networking.routers.create(network=net, name='my-router')
     router = self.provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
     router.attach_subnet(sn)
-    gateway = self.provider.networking.gateways.get_or_create_inet_gateway(name)
+    gateway = net.gateways.get_or_create_inet_gateway(name)
     router.attach_gateway(gateway)
     router.attach_gateway(gateway)
 
 
 
 

+ 1 - 1
docs/topics/launch.rst

@@ -67,7 +67,7 @@ that subnet.
     # make sure subnet has internet access
     # make sure subnet has internet access
     router = self.provider.networking.routers.create(network=net, name='my-router')
     router = self.provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
     router.attach_subnet(sn)
-    gateway = self.provider.networking.gateways.get_or_create_inet_gateway(name)
+    gateway = net.gateways.get_or_create_inet_gateway(name)
     router.attach_gateway(gateway)
     router.attach_gateway(gateway)
 
 
     inst = provider.compute.instances.create(
     inst = provider.compute.instances.create(

+ 2 - 2
docs/topics/networking.rst

@@ -76,7 +76,7 @@ of the block and allow up to 16 IP addresses within a subnet (``/28``).
     sn = net.create_subnet(name='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
     sn = net.create_subnet(name='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
     router = provider.networking.routers.create(network=net, name='my-router')
     router = provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
     router.attach_subnet(sn)
-    gateway = provider.networking.gateways.get_or_create_inet_gateway(name)
+    gateway = net.gateways.get_or_create_inet_gateway(name)
     router.attach_gateway(gateway)
     router.attach_gateway(gateway)
 
 
 
 
@@ -94,7 +94,7 @@ The additional step that's required here is to assign a floating IP to the VM:
 
 
     router = provider.networking.routers.create(network=net, name='my-router')
     router = provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
     router.attach_subnet(sn)
-    gateway = provider.networking.gateways.get_or_create_inet_gateway(net, name)
+    gateway = net.gateways.get_or_create_inet_gateway(net, name)
     router.attach_gateway(gateway)
     router.attach_gateway(gateway)
 
 
     fip = provider.networking.floating_ips.create()
     fip = provider.networking.floating_ips.create()