Fixes ODL rest port for Apex

Apex has enabled tripleo firewall in deployments which block access to
port 8181.  Only port 8081 is exposed on the admin network now.

Change-Id: I58e5eaf16cfc0738c248e1468b2d59cc9f542ddd
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 45b313d..606d59a 100755 (executable)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -161,7 +161,7 @@ class ODLTests(testcase_base.TestcaseBase):
                 kwargs['odlwebport'] = '8282'
             elif installer_type == 'apex':
                 kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
-                kwargs['odlwebport'] = '8181'
+                kwargs['odlwebport'] = '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 d45d562..8a52a9f 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -410,7 +410,7 @@ 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='8181')
+                       odlip=self._sdn_controller_ip, odlwebport='8081')
 
     def test_run_joid_missing_sdn_controller(self):
         with mock.patch('functest.utils.openstack_utils.get_endpoint',