From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 30 Oct 2018 10:20:00 +0000 (+0100)
Subject: Fix ODL restconf port if Compass
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F64193%2F1;p=releng.git

Fix ODL restconf port if Compass

It conforms with the previous port which was hardcoded in odl.py.
The default value (8181) seems wrong [1].

[1] https://build.opnfv.org/ci/view/functest/job/functest-compass-baremetal-daily-gambia/7/console

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

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 465d91efe..42bf60b0a 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -154,6 +154,10 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
     envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}"
 fi
 
+if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then
+      envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080"
+fi
+
 if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
     if [[ -n ${IMAGE_PROPERTIES} ]]; then
         IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large"