aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-07 14:12:37 +0400
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-07 13:07:08 +0200
commit4b8a9ec3bea182dc7d2c4e08dd38e7b509aeaad3 (patch)
tree86c6837e042999764dec6f1b7e7859a8ec2b6570
parent6d52c73456246ddc3bc9426d15b94c6eedfbe85e (diff)
[Fuel/MCP] Set opendaylight web/restconf ports
Change-Id: I24518bdf54974debf49df6d775db1203e61922e5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py3
-rw-r--r--functest/tests/unit/odl/test_odl.py3
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',