summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/requirements.txt3
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py10
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py10
-rw-r--r--functest/opnfv_tests/vnf/ims/clearwater_ims_base.py2
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py11
-rw-r--r--functest/tests/unit/odl/test_odl.py1
-rw-r--r--upper-constraints.txt2
7 files changed, 18 insertions, 21 deletions
diff --git a/api/requirements.txt b/api/requirements.txt
index 0d38313b8..cf1cc0015 100644
--- a/api/requirements.txt
+++ b/api/requirements.txt
@@ -1,3 +1,2 @@
git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
-sphinx>=1.6.2 # BSD
-sphinx-rtd-theme
+git+https://github.com/openstack/refstack-client@a59189eaacda24b787ecb65e6634257beba361ec#egg=refstack-client
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/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 58626acd9..0f1ef48f8 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -382,10 +382,10 @@ class JujuEpc(vnf.VnfOnBoarding):
self.__logger.info("Getting results from Abot node....")
os.system('juju scp abot-epc-basic/0:/var/lib/abot-'
'epc-basic/artifacts/TestResults.json {}/.'
- .format(self.case_dir))
+ .format(self.res_dir))
self.__logger.info("Parsing the Test results...")
- res = (process_abot_test_result('{}/TestResults.'
- 'json'.format(self.case_dir)))
+ res = (process_abot_test_result('{}/TestResults.json'.format(
+ self.res_dir)))
short_result = sig_test_format(res)
self.__logger.info(short_result)
self.details['test_vnf'].update(status='PASS',
@@ -402,10 +402,6 @@ class JujuEpc(vnf.VnfOnBoarding):
"""Clean created objects/functions."""
try:
if not self.orchestrator['requirements']['preserve_setup']:
- self.__logger.info("Removing deployment files...")
- testresult = os.path.join(self.case_dir, 'TestResults.json')
- if os.path.exists(testresult):
- os.remove(testresult)
self.__logger.info("Destroying Orchestrator...")
os.system('juju destroy-controller -y abot-controller '
'--destroy-all-models')
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index be69d685f..f35e281dd 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -115,7 +115,7 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
self.logger.debug('Backup %s -> %s', dns_file, dns_file_bak)
shutil.copy(dns_file, dns_file_bak)
cmd = ("dnsmasq -d -u root --server=/clearwater.opnfv/{0} "
- "-r /etc/resolv.conf.bak >/dev/null 2>&1".format(dns_ip))
+ "-r /etc/resolv.conf.bak".format(dns_ip))
dnsmasq_process = subprocess.Popen(shlex.split(cmd))
script = ('echo -e "nameserver {0}" > {1};'
'cd {2};'
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,
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 88adb3e77..21b819ac5 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -171,6 +171,7 @@ class ODLMainTesting(ODLTesting):
'RESTCONFPORT:{}'.format(self._odl_restconfport)]
args[1].assert_called_once_with(
odl.ODLTests.basic_suite_dir, odl.ODLTests.neutron_suite_dir,
+ include=[],
log='NONE',
output=os.path.join(self.test.res_dir, 'output.xml'),
report='NONE', stdout=mock.ANY, variable=variable,
diff --git a/upper-constraints.txt b/upper-constraints.txt
index ea6809dd0..a7f615aa7 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,5 +19,5 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7'
IPy===0.83
ansible===2.3.2.0
flasgger===0.6.6
-xtesting===0.22.0
+xtesting===0.31.0
networking-bgpvpn===7.0.0