From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 18 Jan 2016 11:02:48 +0000 (+0100)
Subject: Prepare integration of ovno
X-Git-Tag: brahmaputra.1.0~153
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b51df39dfe21ec41b061ab04a1390e106e2860ab;p=functest.git

Prepare integration of ovno

JIRA: FUNCTEST-125

Change-Id: I9d13509ea91f3a5359aa4c16f9eccb8719279346
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
(cherry picked from commit 77718c073d682f4330b751c67f76b05e08c26b03)
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 69c2bd48f..0765eb848 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,6 +66,7 @@ RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test
 RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn
 RUN git clone https://gerrit.onosproject.org/OnosSystemTest  ${repos_dir}/onos
 RUN git clone https://github.com/opnfv/promise ${repos_dir}/promise
+RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno
 
 RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
 RUN pip install -r ${repos_dir}/rally/requirements.txt
diff --git a/docker/common.sh b/docker/common.sh
index d61e9576c..1f1cc75df 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -65,6 +65,8 @@ ONOS_BRANCH=$(cat $config_file | grep -w onos_branch | awk 'END {print $NF}')
 ONOS_COMMIT=$(cat $config_file | grep -w onos_commit | awk 'END {print $NF}')
 PROMISE_BRANCH=$(cat $config_file | grep -w promise_branch | awk 'END {print $NF}')
 PROMISE_COMMIT=$(cat $config_file | grep -w promise_commit | awk 'END {print $NF}')
+OVNO_BRANCH=$(cat $config_file | grep -w ovno_branch | awk 'END {print $NF}')
+OVNO_COMMIT=$(cat $config_file | grep -w ovno_commit | awk 'END {print $NF}')
 
 
 echo "_____Parsed needed data from ${config_file}:"
@@ -90,6 +92,8 @@ echo "ONOS_BRANCH=${ONOS_BRANCH}"
 echo "ONOS_COMMIT=${ONOS_COMMIT}"
 echo "PROMISE_BRANCH=${PROMISE_BRANCH}"
 echo "PROMISE_COMMIT=${PROMISE_COMMIT}"
+echo "OVNO_BRANCH=${OVNO_BRANCH}"
+echo "OVNO_COMMIT=${OVNO_COMMIT}"
 echo "############################"
 
 info ()  {
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 97bbfefec..efcbbd20c 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -17,7 +17,7 @@ where:
     -h|--help         show this help text
     -r|--report       push results to database (false by default)
     -t|--test         run specific set of tests
-      <test_name>     one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma.
+      <test_name>     one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma.
 
 
 examples:
@@ -50,7 +50,7 @@ function run_test(){
     test_name=$1
     echo ""
     echo "----------------------------------------------"
-    echo "  Running test case: $i"
+    echo "  Running test cases: $i"
     echo "----------------------------------------------"
     echo ""
     case $test_name in
@@ -138,6 +138,10 @@ function run_test(){
             info "Running Doctor test..."
             python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py
         ;;
+        "ovno")
+            info "Running OpenContrail test..."
+            # TODO
+        ;;
     esac
 }
 
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 7c1e79d36..6a612067b 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -18,6 +18,7 @@ general:
         dir_repo_onos:      /home/opnfv/repos/onos
         dir_repo_promise:   /home/opnfv/repos/promise
         dir_repo_doctor:    /home/opnfv/repos/doctor
+        dir_repo_ovno:      /home/opnfv/repos/ovno
         dir_functest:       /home/opnfv/functest
         dir_results:        /home/opnfv/functest/results
         dir_functest_conf:  /home/opnfv/functest/conf
@@ -40,6 +41,8 @@ general:
         onos_commit:   latest
         promise_branch:   master
         promise_commit:   latest
+        ovno_branch:   master
+        ovno_commit:   latest
 
     openstack:
         image_name: functest-img
@@ -158,7 +161,7 @@ test_exec_priority:
     2: tempest
     3: odl
     4: onos
-    #5: ovno
+    5: ovno
     #6: doctor
     7: promise
     #8: policy-test