Force region to RegionOne if OS_REGION_NAME is unset

[functest.git] / functest / opnfv_tests / vnf / router / cloudify_vrouter.py

diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index f23906b..e56f23c 100644 (file)
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -19,14 +19,7 @@ import uuid
 from cloudify_rest_client import CloudifyClient
 from cloudify_rest_client.executions import Execution
 from scp import SCPClient
-
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-import functest.opnfv_tests.vnf.router.vrouter_base as vrouter_base
-from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
-from functest.utils import config
-from functest.utils import env
-from functest.utils import functest_utils
-
+import six
 from snaps.config.flavor import FlavorConfig
 from snaps.config.image import ImageConfig
 from snaps.config.keypair import KeypairConfig
@@ -36,7 +29,6 @@ from snaps.config.security_group import (
     Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig)
 from snaps.config.user import UserConfig
 from snaps.config.vm_inst import FloatingIpConfig, VmInstanceConfig
-
 from snaps.openstack.create_flavor import OpenStackFlavor
 from snaps.openstack.create_image import OpenStackImage
 from snaps.openstack.create_instance import OpenStackVmInstance
@@ -45,10 +37,15 @@ from snaps.openstack.create_network import OpenStackNetwork
 from snaps.openstack.create_security_group import OpenStackSecurityGroup
 from snaps.openstack.create_router import OpenStackRouter
 from snaps.openstack.create_user import OpenStackUser
-
 import snaps.openstack.utils.glance_utils as glance_utils
 from snaps.openstack.utils import keystone_utils
 
+from functest.opnfv_tests.openstack.snaps import snaps_utils
+import functest.opnfv_tests.vnf.router.vrouter_base as vrouter_base
+from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
+from functest.utils import config
+from functest.utils import env
+from functest.utils import functest_utils
 
 __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>"
 
@@ -180,7 +177,7 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
         self.created_object.append(keypair_creator)
 
         self.__logger.info("Upload some OS images if it doesn't exist")
-        for image_name, image_file in self.images.iteritems():
+        for image_name, image_file in six.iteritems(self.images):
             self.__logger.info("image: %s, file: %s", image_name, image_file)
             if image_file and image_name:
                 image_creator = OpenStackImage(
@@ -261,7 +258,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
 
         cfy_client = CloudifyClient(
             host=manager_creator.get_floating_ip().ip,
-            username='admin', password='admin', tenant='default_tenant')
+            username='admin', password='admin', tenant='default_tenant',
+            api_version='v3')
 
         self.orchestrator['object'] = cfy_client
 
@@ -337,7 +335,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
         self.vnf['inputs'].update(dict(
             keystone_project_domain_name=snaps_creds.project_domain_name))
         self.vnf['inputs'].update(dict(
-            region=snaps_creds.region_name))
+            region=snaps_creds.region_name if snaps_creds.region_name else (
+                'RegionOne')))
         self.vnf['inputs'].update(dict(
             keystone_url=keystone_utils.get_endpoint(
                 snaps_creds, 'identity')))