From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 28 Jan 2016 09:00:12 +0000 (+0100)
Subject: Follow change in joid use SDN_CONTROLLER_IP env var instead of ODL_CONTROLLER_IP
X-Git-Tag: brahmaputra.1.0~96
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=74a3a087033a3607c675f8d812f9d9940d32686a;p=functest.git

Follow change in joid use SDN_CONTROLLER_IP env var instead of ODL_CONTROLLER_IP

Change-Id: I298cfdfe880c52a18580eb607294cf4c7f353e71
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
(cherry picked from commit 73f040dd4998cadfbaa7b0706a441ae6ce6f6ffc)
---

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index d24a00948..8fab51f6e 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -63,7 +63,7 @@ function odl_tests(){
     elif [ $INSTALLER_TYPE == "apex" ]; then
         :
     elif [ $INSTALLER_TYPE == "joid" ]; then
-        odl_ip=$(env | grep ODL_CONTROLLER | cut -f2 -d'=')
+        odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=')
         neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
         odl_port=8080
         :