Blacklick test_add_subport if OVN

[functest.git] / functest / core / tenantnetwork.py

diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 604e49a..b4818d7 100644 (file)
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -20,17 +20,17 @@ This classes could be reused by more complexed scenarios (Single VM)
 
 import logging
 import os
-import random
-import string
 import time
 import uuid
 
 import os_client_config
 import shade
+from tempest.lib.common.utils import data_utils
 from xtesting.core import testcase
 
 from functest.utils import config
 from functest.utils import env
+from functest.utils import functest_utils
 
 
 class NewProject():
@@ -55,8 +55,8 @@ class NewProject():
         """Create projects/users"""
         assert self.orig_cloud
         assert self.case_name
-        self.password = ''.join(random.choice(
-            string.ascii_letters + string.digits) for _ in range(30))
+        self.password = data_utils.rand_password().replace('%', '!')
+        self.__logger.debug("password: %s", self.password)
         self.domain = self.orig_cloud.get_domain(
             name_or_id=self.orig_cloud.auth.get(
                 "project_domain_name", "Default"))
@@ -152,8 +152,10 @@ class TenantNetwork1(testcase.TestCase):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'tenantnetwork1'
         super(TenantNetwork1, self).__init__(**kwargs)
-        self.res_dir = os.path.join(
-            getattr(config.CONF, 'dir_results'), self.case_name)
+        self.dir_results = os.path.join(getattr(config.CONF, 'dir_results'))
+        self.res_dir = os.path.join(self.dir_results, self.case_name)
+        self.output_log_name = 'functest.log'
+        self.output_debug_log_name = 'functest.debug.log'
         try:
             cloud_config = os_client_config.get_config()
             self.cloud = self.orig_cloud = shade.OpenStackCloud(
@@ -203,7 +205,7 @@ class TenantNetwork1(testcase.TestCase):
     @staticmethod
     def get_public_auth_url(cloud):
         """Get Keystone public endpoint"""
-        keystone_id = cloud.search_services('keystone')[0].id
+        keystone_id = functest_utils.search_services(cloud, 'keystone')[0].id
         endpoint = cloud.search_endpoints(
             filters={'interface': 'public',
                      'service_id': keystone_id})[0].url