Remove deprecated 'os-server-groups' policy

Remove the 'os_compute_api:os-server-groups' policy.
The 'os_compute_api:os-server-groups' policy has been deprecated
since 16.0.0 Pike.

Change-Id: If84e14f0c00db3306e1756553e69b989dcf1373e
This commit is contained in:
Takashi NATSUME
2019-01-29 16:53:56 +09:00
parent ffc07a689c
commit 8434178823
4 changed files with 8 additions and 13 deletions

View File

@@ -18,20 +18,13 @@ from oslo_policy import policy
from nova.policies import base from nova.policies import base
BASE_POLICY_NAME = 'os_compute_api:os-server-groups'
POLICY_ROOT = 'os_compute_api:os-server-groups:%s' POLICY_ROOT = 'os_compute_api:os-server-groups:%s'
BASE_POLICY_RULE = 'rule:%s' % BASE_POLICY_NAME
server_groups_policies = [ 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.DocumentedRuleDefault(
POLICY_ROOT % 'create', POLICY_ROOT % 'create',
BASE_POLICY_RULE, base.RULE_ADMIN_OR_OWNER,
"Create a new server group", "Create a new server group",
[ [
{ {
@@ -42,7 +35,7 @@ server_groups_policies = [
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
POLICY_ROOT % 'delete', POLICY_ROOT % 'delete',
BASE_POLICY_RULE, base.RULE_ADMIN_OR_OWNER,
"Delete a server group", "Delete a server group",
[ [
{ {
@@ -53,7 +46,7 @@ server_groups_policies = [
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
POLICY_ROOT % 'index', POLICY_ROOT % 'index',
BASE_POLICY_RULE, base.RULE_ADMIN_OR_OWNER,
"List all server groups", "List all server groups",
[ [
{ {
@@ -64,7 +57,7 @@ server_groups_policies = [
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
POLICY_ROOT % 'show', POLICY_ROOT % 'show',
BASE_POLICY_RULE, base.RULE_ADMIN_OR_OWNER,
"Show details of a server group", "Show details of a server group",
[ [
{ {

View File

@@ -80,7 +80,6 @@ policy_data = """
"os_compute_api:os-server-tags:update_all": "", "os_compute_api:os-server-tags:update_all": "",
"os_compute_api:os-server-tags:delete": "", "os_compute_api:os-server-tags:delete": "",
"os_compute_api:os-server-tags:delete_all": "", "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:show": "",
"os_compute_api:os-server-groups:index": "", "os_compute_api:os-server-groups:index": "",
"os_compute_api:os-server-groups:create": "", "os_compute_api:os-server-groups:create": "",

View File

@@ -411,7 +411,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"os_compute_api:os-rescue", "os_compute_api:os-rescue",
"os_compute_api:os-security-groups", "os_compute_api:os-security-groups",
"os_compute_api:os-server-password", "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",
"os_compute_api:os-server-tags:delete_all", "os_compute_api:os-server-tags:delete_all",
"os_compute_api:os-server-tags:index", "os_compute_api:os-server-tags:index",

View File

@@ -0,0 +1,4 @@
---
upgrade:
- The ``os_compute_api:os-server-groups`` policy deprecated in 16.0.0
has been removed.