Merge "Add description to policies in simple_tenant_usage.py"

Centrinix · Mar 28, 2017 · da039c3 · da039c3
2 parents 19fdbb1 + a36253b
commit da039c3
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/nova/policies/simple_tenant_usage.py b/nova/policies/simple_tenant_usage.py
@@ -22,12 +22,26 @@
 
 
 simple_tenant_usage_policies = [
-    policy.RuleDefault(
-        name=POLICY_ROOT % 'show',
-        check_str=base.RULE_ADMIN_OR_OWNER),
-    policy.RuleDefault(
-        name=POLICY_ROOT % 'list',
-        check_str=base.RULE_ADMIN_API),
+    base.create_rule_default(
+        POLICY_ROOT % 'show',
+        base.RULE_ADMIN_OR_OWNER,
+        "Show usage statistics for a specific tenant.",
+        [
+            {
+                'method': 'GET',
+                'path': '/os-simple-tenant-usage/{tenant_id}'
+            }
+        ]),
+    base.create_rule_default(
+        POLICY_ROOT % 'list',
+        base.RULE_ADMIN_API,
+        "List per tenant usage statistics for all tenants.",
+        [
+            {
+                'method': 'GET',
+                'path': '/os-simple-tenant-usage'
+            }
+        ]),
     policy.RuleDefault(
         name=POLICY_ROOT % 'discoverable',
         check_str=base.RULE_ANY),