From: Peter Bandzi <pbandzi@cisco.com>
Date: Fri, 22 May 2015 07:56:28 +0000 (+0200)
Subject: Add $BASEDIR var to all paths
X-Git-Tag: arno.2015.1.0~19^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F637%2F1;p=functest.git

Add $BASEDIR var to all paths

JIRA: FUNCTES-5

Change-Id: Ie5ea097bc3ef8570bac4d3a310262560b2c59199
Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
---

diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh
index c2e2c325e..f4980502b 100755
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -21,7 +21,7 @@ where:
     value  new value for var
 
 example:
-    OSTACK_IP=oscontro1 ODL_PORT=8080 bash $(basename "$0")"
+    ODL_IP=oscontro1 ODL_PORT=8080 bash $(basename "$0")"
 
 while getopts ':h' option; do
   case "$option" in
@@ -46,17 +46,17 @@ NEUTRON_IP=${NEUTRON_IP:-192.168.0.68}
 set +x
 
 echo -e "${green}Cloning ODL integration git repo.${nc}"
-if [ -d integration ]; then
-    cd integration
+if [ -d ${BASEDIR}/integration ]; then
+    cd ${BASEDIR}/integration
     git checkout -- .
     git pull
     cd -
 else
-    git clone https://github.com/opendaylight/integration.git
+    git clone https://github.com/opendaylight/integration.git ${BASEDIR}/integration
 fi
 
 # Change openstack password for admin tenant in neutron suite
-sed -i "s/\"password\": \"admin\"/\"password\": \"${PASS}\"/" integration/test/csit/suites/openstack/neutron/__init__.robot
+sed -i "s/\"password\": \"admin\"/\"password\": \"${PASS}\"/" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
 
 if source $BASEDIR/venv/bin/activate; then
     echo -e "${green}Python virtualenv activated.${nc}"
@@ -81,7 +81,7 @@ do
     [[ -z "${line}" ]] && continue
 
     echo -e "${light_green}Starting test: $line ${nc}"
-    pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} $line
+    pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${BASEDIR}/$line
     mkdir -p $BASEDIR/logs/${test_num}
     mv log.html $BASEDIR/logs/${test_num}/
     mv report.html $BASEDIR/logs/${test_num}/