diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-01-19 08:49:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-19 08:49:15 +0000 |
| commit | 2f4c59e5bfb58e2e01e8d413c8a4f0c5f7679bb0 (patch) | |
| tree | 78ed245516d5911e648c557f48206be511fff67b /functest/ci | |
| parent | 14ace0223bcf2f0a6496cf3393418bf57f29883b (diff) | |
| parent | a8d85c1d790db37f43590f3790bf2c450bdfcc67 (diff) | |
Merge "Use 8081 for apex's restconfport robot variable"
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/exec_test.sh | 15 |
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 |