diff --git a/lower-constraints.txt b/lower-constraints.txt index cd0f06d5307..865d31fbe9a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -66,7 +66,7 @@ oslo.i18n==3.20.0 oslo.log==4.3.0 oslo.messaging==7.0.0 oslo.middleware==3.31.0 -oslo.policy==3.6.2 +oslo.policy==3.7.0 oslo.privsep==2.3.0 oslo.reports==1.18.0 oslo.rootwrap==5.8.0 diff --git a/neutron/conf/policies/address_scope.py b/neutron/conf/policies/address_scope.py index cdb3c92d662..8c454f197a7 100644 --- a/neutron/conf/policies/address_scope.py +++ b/neutron/conf/policies/address_scope.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -41,9 +42,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_address_scope', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_address_scope:shared', @@ -58,9 +59,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_address_scope:shared', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_address_scope', @@ -81,9 +82,9 @@ rules = [ deprecated_rule=policy.DeprecatedRule( name='get_address_scope', check_str=base.policy_or(base.RULE_ADMIN_OR_OWNER, - 'rule:shared_address_scopes')), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + 'rule:shared_address_scopes'), + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_address_scope', @@ -98,9 +99,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='update_address_scope', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_address_scope:shared', @@ -115,9 +116,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='update_address_scope:shared', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_address_scope', @@ -132,9 +133,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='delete_address_scope', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/agent.py b/neutron/conf/policies/agent.py index a3bca05c474..1e9bbf1790c 100644 --- a/neutron/conf/policies/agent.py +++ b/neutron/conf/policies/agent.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -39,9 +40,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_agent', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_agent', @@ -56,9 +57,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='update_agent', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_agent', @@ -73,9 +74,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_agent', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_dhcp-network', @@ -90,9 +91,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='create_dhcp-network', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_dhcp-networks', @@ -107,9 +108,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_dhcp-networs', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_dhcp-network', @@ -124,9 +125,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_dhcp-networ', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_l3-router', @@ -141,9 +142,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='create_l3-router', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_l3-routers', @@ -158,9 +159,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_l3-routers', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_l3-router', @@ -175,9 +176,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_l3-router', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_dhcp-agents', @@ -192,9 +193,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_dhcp-agents', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_l3-agents', @@ -209,9 +210,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_l3-agents', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/auto_allocated_topology.py b/neutron/conf/policies/auto_allocated_topology.py index 9178760d7de..e329845baaa 100644 --- a/neutron/conf/policies/auto_allocated_topology.py +++ b/neutron/conf/policies/auto_allocated_topology.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -35,9 +36,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_auto_allocated_topology', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_auto_allocated_topology', @@ -52,9 +53,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='delete_auto_allocated_topology', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/availability_zone.py b/neutron/conf/policies/availability_zone.py index 374c78192ea..1293d80803c 100644 --- a/neutron/conf/policies/availability_zone.py +++ b/neutron/conf/policies/availability_zone.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -32,9 +33,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_availability_zone', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/flavor.py b/neutron/conf/policies/flavor.py index 3992ea36872..6867009d965 100644 --- a/neutron/conf/policies/flavor.py +++ b/neutron/conf/policies/flavor.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -40,9 +41,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='create_flavor', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_flavor', @@ -61,9 +62,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_flavor', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_flavor', @@ -78,9 +79,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='update_flavor', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_flavor', @@ -95,9 +96,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_flavor', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -113,9 +114,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='create_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_service_profile', @@ -134,9 +135,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='get_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_service_profile', @@ -151,9 +152,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='update_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_service_profile', @@ -168,9 +169,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.RuleDefault( @@ -184,9 +185,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_flavor_service_profile', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_flavor_service_profile', @@ -201,9 +202,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='create_flavor_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_flavor_service_profile', @@ -218,9 +219,9 @@ rules = [ scope_types=['system'], deprecated_rule=policy.DeprecatedRule( name='delete_flavor_service_profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/floatingip.py b/neutron/conf/policies/floatingip.py index 9fb099c1914..e41549633ca 100644 --- a/neutron/conf/policies/floatingip.py +++ b/neutron/conf/policies/floatingip.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import versionutils from oslo_policy import policy from neutron.conf.policies import base @@ -35,9 +36,9 @@ rules = [ scope_types=['project'], deprecated_rule=policy.DeprecatedRule( name='create_floatingip', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_floatingip:floating_ip_address', @@ -52,9 +53,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_floatingip:floating_ip_address', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_floatingip', @@ -73,9 +74,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_floatingip', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_floatingip', @@ -90,9 +91,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_floatingip', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_floatingip', @@ -107,9 +108,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_floatingip', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATION_REASON, - deprecated_since='Wallaby' + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/floatingip_pools.py b/neutron/conf/policies/floatingip_pools.py index 667e5337c74..e05d92265d3 100644 --- a/neutron/conf/policies/floatingip_pools.py +++ b/neutron/conf/policies/floatingip_pools.py @@ -32,9 +32,9 @@ rules = [ scope_types=['admin', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_floatingip_pool', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/floatingip_port_forwarding.py b/neutron/conf/policies/floatingip_port_forwarding.py index 58dc052cbfd..eca4b1db8de 100644 --- a/neutron/conf/policies/floatingip_port_forwarding.py +++ b/neutron/conf/policies/floatingip_port_forwarding.py @@ -42,9 +42,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_floatingip_port_forwarding', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_floatingip_port_forwarding', @@ -65,9 +65,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_floatingip_port_forwarding', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_floatingip_port_forwarding', @@ -84,9 +84,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_floatingip_port_forwarding', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_floatingip_port_forwarding', @@ -103,9 +103,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_floatingip_port_forwarding', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/l3_conntrack_helper.py b/neutron/conf/policies/l3_conntrack_helper.py index 33c20f8c8ab..eae4807b91a 100644 --- a/neutron/conf/policies/l3_conntrack_helper.py +++ b/neutron/conf/policies/l3_conntrack_helper.py @@ -42,9 +42,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_router_conntrack_helper', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_router_conntrack_helper', @@ -65,9 +65,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_router_conntrack_helper', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router_conntrack_helper', @@ -84,9 +84,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_router_conntrack_helper', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_router_conntrack_helper', @@ -103,9 +103,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_router_conntrack_helper', - check_str=base.RULE_ADMIN_OR_PARENT_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_PARENT_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/logging.py b/neutron/conf/policies/logging.py index 16fdc18d8b7..ef8409493ad 100644 --- a/neutron/conf/policies/logging.py +++ b/neutron/conf/policies/logging.py @@ -38,9 +38,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_loggable_resource', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_log', @@ -55,9 +55,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_log', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_log', @@ -76,9 +76,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_log', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_log', @@ -93,9 +93,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_log', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_log', @@ -110,9 +110,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_log', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/metering.py b/neutron/conf/policies/metering.py index fc011809db7..c1f48646332 100644 --- a/neutron/conf/policies/metering.py +++ b/neutron/conf/policies/metering.py @@ -40,9 +40,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_metering_label', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_metering_label', @@ -61,9 +61,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_metering_label', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_metering_label', @@ -78,9 +78,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_metering_label', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_metering_label_rule', @@ -95,9 +95,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_metering_label_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_metering_label_rule', @@ -116,9 +116,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_metering_label_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_metering_label_rule', @@ -133,9 +133,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_metering_label_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ) ] diff --git a/neutron/conf/policies/network.py b/neutron/conf/policies/network.py index 852d59746ac..8d8dff6cf9c 100644 --- a/neutron/conf/policies/network.py +++ b/neutron/conf/policies/network.py @@ -51,9 +51,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:shared', @@ -63,9 +63,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:shared', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:router:external', @@ -75,9 +75,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:router:external', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:is_default', @@ -87,9 +87,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:is_default', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:port_security_enabled', @@ -102,9 +102,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:port_security_enabled', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:segments', @@ -114,9 +114,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:segments', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:provider:network_type', @@ -129,9 +129,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:provider:network_type', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:provider:physical_network', @@ -144,9 +144,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:provider:physical_network', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_network:provider:segmentation_id', @@ -158,9 +158,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_network:provider:segmentation_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -180,9 +180,9 @@ rules = [ base.RULE_ADMIN_OR_OWNER, 'rule:shared', 'rule:external', - base.RULE_ADVSVC)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADVSVC), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network:router:external', @@ -192,9 +192,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_network:router:external', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network:segments', @@ -204,9 +204,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_network:segments', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network:provider:network_type', @@ -216,9 +216,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_network:provider:network_type', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network:provider:physical_network', @@ -228,9 +228,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_network:provider:physical_network', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network:provider:segmentation_id', @@ -240,9 +240,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_network:provider:segmentation_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -253,9 +253,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:segments', @@ -265,9 +265,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:segments', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:shared', @@ -277,9 +277,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:shared', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:provider:network_type', @@ -289,9 +289,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:provider:network_type', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:provider:physical_network', @@ -304,9 +304,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:provider:physical_network', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:provider:segmentation_id', @@ -319,9 +319,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:provider:segmentation_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:router:external', @@ -331,9 +331,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:router:external', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:is_default', @@ -343,9 +343,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:is_default', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network:port_security_enabled', @@ -355,9 +355,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_network:port_security_enabled', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -368,9 +368,9 @@ rules = [ operations=ACTION_DELETE, deprecated_rule=policy.DeprecatedRule( name='delete_network', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/network_ip_availability.py b/neutron/conf/policies/network_ip_availability.py index 95835a80eb9..c65aa0d4153 100644 --- a/neutron/conf/policies/network_ip_availability.py +++ b/neutron/conf/policies/network_ip_availability.py @@ -38,9 +38,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_network_ip_availability', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/network_segment_range.py b/neutron/conf/policies/network_segment_range.py index bfccda7ea42..6ef2ea65a21 100644 --- a/neutron/conf/policies/network_segment_range.py +++ b/neutron/conf/policies/network_segment_range.py @@ -40,9 +40,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_network_segment_range', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_network_segment_range', @@ -61,9 +61,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_network_segment_range', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_network_segment_range', @@ -78,9 +78,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_network_segment_range', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_network_segment_range', @@ -95,9 +95,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_network_segment_range', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/port.py b/neutron/conf/policies/port.py index 461bfcf83ab..fa1ebbecc4a 100644 --- a/neutron/conf/policies/port.py +++ b/neutron/conf/policies/port.py @@ -57,9 +57,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:device_owner', @@ -78,9 +78,9 @@ rules = [ check_str=base.policy_or( 'not rule:network_device', base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:mac_address', @@ -96,9 +96,9 @@ rules = [ name='create_port:mac_address', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:fixed_ips', @@ -116,9 +116,9 @@ rules = [ check_str=base.policy_or( base.RULE_ADVSVC, base.RULE_ADMIN_OR_NET_OWNER, - 'rule:shared')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:shared'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:fixed_ips:ip_address', @@ -134,9 +134,9 @@ rules = [ name='create_port:fixed_ips:ip_address', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:fixed_ips:subnet_id', @@ -154,9 +154,9 @@ rules = [ check_str=base.policy_or( base.RULE_ADVSVC, base.RULE_ADMIN_OR_NET_OWNER, - 'rule:shared')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:shared'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:port_security_enabled', @@ -175,9 +175,9 @@ rules = [ name='create_port:port_security_enabled', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:binding:host_id', @@ -190,9 +190,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:binding:host_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:binding:profile', @@ -205,9 +205,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:binding:profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:binding:vnic_type', @@ -220,9 +220,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:binding:vnic_type', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:allowed_address_pairs', @@ -238,9 +238,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:allowed_address_pairs', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:allowed_address_pairs:mac_address', @@ -256,9 +256,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:allowed_address_pairs:mac_address', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_port:allowed_address_pairs:ip_address', @@ -274,9 +274,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_port:allowed_address_pairs:ip_address', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -292,9 +292,9 @@ rules = [ name='get_port', check_str=base.policy_or( base.RULE_ADVSVC, - 'rule:admin_owner_or_network_owner')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:admin_owner_or_network_owner'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_port:binding:vif_type', @@ -304,9 +304,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_port:binding:vif_type', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_port:binding:vif_details', @@ -316,9 +316,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_port:binding:vif_details', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_port:binding:host_id', @@ -328,9 +328,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_port:binding:host_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_port:binding:profile', @@ -340,9 +340,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_port:binding:profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_port:resource_request', @@ -352,9 +352,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_port:resource_request', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), # TODO(amotoki): Add get_port:binding:vnic_type # TODO(amotoki): Add get_port:binding:data_plane_status @@ -372,9 +372,9 @@ rules = [ name='update_port', check_str=base.policy_or( base.RULE_ADMIN_OR_OWNER, - base.RULE_ADVSVC)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADVSVC), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:device_owner', @@ -393,9 +393,9 @@ rules = [ check_str=base.policy_or( 'not rule:network_device', base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:mac_address', @@ -410,9 +410,9 @@ rules = [ name='update_port:mac_address', check_str=base.policy_or( base.RULE_ADMIN_ONLY, - base.RULE_ADVSVC)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADVSVC), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:fixed_ips', @@ -429,9 +429,9 @@ rules = [ name='update_port:fixed_ips', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:fixed_ips:ip_address', @@ -451,9 +451,9 @@ rules = [ name='update_port:fixed_ips:ip_address', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:fixed_ips:subnet_id', @@ -475,9 +475,9 @@ rules = [ check_str=base.policy_or( base.RULE_ADVSVC, base.RULE_ADMIN_OR_NET_OWNER, - 'rule:shared')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:shared'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:port_security_enabled', @@ -494,9 +494,9 @@ rules = [ name='update_port:port_security_enabled', check_str=base.policy_or( base.RULE_ADVSVC, - base.RULE_ADMIN_OR_NET_OWNER)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADMIN_OR_NET_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:binding:host_id', @@ -506,9 +506,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:binding:host_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:binding:profile', @@ -518,9 +518,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:binding:profile', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:binding:vnic_type', @@ -535,9 +535,9 @@ rules = [ name='update_port:binding:vnic_type', check_str=base.policy_or( base.RULE_ADMIN_OR_OWNER, - base.RULE_ADVSVC)), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + base.RULE_ADVSVC), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:allowed_address_pairs', @@ -550,9 +550,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:allowed_address_pairs', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:allowed_address_pairs:mac_address', @@ -568,9 +568,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:allowed_address_pairs:mac_address', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:allowed_address_pairs:ip_address', @@ -586,9 +586,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:allowed_address_pairs:ip_address', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_port:data_plane_status', @@ -600,9 +600,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_port:data_plane_status', - check_str='rule:admin_or_data_plane_int'), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str='rule:admin_or_data_plane_int', + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -618,9 +618,9 @@ rules = [ name='delete_port', check_str=base.policy_or( base.RULE_ADVSVC, - 'rule:admin_owner_or_network_owner')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:admin_owner_or_network_owner'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/qos.py b/neutron/conf/policies/qos.py index 1ee051a020d..5b2d975a673 100644 --- a/neutron/conf/policies/qos.py +++ b/neutron/conf/policies/qos.py @@ -38,9 +38,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_policy', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_policy', @@ -55,9 +55,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_policy', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_policy', @@ -72,9 +72,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_policy', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_policy', @@ -89,9 +89,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_policy', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -111,9 +111,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_rule_type', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -134,9 +134,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_policy_bandwidth_limit_rule', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_policy_bandwidth_limit_rule', @@ -151,9 +151,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_policy_bandwidth_limit_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_policy_bandwidth_limit_rule', @@ -169,9 +169,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_policy_bandwidth_limit_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_policy_bandwidth_limit_rule', @@ -187,9 +187,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_policy_bandwidth_limit_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -210,9 +210,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_policy_dscp_marking_rule', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_policy_dscp_marking_rule', @@ -227,9 +227,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_policy_dscp_marking_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_policy_dscp_marking_rule', @@ -245,9 +245,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_policy_dscp_marking_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_policy_dscp_marking_rule', @@ -263,9 +263,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_policy_dscp_marking_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -286,9 +286,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_policy_minimum_bandwidth_rule', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_policy_minimum_bandwidth_rule', @@ -303,9 +303,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_policy_minimum_bandwidth_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_policy_minimum_bandwidth_rule', @@ -321,9 +321,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_policy_minimum_bandwidth_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_policy_minimum_bandwidth_rule', @@ -339,9 +339,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_policy_minimum_bandwidth_rule', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_alias_bandwidth_limit_rule', diff --git a/neutron/conf/policies/quotas.py b/neutron/conf/policies/quotas.py index 2d08b906dc0..9a35af29d94 100644 --- a/neutron/conf/policies/quotas.py +++ b/neutron/conf/policies/quotas.py @@ -42,9 +42,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_quota', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_quota', @@ -59,9 +59,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_quota', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_quota', @@ -76,9 +76,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_quota', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/rbac.py b/neutron/conf/policies/rbac.py index f5e73a67191..a6de6790cc5 100644 --- a/neutron/conf/policies/rbac.py +++ b/neutron/conf/policies/rbac.py @@ -45,9 +45,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_rbac_policy', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_rbac_policy:target_tenant', @@ -64,9 +64,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='create_rbac_policy:target_tenant', - check_str='rule:restrict_wildcard'), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str='rule:restrict_wildcard', + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_rbac_policy', @@ -81,9 +81,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_rbac_policy', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_rbac_policy:target_tenant', @@ -101,10 +101,10 @@ rules = [ name='update_rbac_policy:target_tenant', check_str=base.policy_and( 'rule:restrict_wildcard', - base.RULE_ADMIN_OR_OWNER)), + base.RULE_ADMIN_OR_OWNER), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY), scope_types=['system', 'project'], - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY ), policy.DocumentedRuleDefault( name='get_rbac_policy', @@ -123,9 +123,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_rbac_policy', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_rbac_policy', @@ -140,9 +140,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_rbac_policy', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/router.py b/neutron/conf/policies/router.py index 758a859aa0d..c7347642c70 100644 --- a/neutron/conf/policies/router.py +++ b/neutron/conf/policies/router.py @@ -45,9 +45,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:distributed', @@ -57,9 +57,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:distributed', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:ha', @@ -69,9 +69,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:ha', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:external_gateway_info', @@ -82,9 +82,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:external_gateway_info', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:external_gateway_info:network_id', @@ -95,9 +95,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:external_gateway_info:network_id', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:external_gateway_info:enable_snat', @@ -108,9 +108,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:external_gateway_info:enable_snat', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_router:external_gateway_info:external_fixed_ips', @@ -122,9 +122,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_router:external_gateway_info:external_fixed_ips', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -135,9 +135,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_router', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_router:distributed', @@ -147,9 +147,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_router:distributed', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_router:ha', @@ -159,9 +159,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_router:ha', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -172,9 +172,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:distributed', @@ -184,9 +184,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:distributed', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:ha', @@ -196,9 +196,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:ha', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:external_gateway_info', @@ -208,9 +208,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:external_gateway_info', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:external_gateway_info:network_id', @@ -221,9 +221,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:external_gateway_info:network_id', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:external_gateway_info:enable_snat', @@ -234,9 +234,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:external_gateway_info:enable_snat', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_router:external_gateway_info:external_fixed_ips', @@ -247,9 +247,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_router:external_gateway_info:external_fixed_ips', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -260,9 +260,9 @@ rules = [ operations=ACTION_DELETE, deprecated_rule=policy.DeprecatedRule( name='delete_router', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( @@ -278,9 +278,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='add_router_interface', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='remove_router_interface', @@ -295,9 +295,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='remove_router_interface', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/security_group.py b/neutron/conf/policies/security_group.py index f3a9d3d1e6c..790402b8013 100644 --- a/neutron/conf/policies/security_group.py +++ b/neutron/conf/policies/security_group.py @@ -57,9 +57,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_security_group', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_security_group', @@ -78,9 +78,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_security_group', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_security_group', @@ -95,9 +95,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_security_group', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_security_group', @@ -112,9 +112,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_security_group', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), # TODO(amotoki): admin_or_owner is the right rule? @@ -132,9 +132,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_security_group_rule', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_security_group_rule', @@ -155,9 +155,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_security_group_rule', - check_str=RULE_ADMIN_OWNER_OR_SG_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=RULE_ADMIN_OWNER_OR_SG_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_security_group_rule', @@ -172,9 +172,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_security_group_rule', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/segment.py b/neutron/conf/policies/segment.py index 07c91eb882b..3c77bd659fb 100644 --- a/neutron/conf/policies/segment.py +++ b/neutron/conf/policies/segment.py @@ -36,9 +36,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_segment', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_segment', @@ -57,9 +57,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_segment', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_segment', @@ -74,9 +74,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_segment', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_segment', @@ -91,9 +91,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_segment', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/service_type.py b/neutron/conf/policies/service_type.py index 2eb12541c90..ed79ca1c07f 100644 --- a/neutron/conf/policies/service_type.py +++ b/neutron/conf/policies/service_type.py @@ -33,9 +33,9 @@ rules = [ scope_types=['system', 'project'], deprecated_rule=policy.DeprecatedRule( name='get_service_provider', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATION_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATION_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/subnet.py b/neutron/conf/policies/subnet.py index 134cb8a705b..df74cd4493f 100644 --- a/neutron/conf/policies/subnet.py +++ b/neutron/conf/policies/subnet.py @@ -47,9 +47,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_subnet', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_subnet:segment_id', @@ -61,9 +61,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_subnet:segment_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_subnet:service_types', @@ -75,9 +75,9 @@ rules = [ operations=ACTION_POST, deprecated_rule=policy.DeprecatedRule( name='create_subnet:service_types', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_subnet', @@ -91,9 +91,9 @@ rules = [ name='get_subnet', check_str=base.policy_or( base.RULE_ADMIN_OR_OWNER, - 'rule:shared')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:shared'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_subnet:segment_id', @@ -103,9 +103,9 @@ rules = [ operations=ACTION_GET, deprecated_rule=policy.DeprecatedRule( name='get_subnet:segment_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_subnet', @@ -117,9 +117,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_subnet', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_subnet:segment_id', @@ -129,9 +129,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_subnet:segment_id', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_subnet:service_types', @@ -141,9 +141,9 @@ rules = [ operations=ACTION_PUT, deprecated_rule=policy.DeprecatedRule( name='update_subnet:service_types', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_subnet', @@ -155,9 +155,9 @@ rules = [ operations=ACTION_DELETE, deprecated_rule=policy.DeprecatedRule( name='delete_subnet', - check_str=base.RULE_ADMIN_OR_NET_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_NET_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/subnetpool.py b/neutron/conf/policies/subnetpool.py index cbc48104531..bd00c08d460 100644 --- a/neutron/conf/policies/subnetpool.py +++ b/neutron/conf/policies/subnetpool.py @@ -44,9 +44,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_subnetpool', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_subnetpool:shared', @@ -61,9 +61,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_subnetpool:shared', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='create_subnetpool:is_default', @@ -80,9 +80,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_subnetpool:is_default', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_subnetpool', @@ -106,9 +106,9 @@ rules = [ name='get_subnetpool', check_str=base.policy_or( base.RULE_ADMIN_OR_OWNER, - 'rule:shared_subnetpools')), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + 'rule:shared_subnetpools'), + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_subnetpool', @@ -123,9 +123,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_subnetpool', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_subnetpool:is_default', @@ -140,9 +140,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_subnetpool:is_default', - check_str=base.RULE_ADMIN_ONLY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_ONLY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_subnetpool', @@ -157,9 +157,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_subnetpool', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='onboard_network_subnets', @@ -174,9 +174,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='onboard_network_subnets', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='add_prefixes', @@ -191,9 +191,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='add_prefixes', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='remove_prefixes', @@ -208,9 +208,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='remove_prefixes', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/neutron/conf/policies/trunk.py b/neutron/conf/policies/trunk.py index b039c068670..9c7d5e72636 100644 --- a/neutron/conf/policies/trunk.py +++ b/neutron/conf/policies/trunk.py @@ -37,9 +37,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='create_trunk', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_trunk', @@ -58,9 +58,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_trunk', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='update_trunk', @@ -75,9 +75,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='update_trunk', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='delete_trunk', @@ -92,9 +92,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='delete_trunk', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='get_subports', @@ -109,9 +109,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='get_subports', - check_str=base.RULE_ANY), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ANY, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='add_subports', @@ -126,9 +126,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='add_subports', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), policy.DocumentedRuleDefault( name='remove_subports', @@ -143,9 +143,9 @@ rules = [ ], deprecated_rule=policy.DeprecatedRule( name='remove_subports', - check_str=base.RULE_ADMIN_OR_OWNER), - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY + check_str=base.RULE_ADMIN_OR_OWNER, + deprecated_reason=DEPRECATED_REASON, + deprecated_since=versionutils.deprecated.WALLABY) ), ] diff --git a/requirements.txt b/requirements.txt index 20fdcb2a518..ea9cd35ca33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ oslo.i18n>=3.20.0 # Apache-2.0 oslo.log>=4.3.0 # Apache-2.0 oslo.messaging>=7.0.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 -oslo.policy>=3.6.2 # Apache-2.0 +oslo.policy>=3.7.0 # Apache-2.0 oslo.privsep>=2.3.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 oslo.rootwrap>=5.8.0 # Apache-2.0