aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-07-05 08:33:25 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-05 08:33:25 +0000
commit13fe51d15d96b477c67b44876b89e0405fb1b2b5 (patch)
tree089d1011b3a1c7e695167bb80918e503af7829fa /ci
parent1f4f3cc4005f8ec0b569d8002e75d67e17f417aa (diff)
parent0e3995a63d1a82fbc508dbb3ff591da2b8c0f22a (diff)
Merge "Add interface to run sfc functests."
Diffstat (limited to 'ci')
-rw-r--r--ci/config_functest.yaml7
-rwxr-xr-xci/exec_test.sh6
2 files changed, 7 insertions, 6 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index fae331d63..5623a71c1 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -7,6 +7,7 @@ general:
dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/
dir_vIMS: testcases/vIMS/
dir_onos: testcases/Controllers/ONOS/Teston/
+ dir_onos_sfc: testcases/Controllers/ONOS/Sfc/
# Absolute path
dir_repos: /home/opnfv/repos
@@ -34,7 +35,7 @@ general:
image_name: Cirros-0.3.4
image_file_name: cirros-0.3.4-x86_64-disk.img
image_disk_format: qcow2
-
+
# Private network for functest. Will be created by config_functest.py
neutron_private_net_name: functest-net
neutron_private_subnet_name: functest-subnet
@@ -57,6 +58,10 @@ vping:
vping_sg_name: vPing-sg
vping_sg_descr: Security group for vPing test case
+onos_sfc:
+ image_name: TestSfcVm
+ image_file_name: firewall_block_image.img
+
tempest:
identity:
tenant_name: tempest
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 4a75bcbde..c0bdf96bf 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -115,11 +115,7 @@ function run_test(){
python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
;;
"onos")
- if [ "$INSTALLER_TYPE" == "joid" ]; then
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -i joid
- else
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
- fi
+ python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
;;
"promise")
python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report