Gateway name removed, bucket get fixed

cloudbridge/cloud/interfaces/resources.py

@@ -1336,7 +1336,7 @@ class GatewayContainer(PageableObjectMixin):
     __metaclass__ = ABCMeta
 
     @abstractmethod
-    def get_or_create_inet_gateway(self, name=None):
+    def get_or_create_inet_gateway(self):
         """
         Creates new or returns an existing internet gateway for a network.
 

cloudbridge/cloud/providers/aws/resources.py

@@ -1244,8 +1244,8 @@ class AWSGatewayContainer(BaseGatewayContainer):
                                   cb_resource=AWSInternetGateway,
                                   boto_collection_name='internet_gateways')
 
-    def get_or_create_inet_gateway(self, name=None):
-        log.debug("Get or create inet gateway %s on net %s", name,
+    def get_or_create_inet_gateway(self):
+        log.debug("Get or create inet gatewayon net %s",
                   self._network)
         network_id = self._network.id if isinstance(
             self._network, AWSNetwork) else self._network
@@ -1258,15 +1258,10 @@ class AWSGatewayContainer(BaseGatewayContainer):
             return gtw[0]  # There can be only one gtw attached to a VPC
         # Gateway does not exist so create one and attach to the supplied net
         cb_gateway = self.svc.create('create_internet_gateway')
-        if name:
-            AWSInternetGateway.assert_valid_resource_name(name)
-            cb_gateway._gateway.create_tags(
-                Tags=[{'Key': 'Name', 'Value': name}])
-        else:
-            cb_gateway._gateway.create_tags(
-                Tags=[{'Key': 'Name',
-                       'Value': AWSInternetGateway.CB_DEFAULT_INET_GATEWAY_NAME
-                       }])
+        cb_gateway._gateway.create_tags(
+            Tags=[{'Key': 'Name',
+                   'Value': AWSInternetGateway.CB_DEFAULT_INET_GATEWAY_NAME
+                   }])
         cb_gateway._gateway.attach_to_vpc(VpcId=network_id)
         return cb_gateway
 

cloudbridge/cloud/providers/azure/resources.py

@@ -833,7 +833,7 @@ class AzureGatewayContainer(BaseGatewayContainer):
         self.gateway_singleton = AzureInternetGateway(self._provider, None,
                                                       network)
 
-    def get_or_create_inet_gateway(self, name=None):
+    def get_or_create_inet_gateway(self):
         gateway = AzureInternetGateway(self._provider, None, self._network)
         return gateway
 

cloudbridge/cloud/providers/openstack/resources.py

@@ -817,14 +817,12 @@ class OpenStackGatewayContainer(BaseGatewayContainer):
             except Exception:
                 return False
 
-    def get_or_create_inet_gateway(self, name=None):
+    def get_or_create_inet_gateway(self):
         """For OS, inet gtw is any net that has `external` property set."""
         external_nets = (n for n in self._provider.networking.networks
                          if n.external)
         for net in external_nets:
             if self._check_fip_connectivity(net):
-                if name:
-                    net.label = name
                 return OpenStackInternetGateway(self._provider, net)
         return None
 
@@ -1499,8 +1497,11 @@ class OpenStackBucketContainer(BaseBucketContainer):
         _, object_list = self._provider.swift.get_container(
             self.bucket.name, prefix=name)
         if object_list:
-            for ob in object_list:
-                if ob.name == name:
+            # Swift always returns a reference for the container first,
+            # followed by a list containing references to objects.
+            # Looping through list of objects
+            for ob in object_list[1]:
+                if ob.get('name') == name:
                     return OpenStackBucketObject(self._provider,
                                                  self.bucket,
                                                  ob)

docs/getting_started.rst

@@ -121,7 +121,7 @@ attaching an internet gateway to the subnet via a router.
     sn = net.create_subnet(cidr_block='10.0.0.0/28', label='my-subnet')
     router = provider.networking.routers.create(network=net, label='my-router')
     router.attach_subnet(sn)
-    gateway = net.gateways.get_or_create_inet_gateway(name='my-gateway')
+    gateway = net.gateways.get_or_create_inet_gateway()
     router.attach_gateway(gateway)
 
 
@@ -228,7 +228,7 @@ listed in order to help map each resource with the service that handles it.
     router = router_list[0]
 
     # Gateway
-    gateway = net.gateways.get_or_create_inet_gateway(name='my-gateway')
+    gateway = net.gateways.get_or_create_inet_gateway()
 
     # Floating IPs
     fip = gateway.floating_ips.get('FloatingIP ID')

docs/topics/launch.rst

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

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)
     router = provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
-    gateway = net.gateways.get_or_create_inet_gateway(name)
+    gateway = net.gateways.get_or_create_inet_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.attach_subnet(sn)
-    gateway = net.gateways.get_or_create_inet_gateway(name)
+    gateway = net.gateways.get_or_create_inet_gateway()
     router.attach_gateway(gateway)
 
     fip = provider.networking.floating_ips.create()

setup.py

@@ -27,13 +27,13 @@ REQS_AWS = ['boto3<1.8.0']
 # Install azure>=3.0.0 package to find which of the azure libraries listed
 # below are compatible with each other. List individual libraries instead
 # of using the azure umbrella package to speed up installation.
-REQS_AZURE = ['msrest>=0.5.4',
+REQS_AZURE = ['msrest>=0.5.5',
               'msrestazure>=0.5.0',
               'azure-common>=1.1.14',
               'azure-mgmt-devtestlabs>=2.2.0',
               'azure-mgmt-resource>=2.0.0',
               'azure-mgmt-compute>=4.0.1',
-              'azure-mgmt-network>=2.0.1',
+              'azure-mgmt-network>=2.1.0',
               'azure-mgmt-storage>=2.0.0',
               'azure-storage-blob>=1.3.1',
               'azure-cosmosdb-table>=1.0.4',

test/test_compute_service.py

@@ -341,7 +341,7 @@ class CloudComputeServiceTestCase(ProviderTestBase):
 
             # check floating ips
             router = self.provider.networking.routers.create(label, net)
-            gateway = net.gateways.get_or_create_inet_gateway(name=label)
+            gateway = net.gateways.get_or_create_inet_gateway()
 
             def cleanup_router(router, gateway):
                 with helpers.cleanup_action(lambda: router.delete()):

test/test_network_service.py

@@ -201,7 +201,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
 #                     router.id, router.network_id))
 
             router.attach_subnet(sn)
-            gteway = net.gateways.get_or_create_inet_gateway(name=label)
+            gteway = net.gateways.get_or_create_inet_gateway()
             router.attach_gateway(gteway)
             # TODO: add a check for routes after that's been implemented