diff options
| author | Ann Kamyshnikova <akamyshnikova@mirantis.com> | 2014-11-20 19:13:52 +0300 |
|---|---|---|
| committer | Yaguang Tang <yaguang.tang@canonical.com> | 2014-11-25 11:20:34 +0800 |
| commit | d09ba29a5f16ad26fb01abfc9791c1ef7a845bc7 (patch) | |
| tree | 2b7c29e7b626d9d8591c24086ee6b16e7f06954a | |
| parent | 581977d958a456294044043e0c422303ba5a1def (diff) | |
| download | neutron-d09ba29a5f16ad26fb01abfc9791c1ef7a845bc7.tar.gz | |
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
(cherry picked from commit 98fae47ad1b9b72e41d444ce6f96cf5f2a3b6f0c)
| -rw-r--r-- | neutron/context.py | 2 | ||||
| -rw-r--r-- | neutron/tests/unit/test_api_v2_resource.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/neutron/context.py b/neutron/context.py index f248e70250..1da9b77423 100644 --- a/neutron/context.py +++ b/neutron/context.py @@ -144,7 +144,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 diff --git a/neutron/tests/unit/test_api_v2_resource.py b/neutron/tests/unit/test_api_v2_resource.py index 91e24de711..ae3dad5a7c 100644 --- a/neutron/tests/unit/test_api_v2_resource.py +++ b/neutron/tests/unit/test_api_v2_resource.py @@ -94,6 +94,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('/') |