diff --git a/nova/policies/server_groups.py b/nova/policies/server_groups.py index ea6ef2c13cf0..30ae91c58ef7 100644 --- a/nova/policies/server_groups.py +++ b/nova/policies/server_groups.py @@ -18,20 +18,13 @@ from oslo_policy import policy from nova.policies import base -BASE_POLICY_NAME = 'os_compute_api:os-server-groups' POLICY_ROOT = 'os_compute_api:os-server-groups:%s' -BASE_POLICY_RULE = 'rule:%s' % BASE_POLICY_NAME server_groups_policies = [ - # TODO(Kevin_Zheng): remove this rule as this not used by any API - policy.RuleDefault( - name=BASE_POLICY_NAME, - check_str=base.RULE_ADMIN_OR_OWNER, - description='Deprecated in Pike and will be removed in next release'), policy.DocumentedRuleDefault( POLICY_ROOT % 'create', - BASE_POLICY_RULE, + base.RULE_ADMIN_OR_OWNER, "Create a new server group", [ { @@ -42,7 +35,7 @@ server_groups_policies = [ ), policy.DocumentedRuleDefault( POLICY_ROOT % 'delete', - BASE_POLICY_RULE, + base.RULE_ADMIN_OR_OWNER, "Delete a server group", [ { @@ -53,7 +46,7 @@ server_groups_policies = [ ), policy.DocumentedRuleDefault( POLICY_ROOT % 'index', - BASE_POLICY_RULE, + base.RULE_ADMIN_OR_OWNER, "List all server groups", [ { @@ -64,7 +57,7 @@ server_groups_policies = [ ), policy.DocumentedRuleDefault( POLICY_ROOT % 'show', - BASE_POLICY_RULE, + base.RULE_ADMIN_OR_OWNER, "Show details of a server group", [ { diff --git a/nova/tests/unit/fake_policy.py b/nova/tests/unit/fake_policy.py index 481119aae634..fb43e28114cb 100644 --- a/nova/tests/unit/fake_policy.py +++ b/nova/tests/unit/fake_policy.py @@ -80,7 +80,6 @@ policy_data = """ "os_compute_api:os-server-tags:update_all": "", "os_compute_api:os-server-tags:delete": "", "os_compute_api:os-server-tags:delete_all": "", - "os_compute_api:os-server-groups": "", "os_compute_api:os-server-groups:show": "", "os_compute_api:os-server-groups:index": "", "os_compute_api:os-server-groups:create": "", diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py index 1d804dd321b7..42286234fe11 100644 --- a/nova/tests/unit/test_policy.py +++ b/nova/tests/unit/test_policy.py @@ -411,7 +411,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase): "os_compute_api:os-rescue", "os_compute_api:os-security-groups", "os_compute_api:os-server-password", -"os_compute_api:os-server-groups", "os_compute_api:os-server-tags:delete", "os_compute_api:os-server-tags:delete_all", "os_compute_api:os-server-tags:index", diff --git a/releasenotes/notes/remove-deprecated-os-server-groups-policy-de89d5d11d490338.yaml b/releasenotes/notes/remove-deprecated-os-server-groups-policy-de89d5d11d490338.yaml new file mode 100644 index 000000000000..44dd3b7b4026 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-os-server-groups-policy-de89d5d11d490338.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - The ``os_compute_api:os-server-groups`` policy deprecated in 16.0.0 + has been removed.