Update tempest.conf to enable tempest from external server

1. The endpoint type to use for OpenStack Identity API v3
   "v3_endpoint_type" is set to be "adminURL" by default, which should
   be updated to the env OS_ENDPOINT_TYPE with the value "publicURL"
2. Reset the identity region name to "RegionOne"
3. For keystone api v3 in Newton, 5 testcases aimming at identity admin
   v2 test should be omitted.

JIRA: FUNCTEST-801

Change-Id: I47ae41a80de0a52d32d25c9783860955f465099c
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index f4a94f6..01331da 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -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)