Merge "Forbid calling generate_report from cmdline"

[functest.git] / functest / opnfv_tests / openstack / tempest / conf_utils.py

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index a21322d..54f7428 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -8,13 +8,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 import ConfigParser
+import logging
 import os
 import re
 import shutil
 import subprocess
 
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
 
@@ -42,7 +42,7 @@ CI_INSTALLER_TYPE = CONST.INSTALLER_TYPE
 CI_INSTALLER_IP = CONST.INSTALLER_IP
 
 """ logging configuration """
-logger = ft_logger.Logger("Tempest").getLogger()
+logger = logging.getLogger(__name__)
 
 
 def create_tempest_resources(use_custom_images=False,
@@ -279,12 +279,20 @@ def configure_tempest_update_params(tempest_conf_file,
     config.set('identity', 'tenant_name', CONST.tempest_identity_tenant_name)
     config.set('identity', 'username', CONST.tempest_identity_user_name)
     config.set('identity', 'password', CONST.tempest_identity_user_password)
+    config.set('identity', 'region', 'RegionOne')
     config.set(
         'validation', 'ssh_timeout', CONST.tempest_validation_ssh_timeout)
     config.set('object-storage', 'operator_role',
                CONST.tempest_object_storage_operator_role)
 
     if CONST.OS_ENDPOINT_TYPE is not None:
+        sections = config.sections()
+        if os_utils.is_keystone_v3():
+            config.set('identity', 'v3_endpoint_type', CONST.OS_ENDPOINT_TYPE)
+            if 'identity-feature-enabled' not in sections:
+                config.add_section('identity-feature-enabled')
+                config.set('identity-feature-enabled', 'api_v2', False)
+                config.set('identity-feature-enabled', 'api_v2_admin', False)
         services_list = ['compute',
                          'volume',
                          'image',
@@ -292,7 +300,6 @@ def configure_tempest_update_params(tempest_conf_file,
                          'data-processing',
                          'object-storage',
                          'orchestration']
-        sections = config.sections()
         for service in services_list:
             if service not in sections:
                 config.add_section(service)
@@ -341,7 +348,7 @@ def configure_tempest_multisite_params(tempest_conf_file):
     # cmd = ("openstack endpoint show kingbird | grep publicurl |"
     #       "awk '{print $4}' | awk -F '/' '{print $4}'")
     # kingbird_api_version = os.popen(cmd).read()
-    kingbird_api_version = os_utils.get_endpoint(service_type='multisite')
+    # kingbird_api_version = os_utils.get_endpoint(service_type='multisite')
 
     if CI_INSTALLER_TYPE == 'fuel':
         # For MOS based setup, the service is accessible
@@ -392,10 +399,14 @@ def configure_tempest_multisite_params(tempest_conf_file):
         config.add_section("kingbird")
     except Exception:
         logger.info('kingbird section exist')
+
+    # set the domain id
+    config.set('auth', 'admin_domain_name', 'default')
+
     config.set('kingbird', 'endpoint_type', 'publicURL')
-    config.set('kingbird', 'TIME_TO_SYNC', '20')
+    config.set('kingbird', 'TIME_TO_SYNC', '120')
     config.set('kingbird', 'endpoint_url', kingbird_endpoint_url)
-    config.set('kingbird', 'api_version', kingbird_api_version)
+    config.set('kingbird', 'api_version', 'v1.0')
     with open(tempest_conf_file, 'wb') as config_file:
         config.write(config_file)