Merge "Use to_policy_values for enforcing policy"

cinder/context.py

@@ -145,6 +145,13 @@ class RequestContext(context.RequestContext):
                    user_domain=values.get('user_domain'),
                    project_domain=values.get('project_domain'))
 
+    def to_policy_values(self):
+        policy = super(RequestContext, self).to_policy_values()
+
+        policy['is_admin'] = self.is_admin
+
+        return policy
+
     def elevated(self, read_deleted=None, overwrite=False):
         """Return a version of this context with admin flag set."""
         context = self.deepcopy()

cinder/policy.py

@@ -64,7 +64,9 @@ def enforce(context, action, target):
     """
     init()
 
-    return _ENFORCER.enforce(action, target, context.to_dict(),
+    return _ENFORCER.enforce(action,
+                             target,
+                             context.to_policy_values(),
                              do_raise=True,
                              exc=exception.PolicyNotAuthorized,
                              action=action)