diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2018-04-09 10:08:19 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-04-09 10:08:19 +0000 |
commit | 294d5c5590426b44a20b7feb55ac60dfe9b4898b (patch) | |
tree | c8dba57cf74a0f90f3b9667e575e9e6d166ae989 | |
parent | 3b543ffedf283cef22e1bc3ad5c8cef147b80dde (diff) | |
parent | bc65c4a9424a7f9b37a81b13b67ea3d86b52d9d3 (diff) |
Merge "[fuel] Unite OpenDaylight ports"
-rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 2 | ||||
-rw-r--r-- | functest/tests/unit/odl/test_odl.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 1fe2c6bc3..ac471b285 100644 --- 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 21b819ac5..e025e180f 100644 --- 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): |