diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-05 21:31:43 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-05 21:46:45 +0200 |
| commit | 8bfca870f66bfce693ba2cbaa0e0ff437d4ed42a (patch) | |
| tree | fa294d90c09811c10837ed83b3961a983ab5c9a1 | |
| parent | cc9e41ff75402beb430210082cb61b130a897518 (diff) | |
Switch from OS_ENDPOINT_TYPE to OS_INTERFACE
It also set endpoint_type to public in tempest.conf if unset.
JIRA: FUNCTEST-975
Change-Id: I91bd1d7171b4bcf58dbe818696d5b864d5036619
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 4f9789cfab845d7209f5a2fc2209cad8941d02d6)
| -rw-r--r-- | functest/api/swagger/creds.yaml | 3 | ||||
| -rw-r--r-- | functest/api/swagger/creds_action.yaml | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 27 | ||||
| -rw-r--r-- | functest/tests/unit/openstack/tempest/test_conf_utils.py | 2 |
4 files changed, 16 insertions, 19 deletions
diff --git a/functest/api/swagger/creds.yaml b/functest/api/swagger/creds.yaml index eec7cb345..4acc16764 100644 --- a/functest/api/swagger/creds.yaml +++ b/functest/api/swagger/creds.yaml @@ -23,9 +23,8 @@ responses: "OS_AUTH_URL": "https://192.16.1.222:5000/v3" "OS_AUTH_VERSION": "3" "OS_CACERT": "/home/opnfv/functest/conf/os_cacert" - "OS_ENDPOINT_TYPE": "publicURL" "OS_IDENTITY_API_VERSION": "3" - "OS_INTERFACE": "publicURL" + "OS_INTERFACE": "public" "OS_NO_CACHE": "1" "OS_PASSWORD": "990232e0885da343ac805528522d" "OS_PROJECT_DOMAIN_NAME": "Default" diff --git a/functest/api/swagger/creds_action.yaml b/functest/api/swagger/creds_action.yaml index 7e7653bb5..c9434220b 100644 --- a/functest/api/swagger/creds_action.yaml +++ b/functest/api/swagger/creds_action.yaml @@ -28,9 +28,8 @@ parameters: description: this is the test case name default: "OS_AUTH_URL": "http://192.16.1.222:5000/v3" - "OS_ENDPOINT_TYPE": "publicURL" "OS_IDENTITY_API_VERSION": "3" - "OS_INTERFACE": "publicURL" + "OS_INTERFACE": "public" "OS_PASSWORD": "admn" "OS_PROJECT_DOMAIN_NAME": "Default" "OS_PROJECT_NAME": "admin" diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 36ff77f55..062d75ef1 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -220,20 +220,19 @@ def configure_tempest_update_params( rconfig.set('object-storage', 'operator_role', getattr(config.CONF, 'tempest_object_storage_operator_role')) - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - rconfig.set('identity', 'v3_endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) - - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - sections = rconfig.sections() - services_list = [ - 'compute', 'volume', 'image', 'network', 'data-processing', - 'object-storage', 'orchestration'] - for service in services_list: - if service not in sections: - rconfig.add_section(service) - rconfig.set(service, 'endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) + rconfig.set( + 'identity', 'v3_endpoint_type', + os.environ.get('OS_INTERFACE', 'public')) + + sections = rconfig.sections() + services_list = [ + 'compute', 'volume', 'image', 'network', 'data-processing', + 'object-storage', 'orchestration'] + for service in services_list: + if service not in sections: + rconfig.add_section(service) + rconfig.set( + service, 'endpoint_type', os.environ.get('OS_INTERFACE', 'public')) LOGGER.debug('Add/Update required params defined in tempest_conf.yaml ' 'into tempest.conf file') diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index e63fd2bb6..7c361b4d8 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -139,7 +139,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase): mock.patch('__builtin__.open', mock.mock_open()), \ mock.patch('functest.utils.functest_utils.yaml.safe_load', return_value={'validation': {'ssh_timeout': 300}}): - os.environ['OS_ENDPOINT_TYPE'] = '' + os.environ['OS_INTERFACE'] = '' if not alt: conf_utils.configure_tempest_update_params( 'test_conf_file', image_id=image_id, |