From c32d05b2c25438997feda781151a4bd09f94cf03 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 11 Jul 2016 10:13:09 +0200
Subject: Enhance ips, ports and creds management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It follows the next ODL patch [1] which splits Keystone and Neutron
IPs in Robotframework files. It also adds ODL creds, ODL ports and
tenant name as inputs.

Classical default values are also used now.

[1] https://git.opendaylight.org/gerrit/#/c/41554/

Change-Id: I867f1d4c003c4b96a5d4c3e2f982b5a0e3139217
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ci/exec_test.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 0b434547d..32988f87b 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -57,6 +57,7 @@ function odl_tests(){
         :
     else
         odl_ip=$SDN_CONTROLLER
+        odl_port=8080
     fi
 }
 
@@ -79,7 +80,8 @@ function run_test(){
         ;;
         "odl")
             odl_tests
-            ODL_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
+            ODL_WEB_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip \
+                TENANT_NAME=${OS_TENANT_NAME} USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
                 ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
 
             # push results to the DB in case of CI
-- 
cgit 1.2.3-korg