Correct odl port for compass installer

For the port 8181 has been used by OSA repo LXC
in compass deployment. So we change the port here
in functest to 8080.

Change-Id: Ia262319f7513497db6e849521de6be6328ec97ba
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index ede0fc5..5724012 100644 (file)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -234,7 +234,7 @@ class ODLTests(testcase.TestCase):
             elif installer_type == 'joid':
                 kwargs['odlip'] = os.environ['SDN_CONTROLLER']
             elif installer_type == 'compass':
-                kwargs['odlwebport'] = '8181'
+                kwargs['odlrestconfport'] = '8080'
             elif installer_type == 'daisy':
                 kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
                 kwargs['odlwebport'] = '8181'

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 8c8a6ce..8aeea41 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -511,7 +511,7 @@ class ODLRunTesting(ODLTesting):
     def test_compass(self):
         os.environ["INSTALLER_TYPE"] = "compass"
         self._test_run(testcase.TestCase.EX_OK,
-                       odlip=self._neutron_ip, odlwebport='8181')
+                       odlip=self._neutron_ip, odlrestconfport='8080')
 
     def test_daisy_no_controller_ip(self):
         with mock.patch('functest.utils.openstack_utils.get_endpoint',