From 181e6d6e4828711744d451185d64c5c4939824fe Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 8 Feb 2018 18:55:08 +0100 Subject: Move source_credentials() into run_tests.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's also renamed source_envfile(). Change-Id: I0e7c38c2def125961f86dc2bc9a63cfb6ad87c03 Signed-off-by: Cédric Ollivier --- functest/api/resources/v1/creds.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'functest/api') diff --git a/functest/api/resources/v1/creds.py b/functest/api/resources/v1/creds.py index c4797fc2..fefbbaa9 100644 --- a/functest/api/resources/v1/creds.py +++ b/functest/api/resources/v1/creds.py @@ -13,16 +13,16 @@ Resources to handle openstack related requests import collections import logging -import pkg_resources import socket from flask import jsonify from flasgger.utils import swag_from +import pkg_resources from functest.api.base import ApiResource from functest.api.common import api_utils +from functest.ci import run_tests from functest.cli.commands.cli_os import OpenStack -from functest.utils import openstack_utils as os_utils from functest.utils.constants import CONST LOGGER = logging.getLogger(__name__) @@ -39,7 +39,7 @@ class V1Creds(ApiResource): endpoint='{0}/credentials'.format(ENDPOINT_CREDS)) def get(self): # pylint: disable=no-self-use """ Get credentials """ - os_utils.source_credentials(CONST.__getattribute__('env_file')) + run_tests.Runner.source_envfile(CONST.__getattribute__('env_file')) credentials_show = OpenStack.show_credentials() return jsonify(credentials_show) @@ -71,7 +71,7 @@ class V1Creds(ApiResource): LOGGER.info("Sourcing the OpenStack RC file...") try: - os_utils.source_credentials(rc_file) + run_tests.Runner.source_envfile(rc_file) except Exception as err: # pylint: disable=broad-except LOGGER.exception('Failed to source the OpenStack RC file') return api_utils.result_handler(status=0, data=str(err)) -- cgit 1.2.3-korg