From b45f6d424a41eff12ad3fc7e1383ca2c53c1c435 Mon Sep 17 00:00:00 2001 From: Matthias Bastian Date: Tue, 31 Jul 2018 12:45:38 +0200 Subject: [PATCH] Consider region when filtering Gnocchi base URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Filtering by region is required for filtering by endpoint type: tempest.lib.auth.KeystoneV3AuthProvider.base_url will always filter by region. When no region is given the service's first URL is returned by default – overwriting the previous result filtered by endpoint type. Change-Id: Ibd3fde3e56c80d30ef2f66b69fe39d9d85fc0a94 --- telemetry_tempest_plugin/gnocchi/scenario/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telemetry_tempest_plugin/gnocchi/scenario/__init__.py b/telemetry_tempest_plugin/gnocchi/scenario/__init__.py index a15210a..32dc694 100644 --- a/telemetry_tempest_plugin/gnocchi/scenario/__init__.py +++ b/telemetry_tempest_plugin/gnocchi/scenario/__init__.py @@ -43,7 +43,8 @@ class GnocchiGabbiTest(tempest.test.BaseTestCase): token = self.os_admin.auth_provider.get_token() url = self.os_admin.auth_provider.base_url( {'service': CONF.metric.catalog_type, - 'endpoint_type': CONF.metric.endpoint_type}) + 'endpoint_type': CONF.metric.endpoint_type, + 'region': CONF.identity.region}) parsed_url = urlparse.urlsplit(url) prefix = parsed_url.path.rstrip('/') # turn it into a prefix