Преглед изворни кода

Update test provider details for using Jetstream

Enis Afgan пре 9 година
родитељ
комит
c8a8ff7ce7
2 измењених фајлова са 5 додато и 2 уклоњено
  1. 3 0
      cloudbridge/cloud/base/resources.py
  2. 2 2
      test/helpers.py

+ 3 - 0
cloudbridge/cloud/base/resources.py

@@ -698,6 +698,9 @@ class BaseFloatingIP(FloatingIP, BaseCloudResource):
 
 
 class BaseRouter(Router, BaseCloudResource):
 class BaseRouter(Router, BaseCloudResource):
 
 
+    CB_DEFAULT_ROUTER_NAME = os.environ.get('CB_DEFAULT_ROUTER_NAME',
+                                            'CloudBridgeRouter')
+
     def __init__(self, provider):
     def __init__(self, provider):
         super(BaseRouter, self).__init__(provider)
         super(BaseRouter, self).__init__(provider)
 
 

+ 2 - 2
test/helpers.py

@@ -80,9 +80,9 @@ TEST_DATA_CONFIG = {
     },
     },
     "OpenStackCloudProvider": {
     "OpenStackCloudProvider": {
         "image": os.environ.get('CB_IMAGE_OS',
         "image": os.environ.get('CB_IMAGE_OS',
-                                'a471339a-bd0e-41e2-9406-4f308267ed0f'),
+                                '842b949c-ea76-48df-998d-8a41f2626243'),
         "instance_type": os.environ.get('CB_INSTANCE_TYPE_OS', 'm1.tiny'),
         "instance_type": os.environ.get('CB_INSTANCE_TYPE_OS', 'm1.tiny'),
-        "placement": os.environ.get('CB_PLACEMENT_OS', 'nova'),
+        "placement": os.environ.get('CB_PLACEMENT_OS', 'zone-r6'),
     }
     }
 }
 }