summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/config_functest.yaml16
-rwxr-xr-xci/exec_test.sh5
2 files changed, 3 insertions, 18 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index 33495ed9d..afa6ff1f6 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -177,22 +177,6 @@ promise:
subnet_cidr: 192.168.121.0/24
router_name: promise-router
-parser:
- general:
- tenant_name: parser
- tenant_description: parser Functionality Testing
- user_name: parser
- user_pwd: parser
- image_name: parser-img
- flavor_name: parser-flavor
- flavor_vcpus: 1
- flavor_ram: 512
- flavor_disk: 0
- network_name: parser-net
- subnet_name: parser-subnet
- subnet_cidr: 192.168.160.0/24
- router_name: parser-router
-
example:
example_vm_name: example-vm
example_flavor: m1.small
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index ddbe486f1..9951c0973 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -150,9 +150,10 @@ function run_test(){
${repos_dir}/moon/tests/run_tests.sh
;;
"multisite")
- python ${FUNCTEST_REPO_DIR}/testcases/features/multisite.py
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py
python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
$clean_flag -s -m feature_multisite $report
+ -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf
;;
"domino")
python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py
@@ -172,7 +173,7 @@ function run_test(){
python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py
;;
"parser")
- python ${FUNCTEST_REPO_DIR}/testcases/vnf/RNC/parser.py
+ python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report
;;
*)
echo "The test case '${test_name}' does not exist."