From 3e6c9fa9d62cd783461d0f7cf24e6be33337d1a1 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Fri, 10 Jul 2015 13:46:32 +0800 Subject: [PATCH] Remove the useless require_admin_context decorator There isn't any db call need hard-code permission checks anymore. For the hard-code permission checks decorator require_admin_context. Partially implements bp nova-api-policy-final-part Change-Id: Ie5ff44b8b86298cfc1d1f24430279a7b266f49bd --- nova/db/sqlalchemy/api.py | 14 -------------- nova/tests/unit/db/test_db_api.py | 3 --- 2 files changed, 17 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index f59775cbd7c8..adcf69ba6074 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -199,20 +199,6 @@ def get_backend(): return sys.modules[__name__] -def require_admin_context(f): - """Decorator to require admin request context. - - The first argument to the wrapped function must be the context. - - """ - - @functools.wraps(f) - def wrapper(*args, **kwargs): - nova.context.require_admin_context(args[0]) - return f(*args, **kwargs) - return wrapper - - def require_context(f): """Decorator to require *any* user or admin context. diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index 6dc26c32254c..8f51640e5760 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -176,9 +176,6 @@ class DecoratorTestCase(test.TestCase): def test_require_context_decorator_wraps_functions_properly(self): self._test_decorator_wraps_helper(sqlalchemy_api.require_context) - def test_require_admin_context_decorator_wraps_functions_properly(self): - self._test_decorator_wraps_helper(sqlalchemy_api.require_admin_context) - def test_require_deadlock_retry_wraps_functions_properly(self): self._test_decorator_wraps_helper( oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True))