aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-01-19 08:49:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-19 08:49:15 +0000
commit2f4c59e5bfb58e2e01e8d413c8a4f0c5f7679bb0 (patch)
tree78ed245516d5911e648c557f48206be511fff67b
parent14ace0223bcf2f0a6496cf3393418bf57f29883b (diff)
parenta8d85c1d790db37f43590f3790bf2c450bdfcc67 (diff)
Merge "Use 8081 for apex's restconfport robot variable"
-rwxr-xr-xfunctest/ci/exec_test.sh15
-rwxr-xr-xfunctest/opnfv_tests/sdn/odl/odl.py1
-rw-r--r--functest/tests/unit/odl/test_odl.py8
3 files changed, 17 insertions, 7 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 109de078f..7c96d69c3 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
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 606d59a11..6d9a76640 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -162,6 +162,7 @@ class ODLTests(testcase_base.TestcaseBase):
elif installer_type == 'apex':
kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
kwargs['odlwebport'] = '8081'
+ kwargs['odlrestconfport'] = '8081'
elif installer_type == 'joid':
kwargs['odlip'] = os.environ['SDN_CONTROLLER']
elif installer_type == 'compass':
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 8a52a9f63..59ab2c654 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -337,7 +337,8 @@ class ODLTesting(unittest.TestCase):
testcase_base.TestcaseBase.EX_RUN_ERROR)
def _test_run(self, status=testcase_base.TestcaseBase.EX_OK,
- exception=None, odlip="127.0.0.3", odlwebport="8080"):
+ exception=None, odlip="127.0.0.3", odlwebport="8080",
+ odlrestconfport="8181"):
with mock.patch('functest.utils.openstack_utils.get_endpoint',
side_effect=self._fake_url_for):
if exception:
@@ -348,7 +349,7 @@ class ODLTesting(unittest.TestCase):
self.test.main.assert_called_once_with(
keystoneip=self._keystone_ip, neutronip=self._neutron_ip,
odlip=odlip, odlpassword=self._odl_password,
- odlrestconfport=self._odl_restconfport,
+ odlrestconfport=odlrestconfport,
odlusername=self._odl_username, odlwebport=odlwebport,
ospassword=self._os_password, ostenantname=self._os_tenantname,
osusername=self._os_username)
@@ -410,7 +411,8 @@ class ODLTesting(unittest.TestCase):
os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
os.environ["INSTALLER_TYPE"] = "apex"
self._test_run(testcase_base.TestcaseBase.EX_OK,
- odlip=self._sdn_controller_ip, odlwebport='8081')
+ odlip=self._sdn_controller_ip, odlwebport='8081',
+ odlrestconfport='8081')
def test_run_joid_missing_sdn_controller(self):
with mock.patch('functest.utils.openstack_utils.get_endpoint',