From d5e6fbfda60a508dec4193d913f7a4bd0206c76e Mon Sep 17 00:00:00 2001
From: Peter Bandzi <pbandzi@cisco.com>
Date: Fri, 24 Apr 2015 16:03:30 +0200
Subject: small fixes to script starting odl suite
additional info provided in functest.rst
JIRA: FUNCTEST-5
Change-Id: Ia32fc69cb22777af45846ba6eb2b179a73c22780
Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
---
functest.rst | 8 ++++----
testcases/Controllers/ODL/CI/start_tests.sh | 29 ++++++++++++++++-------------
testcases/Controllers/ODL/CI/test_list.txt | 3 +++
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/functest.rst b/functest.rst
index eccf84983..d8606aaaf 100644
--- a/functest.rst
+++ b/functest.rst
@@ -59,10 +59,6 @@ Summary: Set up python2.7 virtual environment::
pip install robotframework-sshlibrary
pip install robotframework-requests
-Clone test repo::
-
- git clone https://github.com/opendaylight/integration.git
-
vPing
=====
@@ -116,6 +112,10 @@ If we consider running Tempest suite with Rally::
OpenDaylight
============
+Tests can be executed with script *start_test.sh* from directory *functest/testcases/Controllers/ODL/CI*. For usage example see::
+
+ # bash start_test.sh -h
+
vPing
=====
diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh
index 48ad787fd..e2f94a65a 100644
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -7,18 +7,7 @@ green='\033[0;32m'
light_green='\033[1;32m'
nc='\033[0m' # No Color
-
-echo -e "${green}Current environment parameters for ODL suite.${nc}"
-# Following vars might be also specified as CLI params
-set -x
-PATH_TO_VENV=${PATH_TO_VENV:-~/.virtualenvs/robot/bin/activate}
-OSTACK_IP=${OSTACK_IP:-'oscontrol'}
-ODL_PORT=${ODL_PORT:-8081}
-USR_NAME=${USR_NAME:-'admin'}
-PASS=${PASS:-'octopus'}
-set +x
-
-usage="Script for starting ODL tests.
+usage="Script for starting ODL tests. Tests to be executed are specified in test_list.txt file.
usage:
[var=value] bash $(basename "$0") [-h]
@@ -43,6 +32,16 @@ while getopts ':h' option; do
esac
done
+echo -e "${green}Current environment parameters for ODL suite.${nc}"
+# Following vars might be also specified as CLI params
+set -x
+PATH_TO_VENV=${PATH_TO_VENV:-~/.virtualenvs/robot/bin/activate}
+OSTACK_IP=${OSTACK_IP:-'oscontrol'}
+ODL_PORT=${ODL_PORT:-8081}
+USR_NAME=${USR_NAME:-'admin'}
+PASS=${PASS:-'octopus'}
+set +x
+
echo -e "${green}Cloning ODL integration git repo.${nc}"
if [ -d integration ]; then
cd integration
@@ -61,10 +60,14 @@ source $PATH_TO_VENV
# List of tests are specified in test_list.txt
# those are relative paths to test directories from integartion suite
-# script reads each line from file so no empty lines are allowed
echo -e "${green}Executing chosen tests.${nc}"
while read line
do
+ # skip comments
+ [[ ${line:0:1} == "#" ]] && continue
+ # skip empty lines
+ [[ -z "${line}" ]] && continue
+
echo -e "${light_green}Starting test: $line ${nc}"
pybot -v OPENSTACK:${OSTACK_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${OSTACK_IP} $line
done < test_list.txt
diff --git a/testcases/Controllers/ODL/CI/test_list.txt b/testcases/Controllers/ODL/CI/test_list.txt
index ba3aa6957..e5e52129b 100644
--- a/testcases/Controllers/ODL/CI/test_list.txt
+++ b/testcases/Controllers/ODL/CI/test_list.txt
@@ -1,2 +1,5 @@
+# List of tests` which will be executed by script start_test.sh
+# You can specify path to specific robot test file or directory (in that case all tests from directory will be executed)
+
integration/test/csit/suites/integration/basic/
integration/test/csit/suites/openstack/neutron/
--
cgit