소스 검색

Fixed resource names to be more URL friendly

Nuwan Goonasekera 8 년 전
부모
커밋
bccac478d8
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 4
      cloudbridge/cloud/base/resources.py
  2. 1 1
      test/test_object_store_service.py

+ 4 - 4
cloudbridge/cloud/base/resources.py

@@ -831,7 +831,7 @@ class BaseBucket(BaseCloudResource, BasePageableObjectMixin, Bucket):
 class BaseNetwork(BaseCloudResource, BaseObjectLifeCycleMixin, Network):
 class BaseNetwork(BaseCloudResource, BaseObjectLifeCycleMixin, Network):
 
 
     CB_DEFAULT_NETWORK_NAME = os.environ.get('CB_DEFAULT_NETWORK_NAME',
     CB_DEFAULT_NETWORK_NAME = os.environ.get('CB_DEFAULT_NETWORK_NAME',
-                                             'cloudbridge_net')
+                                             'cloudbridge-net')
 
 
     def __init__(self, provider):
     def __init__(self, provider):
         super(BaseNetwork, self).__init__(provider)
         super(BaseNetwork, self).__init__(provider)
@@ -861,7 +861,7 @@ class BaseNetwork(BaseCloudResource, BaseObjectLifeCycleMixin, Network):
 class BaseSubnet(BaseCloudResource, BaseObjectLifeCycleMixin, Subnet):
 class BaseSubnet(BaseCloudResource, BaseObjectLifeCycleMixin, Subnet):
 
 
     CB_DEFAULT_SUBNET_NAME = os.environ.get('CB_DEFAULT_SUBNET_NAME',
     CB_DEFAULT_SUBNET_NAME = os.environ.get('CB_DEFAULT_SUBNET_NAME',
-                                            'cloudbridge_subnet')
+                                            'cloudbridge-subnet')
 
 
     def __init__(self, provider):
     def __init__(self, provider):
         super(BaseSubnet, self).__init__(provider)
         super(BaseSubnet, self).__init__(provider)
@@ -909,7 +909,7 @@ class BaseFloatingIP(BaseCloudResource, FloatingIP):
 class BaseRouter(BaseCloudResource, Router):
 class BaseRouter(BaseCloudResource, Router):
 
 
     CB_DEFAULT_ROUTER_NAME = os.environ.get('CB_DEFAULT_ROUTER_NAME',
     CB_DEFAULT_ROUTER_NAME = os.environ.get('CB_DEFAULT_ROUTER_NAME',
-                                            'cloudbridge_router')
+                                            'cloudbridge-router')
 
 
     def __init__(self, provider):
     def __init__(self, provider):
         super(BaseRouter, self).__init__(provider)
         super(BaseRouter, self).__init__(provider)
@@ -929,7 +929,7 @@ class BaseInternetGateway(BaseCloudResource, BaseObjectLifeCycleMixin,
                           InternetGateway):
                           InternetGateway):
 
 
     CB_DEFAULT_INET_GATEWAY_NAME = os.environ.get(
     CB_DEFAULT_INET_GATEWAY_NAME = os.environ.get(
-        'CB_DEFAULT_INET_GATEWAY_NAME', 'cloudbridge_inetgateway')
+        'CB_DEFAULT_INET_GATEWAY_NAME', 'cloudbridge-inetgateway')
 
 
     def __init__(self, provider):
     def __init__(self, provider):
         super(BaseInternetGateway, self).__init__(provider)
         super(BaseInternetGateway, self).__init__(provider)

+ 1 - 1
test/test_object_store_service.py

@@ -40,7 +40,7 @@ class CloudObjectStoreServiceTestCase(ProviderTestBase):
             create_bucket("cb")
             create_bucket("cb")
 
 
         with self.assertRaises(InvalidNameException):
         with self.assertRaises(InvalidNameException):
-            # names of length less than 63 should raise an exception
+            # names of length greater than 63 should raise an exception
             create_bucket("a" * 64)
             create_bucket("a" * 64)
 
 
         with self.assertRaises(InvalidNameException):
         with self.assertRaises(InvalidNameException):