diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-12 16:10:10 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-12 16:10:25 +0200 |
| commit | c9b0a0a1bf5b30f241dee566c815d4e527ec9628 (patch) | |
| tree | e4489ac78dc939f5047b6fd4add57abde668c771 /functest/opnfv_tests/sdn/odl/odl.py | |
| parent | 7668df132aa661973a37aa5842be502765ba4922 (diff) | |
Update ODL testcase to OpenStack Shade
Change-Id: I7832b5ed274e181449f9db9fb03a2d27038520ae
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/sdn/odl/odl.py')
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 7c61e88df..cc56c6202 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -25,10 +25,9 @@ import os import re import sys +import os_client_config from six.moves import urllib -from snaps.openstack.utils import keystone_utils -from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils import config from functest.utils import env from xtesting.core import robotframework @@ -157,9 +156,12 @@ class ODLTests(robotframework.RobotFramework): suites = kwargs["suites"] except KeyError: pass - snaps_creds = snaps_utils.get_credentials() - kwargs = {'neutronurl': keystone_utils.get_endpoint( - snaps_creds, 'network')} + 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 + kwargs = {'neutronurl': endpoint} kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlwebport'] = '8080' kwargs['odlrestconfport'] = '8181' |