Prepare Promise integration in Functest

JIRA: FUNCTEST-68

Change-Id: I9dd3e49cf7cbcec932fb08af359c6e4784818155
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1389aae..09a28bf 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -64,6 +64,7 @@ RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_i
 RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-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 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 4ea0907..aabc32c 100755 (executable)
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -55,6 +55,8 @@ BGPVPN_BRANCH=$(cat $config_file | grep -w bgpvpn_branch | awk 'END {print $NF}'
 BGPVPN_COMMIT=$(cat $config_file | grep -w bgpvpn_commit | awk 'END {print $NF}')
 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}')
 
 
 echo "_____Parsed needed data from ${config_file}:"
@@ -80,6 +82,8 @@ echo "VIMS_BRANCH=${VIMS_BRANCH}"
 echo "VIMS_COMMIT=${VIMS_COMMIT}"
 echo "ONOS_BRANCH=${ONOS_BRANCH}"
 echo "ONOS_COMMIT=${ONOS_COMMIT}"
+echo "PROMISE_BRANCH=${PROMISE_BRANCH}"
+echo "PROMISE_COMMIT=${PROMISE_COMMIT}"
 echo "############################"
 
 info ()  {

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index cae53b7..321ae9f 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -156,6 +156,19 @@ if [ $offline == false ]; then
         git reset --hard ${ONOS_COMMIT}
     fi
 
+    info "Updating PROMISE repository...."
+    cd ${PROMISE_REPO_DIR}
+    if [ ${PROMISE_BRANCH} != "master" ]; then
+        info "PROMISE repo: checkout ${PROMISE} branch..."
+        git checkout ${PROMISE_BRANCH}
+    fi
+    info "PROMISE repo: pulling to latest..."
+    git pull
+    if [ ${PROMISE_COMMIT} != "latest" ]; then
+        info "PROMISE repo: given commit is ${PROMISE_COMMIT}. Reseting..."
+        git reset --hard ${PROMISE_COMMIT}
+    fi
+
 fi
 
 # We do this regardless if its online or offline mode.

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index dcaaeb9..257fab1 100755 (executable)
--- 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. Separated by comma.
+      <test_name>     one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma.
 
 
 examples:
@@ -115,7 +115,11 @@ function run_test(){
         "onos")
             info "Running ONOS test case..."
             python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
-    esac
+      ;;
+        "promise")
+            info "Running PROMISE test case..."
+            # TODO
+   esac
 }
 
 

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index bc41350..208318e 100644 (file)
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -16,6 +16,7 @@ general:
         dir_repo_vims_test: /home/opnfv/repos/vims-test
         dir_repo_bgpvpn:    /home/opnfv/repos/bgpvpn
         dir_repo_onos:      /home/opnfv/repos/onos
+        dir_repo_promise:   /home/opnfv/repos/promise
         dir_functest:       /home/opnfv/functest
         dir_results:        /home/opnfv/functest/results
         dir_functest_conf:  /home/opnfv/functest/conf
@@ -38,6 +39,8 @@ general:
         bgpvpn_commit:   latest
         onos_branch:   master
         onos_commit:   latest
+        promise_branch:   master
+        promise_commit:   latest
 
     openstack:
         image_name: functest-img