diff options
author | 2018-02-09 15:31:02 +0000 | |
---|---|---|
committer | 2018-02-09 15:31:02 +0000 | |
commit | 522a8def3bba5423cdc3adc4b66b58bfa92db198 (patch) | |
tree | a480f8f4b62a77dc79fee4862b11e4f4f7a0b123 /functest/opnfv_tests/sdn/odl/odl.py | |
parent | 9fd0361c6361b061eae3851e61f9d16edffc6de7 (diff) | |
parent | 2976a56f03496bcd7a8d86c51e66a8980a356352 (diff) |
Merge "Get neutron endpoint via snaps in odl"
Diffstat (limited to 'functest/opnfv_tests/sdn/odl/odl.py')
-rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 11 |
1 files changed, 6 insertions, 5 deletions
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 <cedric.ollivier@orange.com>" @@ -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 |