openstack
/
neutron
Code Issues Proposed changes

Fix context.elevated 

The current version of elevated method sets for the original context
the admin role too. This change fix this.

Added unittest.

Closes-bug: #1386932

Change-Id: Ife881112efa151e53bfa4b7af35643dcf2d1114f
This commit is contained in:
Ann Kamyshnikova 2014-11-20 19:13:52 +03:00
parent 66abd9f306
commit 98fae47ad1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/context.py
View File

@ -145,7 +145,7 @@ class ContextBase(common_context.RequestContext):
context.is_admin = True
if 'admin' not in [x.lower() for x in context.roles]:
context.roles.append('admin')
context.roles = context.roles + ["admin"]
if read_deleted is not None:
context.read_deleted = read_deleted

10
neutron/tests/unit/test_api_v2_resource.py
View File

@ -89,6 +89,16 @@ class RequestTestCase(base.BaseTestCase):
def test_context_without_neutron_context(self):
self.assertTrue(self.req.context.is_admin)
def test_request_context_elevated(self):
user_context = context.Context(
'fake_user', 'fake_project', admin=False)
self.assertFalse(user_context.is_admin)
admin_context = user_context.elevated()
self.assertFalse(user_context.is_admin)
self.assertTrue(admin_context.is_admin)
self.assertNotIn('admin', user_context.roles)
self.assertIn('admin', admin_context.roles)
def test_best_match_language(self):
# Test that we are actually invoking language negotiation by webop
request = wsgi.Request.blank('/')