aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-08 15:27:00 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-01-11 13:36:31 +0000
commit970ee3eb202a5986b2da918ef034d1a1aba4520a (patch)
tree44dab142fb9cb3860f3e5b8c6ccae7f3be4faebd
parent55048bcbd8db2c8975faa233a260fbc3222e9dcd (diff)
Prepare onos integration in Functest
JIRA: FUNCTEST-50 Change-Id: I50c7db5a05dd5aa78321ba77fab3902232ea4f36 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com> (cherry picked from commit 2140461198cdb8dea2f60a66a0ddf90bb1ef54da)
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xdocker/common.sh4
-rwxr-xr-xdocker/prepare_env.sh14
-rw-r--r--docker/requirements.pip3
-rwxr-xr-xdocker/run_tests.sh6
-rw-r--r--testcases/config_functest.yaml3
6 files changed, 29 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index decce6812..1389aaebf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -63,6 +63,7 @@ RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally
RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
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 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 82a4719a1..4ea0907a4 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -53,6 +53,8 @@ VIMS_BRANCH=$(cat $config_file | grep -w vims_test_branch | awk 'END {print $NF}
VIMS_COMMIT=$(cat $config_file | grep -w vims_test_commit | awk 'END {print $NF}')
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}')
echo "_____Parsed needed data from ${config_file}:"
@@ -76,6 +78,8 @@ echo "RALLY_BRANCH=${RALLY_BRANCH}"
echo "RALLY_COMMIT=${RALLY_COMMIT}"
echo "VIMS_BRANCH=${VIMS_BRANCH}"
echo "VIMS_COMMIT=${VIMS_COMMIT}"
+echo "ONOS_BRANCH=${ONOS_BRANCH}"
+echo "ONOS_COMMIT=${ONOS_COMMIT}"
echo "############################"
info () {
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 983eefc08..cae53b7c0 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -142,6 +142,20 @@ if [ $offline == false ]; then
info "BGPVPN repo: given commit is ${BGPVPN_COMMIT}. Reseting..."
git reset --hard ${BGPVPN_COMMIT}
fi
+
+ info "Updating ONOS repository...."
+ cd ${ONOS_REPO_DIR}
+ if [ ${ONOS_BRANCH} != "master" ]; then
+ info "ONOS repo: checkout ${ONOS} branch..."
+ git checkout ${ONOS_BRANCH}
+ fi
+ info "ONOS repo: pulling to latest..."
+ git pull
+ if [ ${ONOS_COMMIT} != "latest" ]; then
+ info "ONOS repo: given commit is ${ONOS_COMMIT}. Reseting..."
+ git reset --hard ${ONOS_COMMIT}
+ fi
+
fi
# We do this regardless if its online or offline mode.
diff --git a/docker/requirements.pip b/docker/requirements.pip
index 03036a828..f8c888a82 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -10,4 +10,5 @@ pexpect==4.0
requests==2.8.0
robotframework==2.9.1
robotframework-requests==0.3.8
-robotframework-sshlibrary==2.1.1 \ No newline at end of file
+robotframework-sshlibrary==2.1.1
+configObj==5.0.6
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 28830e845..dcaaeb9bb 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. Separated by comma.
+ <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos. Separated by comma.
examples:
@@ -111,6 +111,10 @@ function run_test(){
# cp ${BGPVPN_REPO_DIR}/networking_bgpvpn_tempest/<whatever you need> \
# ${tempest_dir}/tempest/api/bgpvpn/
# ${tempest_dir}/run_tempest.sh tempest.api.bgpvpn.<test_case_name>
+ ;;
+ "onos")
+ info "Running ONOS test case..."
+ python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
esac
}
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 1cc16e17b..7521da500 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -15,6 +15,7 @@ general:
dir_repo_releng: /home/opnfv/repos/releng
dir_repo_vims_test: /home/opnfv/repos/vims-test
dir_repo_bgpvpn: /home/opnfv/repos/bgpvpn
+ dir_repo_onos: /home/opnfv/repos/onos
dir_functest: /home/opnfv/functest
dir_results: /home/opnfv/functest/results
dir_functest_conf: /home/opnfv/functest/conf
@@ -35,6 +36,8 @@ general:
vims_test_commit: latest
bgpvpn_branch: master
bgpvpn_commit: latest
+ onos_branch: master
+ onos_commit: latest
openstack:
image_name: functest-img