openstack
/
keystone
Code Issues Proposed changes

Cleanup of new credential_api delete methods 

Based upon the feedback on the credential_api.delete_credentials_for_user
and credential_api.delete_credentials_for_project implementations, apply
some cleaner default logic and comments/docstrings.

Change-Id: I6d1abe71931bce82c122d6cce9a94beccd8ffcfb
bp: assignment-controller-first-class
This commit is contained in:
Morgan Fainberg 2013-12-20 18:12:29 -08:00
parent 61a1e66669
commit 5acccf7c69
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
keystone/credential/core.py
View File

@ -98,25 +98,25 @@ class Driver(object):
@abc.abstractmethod
def delete_credentials_for_project(self, project_id):
"""Deletes all existing credentials for an existing project."""
for cred in self.list_credentials():
if cred['project_id'] == project_id:
try:
self.credential_api.delete_credential(cred['id'])
except exception.CredentialNotFound:
# NOTE(morganfainberg): If the credential doesn't exist
# it doesn't matter, it is meant to be deleted. Continue
# on and delete the rest.
pass
"""Deletes all credentials for a project."""
self._delete_credentials(lambda cr: cr['project_id'] == project_id)
@abc.abstractmethod
def delete_credentials_for_user(self, user_id):
for cred in self.list_credentials():
if cred['user_id'] == user_id:
"""Deletes all credentials for a user."""
self._delete_credentials(lambda cr: cr['user_id'] == user_id)
def _delete_credentials(self, match_fn):
"""Do the actual credential deletion work (default implementation).
:param match_fn: function that takes a credential dict as the
parameter and returns true or false if the
identifier matches the credential dict.
"""
for cr in self.list_credentials():
if match_fn(cr):
try:
self.credential_api.delete_credential(cred['id'])
self.credential_api.delete_credential(cr['id'])
except exception.CredentialNotFound:
# NOTE(morganfainberg): If the credential doesn't exist
# it doesn't matter, it is meant to be deleted. Continue
# on and delete the rest.
pass
LOG.debug(_('Deletion of credential is not required: %s'),
cr['id'])

4
keystone/tests/test_v3_credential.py
View File

@ -39,12 +39,16 @@ class CredentialTestCase(test_v3.RestfulTestCase):
def test_credential_api_delete_credentials_for_project(self):
self.credential_api.delete_credentials_for_project(self.project_id)
# Test that the credential that we created in .setUp no longer exists
# once we delete all credentials for self.project_id
self.assertRaises(exception.CredentialNotFound,
self.credential_api.get_credential,
credential_id=self.credential_id)
def test_credential_api_delete_credentials_for_user(self):
self.credential_api.delete_credentials_for_user(self.user_id)
# Test that the credential that we created in .setUp no longer exists
# once we delete all credentials for self.user_id
self.assertRaises(exception.CredentialNotFound,
self.credential_api.get_credential,
credential_id=self.credential_id)