diff options
| author |   root <shuya.nakama@okinawaopenlabs.org> | 2017-10-10 11:08:40 +0000 |
|---|---|---|
| committer | ShuyaNakama <shuya.nakama@okinawaopenlabs.org> | 2017-10-11 08:19:50 +0000 |
| commit | 3fa62219bb5a9e928fe94d95314c7c00d5f06e66 (patch) | |
| tree | 6c1d075148625934bbad9e371a4b992d040dc506 /functest/opnfv_tests/vnf/router | |
| parent | a6e9a6fa2da17f84de91d2d47cb8ccb7e66a8836 (diff) | |
Fix fail of vRouter on Orange POD
1. Functest docker container environment has no attribute 'OS_REGION_NAME'
2. vRouter was get the 'OS_REGION_NAME' but not used it.
3. Deleting use 'OS_REGION_NAME' part of vRouter.
4. Utility lib of vRouter use Nova client.
5. Modifying Nova client authentication step for auth api v3.
6. Doing test of modified vRouter on Orange POD.
Change-Id: I062549e5ca48fb4825b53448a4e2ffc8c1f8ec40
Signed-off-by: root <shuya.nakama@okinawaopenlabs.org>
Diffstat (limited to 'functest/opnfv_tests/vnf/router')
4 files changed, 11 insertions, 13 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py index 86362368..ea09b211 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py @@ -368,8 +368,7 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase): credentials = {"username": self.snaps_creds.username, "password": self.snaps_creds.password, "auth_url": self.snaps_creds.auth_url, - "tenant_name": self.snaps_creds.project_name, - "region_name": os.environ['OS_REGION_NAME']} + "tenant_name": self.snaps_creds.project_name} self.util_info = {"credentials": credentials, "cfy": cfy_client, diff --git a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py index 236447e0..9303aeca 100644 --- a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py +++ b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py @@ -40,8 +40,7 @@ class FunctionTestExec(object): self.util.set_credentials(credentials["username"], credentials["password"], credentials["auth_url"], - credentials["tenant_name"], - credentials["region_name"]) + credentials["tenant_name"]) with open(self.util.test_env_config_yaml) as file_fd: test_env_config_yaml = yaml.safe_load(file_fd) diff --git a/functest/opnfv_tests/vnf/router/utilvnf.py b/functest/opnfv_tests/vnf/router/utilvnf.py index 084af331..c31d6777 100644 --- a/functest/opnfv_tests/vnf/router/utilvnf.py +++ b/functest/opnfv_tests/vnf/router/utilvnf.py @@ -19,8 +19,8 @@ import yaml from functest.utils.constants import CONST from git import Repo from novaclient import client as novaclient +from keystoneauth1.identity import v3 from keystoneauth1 import session -from keystoneauth1 import loading from requests.auth import HTTPBasicAuth RESULT_SPRIT_INDEX = { @@ -57,7 +57,6 @@ class Utilvnf(object): self.password = "" self.auth_url = "" self.tenant_name = "" - self.region_name = "" data_dir = data_dir = CONST.__getattribute__('dir_router_data') @@ -116,20 +115,22 @@ class Utilvnf(object): def get_nova_client(self): creds = self.get_nova_credentials() - loader = loading.get_plugin_loader('password') - auth = loader.load_from_options(**creds) + auth = v3.Password(auth_url=creds['auth_url'], + username=creds['username'], + password=creds['password'], + project_name=creds['tenant_name'], + user_domain_id='default', + project_domain_id='default') sess = session.Session(auth=auth) nova_client = novaclient.Client(NOVA_CLIENT_API_VERSION, session=sess) return nova_client - def set_credentials(self, username, password, auth_url, - tenant_name, region_name="RegionOne"): + def set_credentials(self, username, password, auth_url, tenant_name): self.username = username self.password = password self.auth_url = auth_url self.tenant_name = tenant_name - self.region_name = region_name def get_nova_credentials(self): creds = {} diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py index cd228fe2..50487d1c 100644 --- a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py +++ b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py @@ -35,8 +35,7 @@ class VmController(object): self.util.set_credentials(credentials["username"], credentials["password"], credentials["auth_url"], - credentials["tenant_name"], - credentials["region_name"]) + credentials["tenant_name"]) with open(self.util.test_env_config_yaml) as file_fd: test_env_config_yaml = yaml.safe_load(file_fd) |