openstack/neutron
Code Issues Proposed changes

Correctly set project_name

Browse Source 
With newer keystone middleware tenant* isn't set, project* is. The
current neutron logic assumes tenant is the good values, and that
project should mirror it, but that logic actually needs to be
inverted.

In order to minimally impact unit tests as operations, the strategy
here is to just prefer project_name, but fall back to tenant_name if
project_name isn't filled out (this should basically never be the
case).

With this project_name shows up in the context log lines in devstack
again (it's been missing for some time).

Change-Id: Ice6a4d046b492f02e3306627a760e5f4573f0fc6
This commit is contained in:
Sean Dague 2017-01-20 14:10:12 -05:00
parent 0c05d49949
commit af6b9b36c5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neutron/context.py
View File

@ -47,6 +47,9 @@ class ContextBase(oslo_context.RequestContext):
super(ContextBase, self).__init__(is_admin=is_admin, **kwargs)
self.user_name = user_name
# NOTE(sdague): tenant* is a deprecated set of names from
# keystone, and is no longer set in modern keystone middleware
# code, as such this is almost always going to be None.
self.tenant_name = tenant_name
if not timestamp:
@ -85,8 +88,10 @@ class ContextBase(oslo_context.RequestContext):
'tenant_id': self.tenant_id,
'project_id': self.project_id,
'timestamp': str(self.timestamp),
'tenant_name': self.tenant_name,
'project_name': self.tenant_name,
# prefer project_name, as that's what's going to be set by
# keystone. Fall back if for some reason it's blank.
'tenant_name': self.project_name or self.tenant_name,
'project_name': self.project_name or self.tenant_name,
'user_name': self.user_name,
})
return context
@ -105,8 +110,10 @@ class ContextBase(oslo_context.RequestContext):
values['domain'] = self.domain
values['user_domain'] = self.user_domain
values['project_domain'] = self.project_domain
values['tenant_name'] = self.tenant_name
values['project_name'] = self.tenant_name
# prefer project_name, as that's what's going to be set by
# keystone. Fall back if for some reason it's blank.
values['tenant_name'] = self.project_name or self.tenant_name
values['project_name'] = self.project_name or self.tenant_name
values['user_name'] = self.user_name
return values