From 52cd81934b6a64bda80a140446d8895413789221 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 28 Feb 2015 13:48:18 +0100 Subject: [PATCH] context: reuse base oslo.context class for to_dict() It is need to conform to expectations of consumers that rely on oslo.context behaviour (f.e. oslo.log that relies [1] on user_identity field being set for context objects). [1]: https://github.com/openstack/oslo.log/blob/master/oslo_log/_options.py#L99 Closes-Bug: #1433687 Change-Id: I95e803b96e6e3e5b8c12298dc6327b974330c639 --- neutron/context.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/neutron/context.py b/neutron/context.py index 4e8bdfb25..cfaa06920 100644 --- a/neutron/context.py +++ b/neutron/context.py @@ -110,21 +110,19 @@ class ContextBase(oslo_context.RequestContext): _del_read_deleted) def to_dict(self): - return {'user_id': self.user_id, - 'tenant_id': self.tenant_id, - 'project_id': self.project_id, - 'is_admin': self.is_admin, - 'read_deleted': self.read_deleted, - 'roles': self.roles, - 'timestamp': str(self.timestamp), - 'request_id': self.request_id, - 'tenant': self.tenant, - 'user': self.user, - 'tenant_name': self.tenant_name, - 'project_name': self.tenant_name, - 'user_name': self.user_name, - 'auth_token': self.auth_token, - } + context = super(ContextBase, self).to_dict() + context.update({ + 'user_id': self.user_id, + 'tenant_id': self.tenant_id, + 'project_id': self.project_id, + 'read_deleted': self.read_deleted, + 'roles': self.roles, + 'timestamp': str(self.timestamp), + 'tenant_name': self.tenant_name, + 'project_name': self.tenant_name, + 'user_name': self.user_name, + }) + return context @classmethod def from_dict(cls, values): -- 2.45.2