Follow change in joid use SDN_CONTROLLER_IP env var instead of ODL_CONTROLLER_IP 69/8269/1
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 28 Jan 2016 09:00:12 +0000 (10:00 +0100)
committerMorgan Richomme <morgan.richomme@orange.com>
Thu, 28 Jan 2016 09:41:27 +0000 (09:41 +0000)
Change-Id: I298cfdfe880c52a18580eb607294cf4c7f353e71
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
(cherry picked from commit 73f040dd4998cadfbaa7b0706a441ae6ce6f6ffc)

docker/run_tests.sh

index d24a009..8fab51f 100755 (executable)
@@ -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
         :