Merge "Use to_policy_values for policy credentials"

zun/common/context.py

@@ -88,6 +88,11 @@ class RequestContext(context.RequestContext):
                       'all_tenants': self.all_tenants})
         return value
 
+    def to_policy_values(self):
+        policy = super(RequestContext, self).to_policy_values()
+        policy['is_admin'] = self.is_admin
+        return policy
+
     @classmethod
     def from_dict(cls, values):
         return cls(**values)

zun/common/policy.py

@@ -86,7 +86,7 @@ def enforce(context, rule=None, target=None,
                  expression.
     """
     enforcer = init()
-    credentials = context.to_dict()
+    credentials = context.to_policy_values()
     if not exc:
         exc = exception.PolicyNotAuthorized
     if target is None:
@@ -142,5 +142,5 @@ def check_is_admin(context):
     """
     init()
     target = {}
-    credentials = context.to_dict()
+    credentials = context.to_policy_values()
     return _ENFORCER.enforce('context_is_admin', target, credentials)