Conform with OpenStackUser.get_os_creds() in juju_epc

[functest-xtesting.git] / functest / opnfv_tests / vnf / epc / juju_epc.py

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 4ca540f..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}
@@ -226,13 +222,10 @@ class JujuEpc(vnf.VnfOnBoarding):
             CONST, 'vnf_{}_private_subnet_cidr'.format(self.case_name))
         abot_router = getattr(
             CONST, 'vnf_{}_external_router'.format(self.case_name))
-        dns_nameserver = getattr(
-            CONST, 'vnf_{}_dns_nameserver'.format(self.case_name))
 
         self.__logger.info("Creating full network ...")
         subnet_settings = SubnetConfig(
-            name=private_subnet_name, cidr=private_subnet_cidr,
-            dns_nameservers=dns_nameserver)
+            name=private_subnet_name, cidr=private_subnet_cidr)
         network_settings = NetworkConfig(
             name=private_net_name, subnet_settings=[subnet_settings])
         network_creator = OpenStackNetwork(self.snaps_creds, network_settings)