diff options
| -rw-r--r-- | docker/vnf/testcases.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 1 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/utilvnf.py | 15 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py | 3 |
6 files changed, 12 insertions, 16 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 5db81b89..54e5f292 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -51,14 +51,13 @@ tiers: - case_name: vyos_vrouter project_name: functest - enabled: false criteria: 100 blocking: false description: >- This test case is vRouter testing. dependencies: installer: '' - scenario: 'nosdn-nofeature' + scenario: 'os-nosdn-nofeature-ha' run: module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' class: 'CloudifyVrouter' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index c2787fa7..97b2414e 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -421,7 +421,6 @@ tiers: - case_name: vyos_vrouter project_name: functest - enabled: false criteria: 100 blocking: false description: >- 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) |