diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-04-09 10:26:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-09 10:26:10 +0000 |
| commit | b6d26d5f9722dc3ad23e06b42b468967e30ef940 (patch) | |
| tree | d539de102715b3ec85dab0cba50bde9a4c32ed28 /functest | |
| parent | 684f60c39442cd88f0c727cf7e6c9f81ba37e89c (diff) | |
| parent | 3677f0dd799226587dadf73c0eb79f234bac1e11 (diff) | |
Merge "[fuel] Unite OpenDaylight ports" into stable/fraser
Diffstat (limited to 'functest')
| -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): |