diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-02-09 15:34:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-09 15:34:29 +0000 |
| commit | 8977b074eff97ce8bab359fd4cffed2b6d342b4e (patch) | |
| tree | c10978f9abc0e5cca4269ad88b4dabaa2c933a47 /functest/opnfv_tests | |
| parent | 522a8def3bba5423cdc3adc4b66b58bfa92db198 (diff) | |
| parent | 758eda463785081801a4ee6530a076ce4445e80c (diff) | |
Merge "Conform with OpenStackUser.get_os_creds() in juju_epc"
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 12 |
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} |