summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py10
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py11
2 files changed, 11 insertions, 10 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index cab09a641..74ddbd981 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -219,17 +219,19 @@ class TempestCommon(testcase.TestCase):
for match in re.findall(r'.*\{0\} (.*?)[. ]*success ', output):
success_testcases.append(match)
failed_testcases = []
- for match in re.findall(r'.*\{0\} (.*?)[. ]*fail ', output):
+ for match in re.findall(r'.*\{0\} (.*?)[. ]*fail', output):
failed_testcases.append(match)
skipped_testcases = []
for match in re.findall(r'.*\{0\} (.*?)[. ]*skip:', output):
skipped_testcases.append(match)
- self.details = {"tests": stat['num_tests'],
- "failures": stat['num_failures'],
+ self.details = {"tests_number": stat['num_tests'],
+ "success_number": stat['num_success'],
+ "skipped_number": stat['num_skipped'],
+ "failures_number": stat['num_failures'],
"success": success_testcases,
"skipped": skipped_testcases,
- "errors": failed_testcases}
+ "failures": failed_testcases}
except Exception: # pylint: disable=broad-except
self.result = 0
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 6b9145855..0f463128b 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -75,7 +75,6 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
raise Exception("VNF config file not found")
self.cfy_manager_ip = ''
- self.util_info = {}
self.deployment_name = ''
config_file = os.path.join(self.case_dir, self.config)
@@ -353,6 +352,10 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.vnf['inputs'].update(dict(
keystone_tenant_name=snaps_creds.project_name))
self.vnf['inputs'].update(dict(
+ keystone_user_domain_name=snaps_creds.user_domain_name))
+ self.vnf['inputs'].update(dict(
+ keystone_project_domain_name=snaps_creds.project_domain_name))
+ self.vnf['inputs'].update(dict(
region=snaps_creds.region_name))
self.vnf['inputs'].update(dict(
keystone_url=keystone_utils.get_endpoint(
@@ -386,11 +389,7 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
def test_vnf(self):
cfy_client = self.orchestrator['object']
- credentials = {"snaps_creds": self.snaps_creds,
- "username": self.snaps_creds.username,
- "password": self.snaps_creds.password,
- "auth_url": self.snaps_creds.auth_url,
- "tenant_name": self.snaps_creds.project_name}
+ credentials = {"snaps_creds": self.snaps_creds}
self.util_info = {"credentials": credentials,
"cfy": cfy_client,