From bb3d9160e6a0e26dda227f844cf5e14d31ffa6cf Mon Sep 17 00:00:00 2001 From: Deepinder Setia Date: Fri, 12 Aug 2016 00:48:37 -0700 Subject: [PATCH] Tenant name is set to None in post keystone validated environment for a domain-scoped token Change-Id: Ic87983db7c4096f92d727c8ca9ba19501d14e80d Closes-Bug: #1612531 --- src/config/api-server/vnc_cfg_api_server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py index 49bbb927fda..7070241f083 100644 --- a/src/config/api-server/vnc_cfg_api_server.py +++ b/src/config/api-server/vnc_cfg_api_server.py @@ -487,7 +487,7 @@ def stateful_create(): obj_ids.update(result) env = get_request().headers.environ - tenant_name = env.get(hdr_server_tenant(), 'default-project') + tenant_name = env.get(hdr_server_tenant()) or 'default-project' get_context().set_state('PRE_DBE_CREATE') # type-specific hook @@ -968,7 +968,7 @@ def http_resource_list(self, obj_type): db_conn = self._db_conn env = get_request().headers.environ - tenant_name = env.get(hdr_server_tenant(), 'default-project') + tenant_name = env.get(hdr_server_tenant()) or 'default-project' parent_uuids = None back_ref_uuids = None obj_uuids = None @@ -2891,7 +2891,7 @@ def _list_collection(self, obj_type, parent_uuids=None, # include objects shared with tenant env = get_request().headers.environ - tenant_name = env.get(hdr_server_tenant(), 'default-project') + tenant_name = env.get(hdr_server_tenant()) or 'default-project' tenant_fq_name = ['default-domain', tenant_name] try: tenant_uuid = self._db_conn.fq_name_to_uuid('project', tenant_fq_name)