aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-08-01 17:00:24 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2016-08-01 17:00:24 +0200
commit8f3ad08c40bd8977651794f6720eda5df61b0c26 (patch)
tree1e077e88e49558c71c106fb66f5ab9b547969b41
parent6d655178e74054c18b373a3bf98e6508f136061d (diff)
Fix missing directory when calling bgpvpn tests
Change-Id: Ic9f6b9592202c3bed9d6835eeea7c14971e1c01f Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rwxr-xr-xci/exec_test.sh1
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index cd5ae182..2ef714d5 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -116,6 +116,7 @@ function run_test(){
$clean_flag --sanity all $report
;;
"bgpvpn")
+ sdnvpn_repo_dir=${repos_dir}/sdnvpn/test/functest/
python ${sdnvpn_repo_dir}/run_tests.py $report
;;
"onos")
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 8d23b741..3ee10b78 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -21,11 +21,11 @@ import shutil
import subprocess
import sys
import time
-import yaml
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
+import yaml
modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing',
@@ -341,7 +341,7 @@ def apply_tempest_blacklist():
black_list_yaml = yaml.safe_load(black_list_file)
black_list_file.close()
for item in black_list_yaml:
- scenarios = item['sceanrios']
+ scenarios = item['scenarios']
installers = item['installers']
if (deploy_scenario in scenarios and
installer_type in installers):