openstack/neutron-lib
Code Issues Proposed changes

Merge "Adopted to new oslo.context code to remove deprecation warnings"

Browse Source
This commit is contained in:
Zuul 2018-01-22 17:46:44 +00:00 committed by Gerrit Code Review
commit dcf96cd351
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
neutron_lib/context.py
View File

@ -33,14 +33,14 @@ class ContextBase(oslo_context.RequestContext):
def __init__(self, user_id=None, tenant_id=None, is_admin=None, def __init__(self, user_id=None, tenant_id=None, is_admin=None,
timestamp=None, tenant_name=None, user_name=None, timestamp=None, tenant_name=None, user_name=None,
is_advsvc=None, **kwargs): is_advsvc=None, **kwargs):
# NOTE(jamielennox): We maintain these arguments in order for tests # NOTE(jamielennox): We maintain this argument in order for tests that
# that pass arguments positionally. # pass arguments positionally.
kwargs.setdefault('user', user_id) kwargs.setdefault('project_id', tenant_id)
kwargs.setdefault('tenant', tenant_id)
# prefer project_name, as that's what's going to be set by # prefer project_name, as that's what's going to be set by
# keystone. Fall back to tenant_name if for some reason it's blank. # keystone. Fall back to tenant_name if for some reason it's blank.
kwargs.setdefault('project_name', tenant_name) kwargs.setdefault('project_name', tenant_name)
super(ContextBase, self).__init__(is_admin=is_admin, **kwargs) super(ContextBase, self).__init__(
is_admin=is_admin, user_id=user_id, **kwargs)
self.user_name = user_name self.user_name = user_name
@ -53,17 +53,13 @@ class ContextBase(oslo_context.RequestContext):
if self.is_admin is None: if self.is_admin is None:
self.is_admin = policy.check_is_admin(self) self.is_admin = policy.check_is_admin(self)
@property
def project_id(self):
return self.tenant
@property @property
def tenant_id(self): def tenant_id(self):
return self.tenant return self.project_id
@tenant_id.setter @tenant_id.setter
def tenant_id(self, tenant_id): def tenant_id(self, tenant_id):
self.tenant = tenant_id self.project_id = tenant_id
@property @property
def tenant_name(self): def tenant_name(self):
@ -73,19 +69,11 @@ class ContextBase(oslo_context.RequestContext):
def tenant_name(self, tenant_name): def tenant_name(self, tenant_name):
self.project_name = tenant_name self.project_name = tenant_name
@property
def user_id(self):
return self.user
@user_id.setter
def user_id(self, user_id):
self.user = user_id
def to_dict(self): def to_dict(self):
context = super(ContextBase, self).to_dict() context = super(ContextBase, self).to_dict()
context.update({ context.update({
'user_id': self.user_id, 'user_id': self.user_id,
'tenant_id': self.tenant_id, 'tenant_id': self.project_id,
'project_id': self.project_id, 'project_id': self.project_id,
'timestamp': str(self.timestamp), 'timestamp': str(self.timestamp),
'tenant_name': self.project_name, 'tenant_name': self.project_name,
@ -96,18 +84,18 @@ class ContextBase(oslo_context.RequestContext):
def to_policy_values(self): def to_policy_values(self):
values = super(ContextBase, self).to_policy_values() values = super(ContextBase, self).to_policy_values()
values['tenant_id'] = self.tenant_id values['tenant_id'] = self.project_id
values['is_admin'] = self.is_admin values['is_admin'] = self.is_admin
# NOTE(jamielennox): These are almost certainly unused and non-standard # NOTE(jamielennox): These are almost certainly unused and non-standard
# but kept for backwards compatibility. Remove them in Pike # but kept for backwards compatibility. Remove them in Pike
# (oslo.context from Ocata release already issues deprecation warnings # (oslo.context from Ocata release already issues deprecation warnings
# for non-standard keys). # for non-standard keys).
values['user'] = self.user values['user'] = self.user_id
values['tenant'] = self.tenant values['tenant'] = self.project_id
values['domain'] = self.domain values['domain'] = self.domain_id
values['user_domain'] = self.user_domain values['user_domain'] = self.user_domain_id
values['project_domain'] = self.project_domain values['project_domain'] = self.project_domain_id
values['tenant_name'] = self.project_name values['tenant_name'] = self.project_name
values['project_name'] = self.project_name values['project_name'] = self.project_name
values['user_name'] = self.user_name values['user_name'] = self.user_name