Merge "Introduce scope_types in FIP pools"

Zuul · openstack-gerrit · commit 35e10ad3b15f · 2020-08-07T19:30:55.000Z
diff --git a/nova/policies/floating_ip_pools.py b/nova/policies/floating_ip_pools.py
@@ -23,15 +23,16 @@
 
 floating_ip_pools_policies = [
     policy.DocumentedRuleDefault(
-        BASE_POLICY_NAME,
-        base.RULE_ADMIN_OR_OWNER,
-        "List floating IP pools. This API is deprecated.",
-        [
+        name=BASE_POLICY_NAME,
+        check_str=base.RULE_ADMIN_OR_OWNER,
+        description="List floating IP pools. This API is deprecated.",
+        operations=[
             {
                 'method': 'GET',
                 'path': '/os-floating-ip-pools'
             }
-        ]),
+        ],
+        scope_types=['system', 'project']),
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,16 @@`
`23`	`23`
`24`	`24`	`floating_ip_pools_policies = [`
`25`	`25`	`policy.DocumentedRuleDefault(`
`26`		`- BASE_POLICY_NAME,`
`27`		`- base.RULE_ADMIN_OR_OWNER,`
`28`		`- "List floating IP pools. This API is deprecated.",`
`29`		`- [`
	`26`	`+ name=BASE_POLICY_NAME,`
	`27`	`+ check_str=base.RULE_ADMIN_OR_OWNER,`
	`28`	`+ description="List floating IP pools. This API is deprecated.",`
	`29`	`+ operations=[`
`30`	`30`	`{`
`31`	`31`	`'method': 'GET',`
`32`	`32`	`'path': '/os-floating-ip-pools'`
`33`	`33`	`}`
`34`		`- ]),`
	`34`	`+ ],`
	`35`	`+ scope_types=['system', 'project']),`
`35`	`36`	`]`
`36`	`37`
`37`	`38`