openstack/nova
Code Issues Proposed changes

Merge "Remove deprecated 'flavors' policy"

Browse Source
This commit is contained in:
Zuul 2019-02-23 06:13:00 +00:00 committed by Gerrit Code Review
commit 8eac4a1fc3
4 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/policies/__init__.py
View File

@ -35,7 +35,6 @@ from nova.policies import extensions
from nova.policies import flavor_access
from nova.policies import flavor_extra_specs
from nova.policies import flavor_manage
from nova.policies import flavors
from nova.policies import floating_ip_pools
from nova.policies import floating_ips
from nova.policies import hosts
@ -100,7 +99,6 @@ def list_rules():
flavor_access.list_rules(),
flavor_extra_specs.list_rules(),
flavor_manage.list_rules(),
flavors.list_rules(),
floating_ip_pools.list_rules(),
floating_ips.list_rules(),
hosts.list_rules(),

35
nova/policies/flavors.py
View File

@ -1,35 +0,0 @@
# Copyright 2016 Cloudbase Solutions Srl
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_policy import policy
from nova.policies import base
BASE_POLICY_NAME = 'os_compute_api:flavors'
flavors_policies = [
# TODO(johngarbutt) this doesn't appear to be used in the code and
# as such should be removed.
policy.RuleDefault(
name=BASE_POLICY_NAME,
check_str=base.RULE_ADMIN_OR_OWNER,
description='Deprecated in Pike and will be removed in next release'),
]
def list_rules():
return flavors_policies

1
nova/tests/unit/test_policy.py
View File

@ -399,7 +399,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"os_compute_api:os-remote-consoles",
"os_compute_api:os-deferred-delete",
"os_compute_api:os-flavor-access",
"os_compute_api:flavors",
"os_compute_api:os-flavor-extra-specs:index",
"os_compute_api:os-flavor-extra-specs:show",
"os_compute_api:os-floating-ip-pools",

4
releasenotes/notes/remove-deprecated-flavors-policy-c03c5d227a7b0c87.yaml Normal file
View File

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