From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 24 Aug 2016 15:31:01 +0000 (+0200)
Subject: Use by default the default ODL web port
X-Git-Tag: colorado.1.0~94
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fa9de4296a413b62f3ef1a8ca7a62ebea7483f7e;p=functest.git

Use by default the default ODL web port

Change-Id: I7580f02dd5b2db6cf06690ef0163768ea59079fe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 683db3a5d67aeead1090008bce7701ffb208a15c)
---

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 03eb2c873..20f7c2d4f 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -44,20 +44,18 @@ function odl_tests(){
     keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
     neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
     odl_ip=${neutron_ip}
-    odl_port=8181
+    odl_port=8080
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
         odl_ip=$SDN_CONTROLLER_IP
+        odl_port=8181
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
-        odl_port=8080
-        :
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
-        :
+        odl_port=8181
     else
         odl_ip=$SDN_CONTROLLER_IP
-        odl_port=8080
     fi
 }