aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-08 22:01:49 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-09 03:31:01 +0100
commit758eda463785081801a4ee6530a076ce4445e80c (patch)
treeeee28a9da4718f4a8827c7186c0946fb81c7e5f0 /functest/opnfv_tests/vnf
parent2976a56f03496bcd7a8d86c51e66a8980a356352 (diff)
Conform with OpenStackUser.get_os_creds() in juju_epc
UserSettings are not linked to any project then abot has to be passed as arg when calling get_os_creds. Else it returns the project registered in credentials instead of the one created by this testcase. Change-Id: Ia0658cc9af155df06de3d14e21e5288dad6367f9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf')
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index c373eee4..283a152f 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -153,13 +153,11 @@ class JujuEpc(vnf.VnfOnBoarding):
self.__logger.info("Creating Credentials for Abot-epc .....")
user_creator = self._bypass_juju_network_discovery_bug(
'juju_network_discovery_bug')
- snaps_creds = user_creator.get_os_creds('juju_network_discovery_bug')
+ snaps_creds = user_creator.get_os_creds(self.snaps_creds.project_name)
credentials_yaml = os.path.join(self.res_dir, "credentials.yaml")
- # 'tenant_n' should habe been equal to snaps_creds.project_name
- # user_creator.get_os_creds() must be checked
creds_data = {
'pass': snaps_creds.password,
- 'tenant_n': self.snaps_creds.project_name,
+ 'tenant_n': snaps_creds.project_name,
'user_n': snaps_creds.username}
with open(credentials_yaml, 'w') as yfile:
yfile.write(CREDS_TEMPLATE2.format(**creds_data))
@@ -172,13 +170,11 @@ class JujuEpc(vnf.VnfOnBoarding):
self.__logger.info("Creating Credentials for Abot-epc .....")
user_creator = self._bypass_juju_network_discovery_bug(
'juju_network_discovery_bug')
- snaps_creds = user_creator.get_os_creds('juju_network_discovery_bug')
+ snaps_creds = user_creator.get_os_creds(self.snaps_creds.project_name)
credentials_yaml = os.path.join(self.res_dir, "credentials.yaml")
- # 'tenant_n' should habe been equal to snaps_creds.project_name
- # user_creator.get_os_creds() must be checked
creds_data = {
'pass': snaps_creds.password,
- 'tenant_n': self.snaps_creds.project_name,
+ 'tenant_n': snaps_creds.project_name,
'user_n': snaps_creds.username,
'project_domain_n': snaps_creds.project_domain_name,
'user_domain_n': snaps_creds.user_domain_name}