diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-12 09:52:21 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-12 09:52:21 +0200 |
| commit | 06b9ace7a0333d723972502ab3ce5784b6cba689 (patch) | |
| tree | 7a567caacb61a02132b7e6e1d7b55528ba6dfbee | |
| parent | 2ad8f039112977c4dfdf4389586df74263d753b6 (diff) | |
Protect vs former interface format
Compass still set publicURL [1]
[1] https://build.opnfv.org/ci/view/functest/job/functest-compass-baremetal-daily-fraser/lastFailedBuild/consoleFull
Change-Id: I88c6ca336a7017f97f4c07719156e567d1afb9df
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 180fa0eab..21c879efb 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -159,8 +159,10 @@ class ODLTests(robotframework.RobotFramework): cloud = os_client_config.make_shade() neutron_id = cloud.search_services('neutron')[0].id endpoint = cloud.search_endpoints( - filters={'interface': os.environ.get('OS_INTERFACE', 'public'), - 'service_id': neutron_id})[0].url + filters={ + 'interface': os.environ.get( + 'OS_INTERFACE', 'public').replace('URL', ''), + 'service_id': neutron_id})[0].url kwargs = {'neutronurl': endpoint} kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlwebport'] = '8080' diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index bf509cbd6..58a699f0b 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -388,8 +388,10 @@ class ODLRunTesting(ODLTesting): args[0].assert_called_once_with() args[0].return_value.search_services.assert_called_once_with('neutron') args[0].return_value.search_endpoints.assert_called_once_with( - filters={'interface': os.environ.get("OS_INTERFACE", "public"), - 'service_id': self._neutron_id}) + filters={ + 'interface': os.environ.get( + "OS_INTERFACE", "public").replace('URL', ''), + 'service_id': self._neutron_id}) @mock.patch('os_client_config.make_shade') def _test_multiple_suites(self, suites, @@ -474,6 +476,13 @@ class ODLRunTesting(ODLTesting): odlip=self._sdn_controller_ip, odlwebport=self._odl_webport) + def test_os_interface_publicurl(self): + os.environ["OS_INTERFACE"] = "publicURL" + os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip + self._test_run(testcase.TestCase.EX_OK, None, + odlip=self._sdn_controller_ip, + odlwebport=self._odl_webport) + def test_os_interface_internal(self): os.environ["OS_INTERFACE"] = "internal" os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip |