aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 c373eee46..283a152fd 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}