From 4b8a9ec3bea182dc7d2c4e08dd38e7b509aeaad3 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 7 Sep 2017 14:12:37 +0400 Subject: [Fuel/MCP] Set opendaylight web/restconf ports Change-Id: I24518bdf54974debf49df6d775db1203e61922e5 Signed-off-by: Michael Polenchuk --- functest/opnfv_tests/sdn/odl/odl.py | 3 ++- functest/tests/unit/odl/test_odl.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 841da834b..ab70ba107 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -225,7 +225,8 @@ class ODLTests(testcase.TestCase): kwargs['osauthurl'] = os.environ['OS_AUTH_URL'] kwargs['ospassword'] = os.environ['OS_PASSWORD'] if installer_type == 'fuel': - kwargs['odlwebport'] = '8282' + kwargs['odlwebport'] = '8181' + kwargs['odlrestconfport'] = '8282' elif installer_type == 'apex' or installer_type == 'netvirt': kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] kwargs['odlwebport'] = '8081' diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 8aeea41de..878d47dda 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -462,7 +462,8 @@ class ODLRunTesting(ODLTesting): def test_fuel(self): os.environ["INSTALLER_TYPE"] = "fuel" self._test_run(testcase.TestCase.EX_OK, - odlip=self._neutron_ip, odlwebport='8282') + odlip=self._neutron_ip, odlwebport='8181', + odlrestconfport='8282') def test_apex_no_controller_ip(self): with mock.patch('functest.utils.openstack_utils.get_endpoint', -- cgit 1.2.3-korg