Ver Fonte

Do inet gateway name checking only if the name is supplied

Enis Afgan há 8 anos atrás
pai
commit
70e4d27742

+ 4 - 2
cloudbridge/cloud/providers/aws/services.py

@@ -768,7 +768,8 @@ class AWSGatewayService(BaseGatewayService):
 
     def get_or_create_inet_gateway(self, network, name=None):
         log.debug("Get or create inet gateway %s on net %s", name, network)
-        AWSInternetGateway.assert_valid_resource_name(name)
+        if name:
+            AWSInternetGateway.assert_valid_resource_name(name)
 
         network_id = network.id if isinstance(network, AWSNetwork) else network
         # Don't filter by name because it may conflict with at least the
@@ -780,7 +781,8 @@ class AWSGatewayService(BaseGatewayService):
             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')
-        cb_gateway.name = name
+        if name:
+            cb_gateway.name = name
         cb_gateway._gateway.attach_to_vpc(VpcId=network_id)
         return cb_gateway
 

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

@@ -1056,10 +1056,12 @@ class AzureGatewayService(BaseGatewayService):
         # Singleton returned by the list method
         self.gateway_singleton = AzureInternetGateway(self.provider, None)
 
-    def get_or_create_inet_gateway(self, name):
-        AzureInternetGateway.assert_valid_resource_name(name)
+    def get_or_create_inet_gateway(self, network, name=None):
+        if name:
+            AzureInternetGateway.assert_valid_resource_name(name)
         gateway = AzureInternetGateway(self.provider, None)
-        gateway.name = name
+        if name:
+            gateway.name = name
         return gateway
 
     def list(self, limit=None, marker=None):

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

@@ -931,7 +931,8 @@ class OpenStackGatewayService(BaseGatewayService):
 
     def get_or_create_inet_gateway(self, network, name=None):
         """For OS, inet gtw is any net that has `external` property set."""
-        OpenStackInternetGateway.assert_valid_resource_name(name)
+        if name:
+            OpenStackInternetGateway.assert_valid_resource_name(name)
 
         for n in self.provider.networking.networks:
             if n.external: