From 3b36c06f9223322e23e3885759355593b3c598a3 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Tue, 30 Jan 2018 14:59:05 +0200 Subject: Remove duplicated code related to snaps creds Add support for providing credentials in snaps_utils. JIRA: FUNCTEST-916 Change-Id: I3e027229d213d3791a115920f7012309cc027712 Signed-off-by: Juha Kosonen --- functest/opnfv_tests/vnf/epc/juju_epc.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'functest/opnfv_tests/vnf') diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index aec00853..14329329 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -29,7 +29,6 @@ from snaps.openstack.create_network import (NetworkSettings, from snaps.openstack.create_router import (RouterSettings, OpenStackRouter) from snaps.openstack.create_flavor import (FlavorSettings, OpenStackFlavor) from snaps.openstack.create_image import (ImageSettings, OpenStackImage) -from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import keystone_utils import yaml @@ -66,9 +65,7 @@ class JujuEpc(vnf.VnfOnBoarding): self.created_object = [] self.snaps_creds = '' - self.os_creds = openstack_tests.get_credentials( - os_env_file=CONST.__getattribute__('openstack_creds')) - + self.os_creds = snaps_utils.get_credentials() self.details['orchestrator'] = dict( name=get_config("orchestrator.name", config_file), version=get_config("orchestrator.version", config_file), -- cgit 1.2.3-korg