openstack
/
keystone
Code Issues Proposed changes

Use keystone.common.provider_api for policy APIs 

This change converts the usage of self.<provider_api> to
keystone.common.providers_api.ProviderAPIs.<provider_api> in manager
and controller logic. This is the correct way to reference
providers from other managers and controllers now that dependency
injection has been eliminated.

Change-Id: Ieea66d86d6d28ac105c4c39bdea1d05aec8e0c46
This commit is contained in:
Lance Bragstad 2017-12-27 17:10:20 +00:00
parent 1e21c52f3b
commit 822aff1ba5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keystone/policy/controllers.py
View File

@ -16,10 +16,14 @@ from oslo_log import versionutils
import six
from keystone.common import controller
from keystone.common import provider_api
from keystone.common import validation
from keystone.policy import schema
PROVIDERS = provider_api.ProviderAPIs
def policy_deprecated(f):
@six.wraps(f)
def wrapper(*args, **kwargs):
@ -39,7 +43,7 @@ class PolicyV3(controller.V3Controller):
def create_policy(self, request, policy):
validation.lazy_validate(schema.policy_create, policy)
ref = self._assign_unique_id(self._normalize_dict(policy))
ref = self.policy_api.create_policy(
ref = PROVIDERS.policy_api.create_policy(
ref['id'], ref, initiator=request.audit_initiator
)
return PolicyV3.wrap_member(request.context_dict, ref)
@ -48,21 +52,21 @@ class PolicyV3(controller.V3Controller):
@controller.filterprotected('type')
def list_policies(self, request, filters):
hints = PolicyV3.build_driver_hints(request, filters)
refs = self.policy_api.list_policies(hints=hints)
refs = PROVIDERS.policy_api.list_policies(hints=hints)
return PolicyV3.wrap_collection(request.context_dict,
refs, hints=hints)
@policy_deprecated
@controller.protected()
def get_policy(self, request, policy_id):
ref = self.policy_api.get_policy(policy_id)
ref = PROVIDERS.policy_api.get_policy(policy_id)
return PolicyV3.wrap_member(request.context_dict, ref)
@policy_deprecated
@controller.protected()
def update_policy(self, request, policy_id, policy):
validation.lazy_validate(schema.policy_update, policy)
ref = self.policy_api.update_policy(
ref = PROVIDERS.policy_api.update_policy(
policy_id, policy, initiator=request.audit_initiator
)
return PolicyV3.wrap_member(request.context_dict, ref)
@ -70,6 +74,6 @@ class PolicyV3(controller.V3Controller):
@policy_deprecated
@controller.protected()
def delete_policy(self, request, policy_id):
return self.policy_api.delete_policy(
return PROVIDERS.policy_api.delete_policy(
policy_id, initiator=request.audit_initiator
)