openstack/manila
Code Issues Proposed changes

Merge "Extend request context from_dict method from oslo context instead of overriding"

Browse Source
This commit is contained in:
Zuul
2025-08-29 01:05:21 +00:00
committed by Gerrit Code Review
parent fb3c376bf6 7c48bcf41b
commit fa5566199d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manila/context.py
View File

@@ -51,7 +51,7 @@ class RequestContext(context.RequestContext):
kwargs.setdefault('user_id', user_id) kwargs.setdefault('user_id', user_id)
kwargs.setdefault('project_id', project_id) kwargs.setdefault('project_id', project_id)
super(RequestContext, self).__init__(is_admin=is_admin, **kwargs) super().__init__(is_admin=is_admin, **kwargs)
self.project_name = project_name self.project_name = project_name
if self.is_admin is None: if self.is_admin is None:
@@ -90,7 +90,7 @@ class RequestContext(context.RequestContext):
_del_read_deleted) _del_read_deleted)
def to_dict(self): def to_dict(self):
values = super(RequestContext, self).to_dict() values = super().to_dict()
values['user_id'] = self.user_id values['user_id'] = self.user_id
values['project_id'] = self.project_id values['project_id'] = self.project_id
values['project_name'] = self.project_name values['project_name'] = self.project_name
@@ -105,7 +105,8 @@ class RequestContext(context.RequestContext):
@classmethod @classmethod
def from_dict(cls, values): def from_dict(cls, values):
return cls( return super().from_dict(
values,
user_id=values.get('user_id'), user_id=values.get('user_id'),
project_id=values.get('project_id'), project_id=values.get('project_id'),
project_name=values.get('project_name'), project_name=values.get('project_name'),