From 518f9fe660acde6258f0921698eeeb8a3c09b465 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Sat, 15 Dec 2018 21:56:54 +0900
Subject: [PATCH] Remove unused get_<plural> rules

List resources and get a resource operations both refer to
a corresponding "get_<singular>" policy rule, so "get_<plural>"
rules are never referred. This commit removes them.

"get_loggable_resources" is renamed to "get_loggable_resource"
from the same reason. "get_loggable_resources" was not used and
has no effect, so the deprecation notice is unnecessary.

Partially Implements: blueprint neutron-policy-in-code

Change-Id: I674de62944b12cf78aa303a846c483f814232870
---
 neutron/conf/policies/flavor.py                     | 8 --------
 neutron/conf/policies/floatingip_port_forwarding.py | 5 -----
 neutron/conf/policies/logging.py                    | 8 ++------
 neutron/conf/policies/network_ip_availability.py    | 4 ----
 neutron/conf/policies/security_group.py             | 8 --------
 5 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/neutron/conf/policies/flavor.py b/neutron/conf/policies/flavor.py
index ac98d458c76..604ee9f08ae 100644
--- a/neutron/conf/policies/flavor.py
+++ b/neutron/conf/policies/flavor.py
@@ -18,10 +18,6 @@ rules = [
         'create_flavor',
         'rule:admin_only',
         description='Access rule for creating flavor'),
-    policy.RuleDefault(
-        'get_flavors',
-        'rule:regular_user',
-        description='Access rule for listing flavors'),
     policy.RuleDefault(
         'get_flavor',
         'rule:regular_user',
@@ -39,10 +35,6 @@ rules = [
         'create_service_profile',
         'rule:admin_only',
         description='Access rule for creating service profile'),
-    policy.RuleDefault(
-        'get_service_profiles',
-        'rule:admin_only',
-        description='Access rule for listing service profiles'),
     policy.RuleDefault(
         'get_service_profile',
         'rule:admin_only',
diff --git a/neutron/conf/policies/floatingip_port_forwarding.py b/neutron/conf/policies/floatingip_port_forwarding.py
index 06448f99a66..8ab755b5592 100644
--- a/neutron/conf/policies/floatingip_port_forwarding.py
+++ b/neutron/conf/policies/floatingip_port_forwarding.py
@@ -22,11 +22,6 @@ rules = [
         'get_floatingip_port_forwarding',
         'rule:admin_or_ext_parent_owner',
         description='Access rule for getting floating IP port forwarding'),
-    # TOOD(amotoki): get_floatingip_port_forwardings looks unnecessary.
-    policy.RuleDefault(
-        'get_floatingip_port_forwardings',
-        'rule:admin_or_ext_parent_owner',
-        description='Access rule for listing floating IP port forwardings'),
     policy.RuleDefault(
         'update_floatingip_port_forwarding',
         'rule:admin_or_ext_parent_owner',
diff --git a/neutron/conf/policies/logging.py b/neutron/conf/policies/logging.py
index 7840c81d379..5b62f0fdd20 100644
--- a/neutron/conf/policies/logging.py
+++ b/neutron/conf/policies/logging.py
@@ -15,9 +15,9 @@ from oslo_policy import policy
 
 rules = [
     policy.RuleDefault(
-        'get_loggable_resources',
+        'get_loggable_resource',
         'rule:admin_only',
-        description='Access rule for getting loggable resources'),
+        description='Access rule for getting loggable resource'),
     policy.RuleDefault(
         'create_log',
         'rule:admin_only',
@@ -26,10 +26,6 @@ rules = [
         'get_log',
         'rule:admin_only',
         description='Access rule for getting network log'),
-    policy.RuleDefault(
-        'get_logs',
-        'rule:admin_only',
-        description='Access rule for listing network logs'),
     policy.RuleDefault(
         'update_log',
         'rule:admin_only',
diff --git a/neutron/conf/policies/network_ip_availability.py b/neutron/conf/policies/network_ip_availability.py
index c0273ae8d07..3f5dff8ef30 100644
--- a/neutron/conf/policies/network_ip_availability.py
+++ b/neutron/conf/policies/network_ip_availability.py
@@ -14,10 +14,6 @@ from oslo_policy import policy
 
 
 rules = [
-    policy.RuleDefault(
-        'get_network_ip_availabilities',
-        'rule:admin_only',
-        description='Access rule for getting network IP availabilities'),
     policy.RuleDefault(
         'get_network_ip_availability',
         'rule:admin_only',
diff --git a/neutron/conf/policies/security_group.py b/neutron/conf/policies/security_group.py
index 02b36949d52..7b58bc5da75 100644
--- a/neutron/conf/policies/security_group.py
+++ b/neutron/conf/policies/security_group.py
@@ -24,10 +24,6 @@ rules = [
         'get_security_group',
         'rule:admin_or_owner',
         description='Access rule for getting security group'),
-    policy.RuleDefault(
-        'get_security_groups',
-        'rule:admin_or_owner',
-        description='Access rule for getting security groups'),
     policy.RuleDefault(
         'update_security_group',
         'rule:admin_or_owner',
@@ -47,10 +43,6 @@ rules = [
         'get_security_group_rule',
         'rule:admin_or_owner',
         description='Access rule for getting security group rule'),
-    policy.RuleDefault(
-        'get_security_group_rules',
-        'rule:admin_or_owner',
-        description='Access rule for getting security groups rules'),
     policy.RuleDefault(
         'delete_security_group_rule',
         'rule:admin_or_owner',