diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2018-01-30 14:59:05 +0200 |
|---|---|---|
| committer | Juha Kosonen <juha.kosonen@nokia.com> | 2018-01-30 14:59:05 +0200 |
| commit | 3b36c06f9223322e23e3885759355593b3c598a3 (patch) | |
| tree | 518c1f0c8684beaacc991943870423f73a7a86d0 /functest/opnfv_tests/vnf | |
| parent | 8e416aee220bf6959e2e21f18a5ebfec1421858b (diff) | |
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 <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/vnf')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 5 |
1 files changed, 1 insertions, 4 deletions
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), |