From 353fb80d4d8464037f475549fd2653b423ffd2b3 Mon Sep 17 00:00:00 2001 From: Sujitha Date: Mon, 20 Mar 2017 17:21:55 +0000 Subject: [PATCH] Remove unused policy rule in admin_actions.py This patch removes the policy rule with name os_compute_api:os-admin-actions as it is not used by any API. blueprint policy-docs Change-Id: I387e80dcedd4f1500f87fc36765c42d72717ded9 --- nova/policies/admin_actions.py | 4 ---- nova/tests/unit/test_policy.py | 1 - ...ve-unused-admin_actions_policy-rule-c868436ac6fad50d.yaml | 5 +++++ 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/remove-unused-admin_actions_policy-rule-c868436ac6fad50d.yaml diff --git a/nova/policies/admin_actions.py b/nova/policies/admin_actions.py index ff7832759781..885cdeaa7d5d 100644 --- a/nova/policies/admin_actions.py +++ b/nova/policies/admin_actions.py @@ -26,10 +26,6 @@ admin_actions_policies = [ policy.RuleDefault( name=POLICY_ROOT % 'discoverable', check_str=base.RULE_ANY), - # TODO(sneti): remove this rule as this not used by any API - policy.RuleDefault( - name=BASE_POLICY_NAME, - check_str=base.RULE_ADMIN_API), base.create_rule_default( POLICY_ROOT % 'reset_state', base.RULE_ADMIN_API, diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py index b1c406d221de..11626da3f5e7 100644 --- a/nova/tests/unit/test_policy.py +++ b/nova/tests/unit/test_policy.py @@ -273,7 +273,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase): "os_compute_api:servers:show:host_status", "os_compute_api:servers:migrations:force_complete", "os_compute_api:servers:migrations:delete", -"os_compute_api:os-admin-actions", "os_compute_api:os-admin-actions:reset_network", "os_compute_api:os-admin-actions:inject_network_info", "os_compute_api:os-admin-actions:reset_state", diff --git a/releasenotes/notes/remove-unused-admin_actions_policy-rule-c868436ac6fad50d.yaml b/releasenotes/notes/remove-unused-admin_actions_policy-rule-c868436ac6fad50d.yaml new file mode 100644 index 000000000000..9d4bfd307333 --- /dev/null +++ b/releasenotes/notes/remove-unused-admin_actions_policy-rule-c868436ac6fad50d.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Policy rule with name os_compute_api:os-admin-actions has been removed + as it was never used by any API.