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>

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index c373eee..283a152 100644 (file)
--- 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}