openstack/ceilometer
Code Issues Proposed changes

Remove reference to the tenant attribute of RequestContext

Browse Source 
... because the attribute was deprecated a long ago and no longer
available since oslo.context 4.0.0[1].

[1] f4cbe4c296f4dd23c451a5804a70f639cd8976d6

Change-Id: Ica26126946633f54ecb04c8c0414633332785fab
This commit is contained in:
Takashi Kajinami 2022-03-01 17:25:12 +09:00
parent bac34383c6
commit 21a989e70a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/event/converter.py
View File

@ -74,13 +74,13 @@ class EventDefinition(object):
service=dict(type='text', fields='publisher_id'),
request_id=dict(type='text', fields='ctxt.request_id'),
project_id=dict(type='text', fields=['payload.tenant_id',
'ctxt.tenant']),
'ctxt.project_id']),
user_id=dict(type='text', fields=['payload.user_id',
'ctxt.user_id']),
# TODO(dikonoor):tenant_id is old terminology and should
# be deprecated
tenant_id=dict(type='text', fields=['payload.tenant_id',
'ctxt.tenant']),
'ctxt.project_id']),
)
def __init__(self, definition_cfg, trait_plugin_mgr, raw_levels):

2
ceilometer/meter/notifications.py
View File

@ -70,7 +70,7 @@ class MeterDefinition(object):
self._fallback_user_id = declarative.Definition(
'user_id', "ctxt.user_id|ctxt.user", plugin_manager)
self._fallback_project_id = declarative.Definition(
'project_id', "ctxt.tenant_id|ctxt.tenant", plugin_manager)
'project_id', "ctxt.project_id|ctxt.tenant_id", plugin_manager)
self._attributes = {}
self._metadata_attributes = {}
self._user_meta = None