Switch to $SDN_CONTROLLER_IP instead of $neutron_ip

ODL IP is now set to $SDN_CONTROLLER_IP in case of Apex and default.
It follows the next patch [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/16779/

Change-Id: I60238705e45ed31a67da1518ec586e3f2970c13f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index dbf9410..3519200 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -48,7 +48,7 @@ function odl_tests(){
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
-        :
+        odl_ip=$SDN_CONTROLLER_IP
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
         odl_port=8080
@@ -56,7 +56,7 @@ function odl_tests(){
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
         :
     else
-        odl_ip=$SDN_CONTROLLER
+        odl_ip=$SDN_CONTROLLER_IP
         odl_port=8080
     fi
 }