From 2976a56f03496bcd7a8d86c51e66a8980a356352 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 8 Feb 2018 20:37:20 +0100 Subject: Get neutron endpoint via snaps in odl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaf0e451e7f6bd7d22459f8d3509b39773527cfea Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/sdn/odl/odl.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'functest/opnfv_tests') diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index f25dfe5e..25cc758e 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -26,10 +26,11 @@ import re import sys from six.moves import urllib +from snaps.openstack.utils import keystone_utils from functest.core import robotframework +from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils import constants -import functest.utils.openstack_utils as op_utils __author__ = "Cedric Ollivier " @@ -155,8 +156,9 @@ class ODLTests(robotframework.RobotFramework): suites = kwargs["suites"] except KeyError: pass - kwargs = {'neutronurl': op_utils.get_endpoint( - service_type='network')} + snaps_creds = snaps_utils.get_credentials() + kwargs = {'neutronurl': keystone_utils.get_endpoint( + snaps_creds, 'network')} kwargs['odlip'] = urllib.parse.urlparse( kwargs['neutronurl']).hostname kwargs['odlwebport'] = '8080' @@ -274,7 +276,6 @@ def main(): return result if args['pushtodb']: return odl.push_to_db() - else: - return result + return result except Exception: # pylint: disable=broad-except return robotframework.RobotFramework.EX_RUN_ERROR -- cgit 1.2.3-korg