aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci/exec_test.sh
diff options
context:
space:
mode:
authorJamo Luhrsen <jluhrsen@redhat.com>2017-01-17 09:07:55 -0800
committerJamo Luhrsen <jluhrsen@redhat.com>2017-01-18 10:27:36 -0800
commita8d85c1d790db37f43590f3790bf2c450bdfcc67 (patch)
treebe792a9c9d4dfadfff6dbb405774de6af1c24bdc /functest/ci/exec_test.sh
parent7e52f05a029811d2174cc6c851e95252bd99632b (diff)
Use 8081 for apex's restconfport robot variable
Change-Id: Ie3579254b8f09eda3707fbc4b8d098a292f52a93 Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
Diffstat (limited to 'functest/ci/exec_test.sh')
-rwxr-xr-xfunctest/ci/exec_test.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 109de078..7c96d69c 100755
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -47,11 +47,13 @@ function odl_tests(){
neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
odl_ip=${neutron_ip}
odl_port=8080
+ odl_restport=8181
if [ "$INSTALLER_TYPE" == "fuel" ]; then
odl_port=8282
elif [ "$INSTALLER_TYPE" == "apex" ]; then
odl_ip=$SDN_CONTROLLER_IP
- odl_port=8181
+ odl_port=8081
+ odl_restport=8081
elif [ "$INSTALLER_TYPE" == "joid" ]; then
odl_ip=$SDN_CONTROLLER
elif [ "$INSTALLER_TYPE" == "compass" ]; then
@@ -78,10 +80,15 @@ function run_test(){
odl_tests
[[ "$report" == "-r" ]] && args=-p
${FUNCTEST_TEST_DIR}/sdn/odl/odl.py \
- --keystoneip $keystone_ip --neutronip $neutron_ip \
- --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
+ --keystoneip $keystone_ip \
+ --neutronip $neutron_ip \
+ --odlip $odl_ip \
+ --odlrestconfport $odl_restport \
+ --odlwebport $odl_port \
--ospassword ${OS_PASSWORD} \
- --odlip $odl_ip --odlwebport $odl_port ${args}
+ --ostenantname ${OS_TENANT_NAME} \
+ --osusername ${OS_USERNAME} \
+ ${args}
;;
"vims")
python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report