Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove warning log in common.context

Browse Source 
oslo_context may add new fields in request context, there are no
need to warning these fields.
Closes-Bug #1790577

Change-Id: Ic96c1f1e1a80099d9dafa95a014fc47f05b88e42
This commit is contained in:
licanwei
2018-09-04 17:09:52 +08:00
parent f93225b75c
commit 3861f1c845
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
watcher/common/context.py
View File

@@ -38,11 +38,11 @@ class RequestContext(context.RequestContext):
tenant = kwargs.pop('tenant', None) tenant = kwargs.pop('tenant', None)
super(RequestContext, self).__init__( super(RequestContext, self).__init__(
auth_token=auth_token, auth_token=auth_token,
user=user_id or user, user_id=user_id or user,
tenant=project_id or tenant, project_id=project_id or tenant,
domain=kwargs.pop('domain', None) or domain_name or domain_id, domain_id=kwargs.pop('domain', None) or domain_name or domain_id,
user_domain=kwargs.pop('user_domain', None), user_domain_id=kwargs.pop('user_domain', None),
project_domain=kwargs.pop('project_domain', None), project_domain_id=kwargs.pop('project_domain', None),
is_admin=is_admin, is_admin=is_admin,
read_only=kwargs.pop('read_only', False), read_only=kwargs.pop('read_only', False),
show_deleted=kwargs.pop('show_deleted', False), show_deleted=kwargs.pop('show_deleted', False),
@@ -50,23 +50,15 @@ class RequestContext(context.RequestContext):
resource_uuid=kwargs.pop('resource_uuid', None), resource_uuid=kwargs.pop('resource_uuid', None),
is_admin_project=kwargs.pop('is_admin_project', True), is_admin_project=kwargs.pop('is_admin_project', True),
overwrite=overwrite, overwrite=overwrite,
roles=roles) roles=roles,
global_request_id=kwargs.pop('global_request_id', None),
system_scope=kwargs.pop('system_scope', None))
self.remote_address = kwargs.pop('remote_address', None) self.remote_address = kwargs.pop('remote_address', None)
self.instance_lock_checked = kwargs.pop('instance_lock_checked', None)
self.read_deleted = kwargs.pop('read_deleted', None) self.read_deleted = kwargs.pop('read_deleted', None)
self.service_catalog = kwargs.pop('service_catalog', None) self.service_catalog = kwargs.pop('service_catalog', None)
self.quota_class = kwargs.pop('quota_class', None) self.quota_class = kwargs.pop('quota_class', None)
# oslo_context's RequestContext.to_dict() generates this field, we can
# safely ignore this as we don't use it.
kwargs.pop('user_identity', None)
kwargs.pop('global_request_id', None)
kwargs.pop('project', None)
if kwargs:
LOG.warning('Arguments dropped when creating context: %s',
str(kwargs))
# FIXME(dims): user_id and project_id duplicate information that is # FIXME(dims): user_id and project_id duplicate information that is
# already present in the oslo_context's RequestContext. We need to # already present in the oslo_context's RequestContext. We need to
# get rid of them. # get rid of them.