openstack/designate
Code Issues Proposed changes

Merge "Move context from tenant to project_id"

Browse Source
This commit is contained in:
Zuul 2022-02-17 23:43:57 +00:00 committed by Gerrit Code Review
commit 0cc0c8571c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
designate/context.py
View File

@ -31,16 +31,16 @@ class DesignateContext(context.RequestContext):
_all_tenants = False _all_tenants = False
_hide_counts = False _hide_counts = False
_abandon = None _abandon = None
original_tenant = None original_project_id = None
_edit_managed_records = False _edit_managed_records = False
_client_addr = None _client_addr = None
FROM_DICT_EXTRA_KEYS = [ FROM_DICT_EXTRA_KEYS = [
'original_tenant', 'service_catalog', 'all_tenants', 'abandon', 'original_project_id', 'service_catalog', 'all_tenants', 'abandon',
'edit_managed_records', 'tsigkey_id', 'hide_counts', 'client_addr', 'edit_managed_records', 'tsigkey_id', 'hide_counts', 'client_addr',
] ]
def __init__(self, service_catalog=None, all_tenants=False, abandon=None, def __init__(self, service_catalog=None, all_tenants=False, abandon=None,
tsigkey_id=None, original_tenant=None, tsigkey_id=None, original_project_id=None,
edit_managed_records=False, hide_counts=False, edit_managed_records=False, hide_counts=False,
client_addr=None, user_auth_plugin=None, **kwargs): client_addr=None, user_auth_plugin=None, **kwargs):
super(DesignateContext, self).__init__(**kwargs) super(DesignateContext, self).__init__(**kwargs)
@ -49,7 +49,7 @@ class DesignateContext(context.RequestContext):
self.service_catalog = service_catalog self.service_catalog = service_catalog
self.tsigkey_id = tsigkey_id self.tsigkey_id = tsigkey_id
self.original_tenant = original_tenant self.original_project_id = original_project_id
self.all_tenants = all_tenants self.all_tenants = all_tenants
self.abandon = abandon self.abandon = abandon
@ -85,7 +85,7 @@ class DesignateContext(context.RequestContext):
# Update the dict with Designate specific extensions and overrides # Update the dict with Designate specific extensions and overrides
d.update({ d.update({
'user_identity': user_idt, 'user_identity': user_idt,
'original_tenant': self.original_tenant, 'original_project_id': self.original_project_id,
'service_catalog': self.service_catalog, 'service_catalog': self.service_catalog,
'all_tenants': self.all_tenants, 'all_tenants': self.all_tenants,
'abandon': self.abandon, 'abandon': self.abandon,
@ -121,14 +121,14 @@ class DesignateContext(context.RequestContext):
return context return context
def sudo(self, tenant): def sudo(self, project_id):
policy.check('use_sudo', self) policy.check('use_sudo', self)
LOG.info('Accepted sudo from user %(user)s to tenant %(tenant)s', LOG.info('Accepted sudo from user %(user)s to project_id %(project)s',
{'user': self.user_id, 'tenant': tenant}) {'user': self.user_id, 'project': project_id})
self.original_tenant = self.tenant self.original_project_id = self.project_id
self.tenant = tenant self.project_id = project_id
@classmethod @classmethod
def get_admin_context(cls, **kwargs): def get_admin_context(cls, **kwargs):

8
designate/tests/unit/test_context.py
View File

@ -99,10 +99,10 @@ class TestDesignateContext(designate.tests.TestCase):
@mock.patch.object(policy, 'check') @mock.patch.object(policy, 'check')
def test_sudo(self, mock_policy_check): def test_sudo(self, mock_policy_check):
ctxt = context.DesignateContext( ctxt = context.DesignateContext(
user_id='12345', project_id='old_tenant' user_id='12345', project_id='old_project'
) )
ctxt.sudo('new_tenant') ctxt.sudo('new_project')
self.assertTrue(mock_policy_check.called) self.assertTrue(mock_policy_check.called)
self.assertEqual('new_tenant', ctxt.tenant) self.assertEqual('new_project', ctxt.project_id)
self.assertEqual('old_tenant', ctxt.original_tenant) self.assertEqual('old_project', ctxt.original_project_id)