[fuel] Unite OpenDaylight ports

ODL Oxygen has only 1 connector by default,
so unite web and rest ports together.

Change-Id: Idd5bdd5da3dcc85fa25b82ab2d19107b2d005974
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit bc65c4a9424a7f9b37a81b13b67ea3d86b52d9d3)

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 1fe2c6b..ac471b2 100644 (file)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -176,7 +176,7 @@ class ODLTests(robotframework.RobotFramework):
             kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
             kwargs['ospassword'] = os.environ['OS_PASSWORD']
             if installer_type == 'fuel':
-                kwargs['odlwebport'] = '8181'
+                kwargs['odlwebport'] = '8282'
                 kwargs['odlrestconfport'] = '8282'
             elif installer_type == 'apex' or installer_type == 'netvirt':
                 kwargs['odlip'] = env.get('SDN_CONTROLLER_IP')

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 21b819a..e025e18 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -391,7 +391,7 @@ class ODLRunTesting(ODLTesting):
         os.environ["INSTALLER_TYPE"] = "fuel"
         self._test_run(testcase.TestCase.EX_OK, None,
                        odlip=urllib.parse.urlparse(self._neutron_url).hostname,
-                       odlwebport='8181',
+                       odlwebport='8282',
                        odlrestconfport='8282')
 
     def test_apex_no_controller_ip(self):