Use by default the default ODL web port 41/19541/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Wed, 24 Aug 2016 15:31:01 +0000 (17:31 +0200)
committerMorgan Richomme <morgan.richomme@orange.com>
Thu, 25 Aug 2016 06:40:06 +0000 (06:40 +0000)
Change-Id: I7580f02dd5b2db6cf06690ef0163768ea59079fe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 683db3a5d67aeead1090008bce7701ffb208a15c)

ci/exec_test.sh

index 03eb2c8..20f7c2d 100755 (executable)
@@ -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
 }