From 14ff6e467ec0701da2800edd423d42d226020745 Mon Sep 17 00:00:00 2001 From: Richard Avelar Date: Wed, 22 Mar 2017 14:46:25 +0000 Subject: [PATCH] Remove unused revoke_by_domain_role_assignment This patch removes a method that wasn't being used anymore anywhere except for a single unit test. In addition, we no longer need to store the revocation event when the token provider API will rebuild the token context at validation time. Some of the test coverage for this behavior can be located here: https://github.com/openstack/keystone/blob/master/keystone/tests/unit/test_v3_assignment.py#L1175-L1177 https://github.com/openstack/keystone/blob/master/keystone/tests/unit/test_v3_assignment.py#L1191-L1193 https://github.com/openstack/keystone/blob/master/keystone/tests/unit/test_v3_assignment.py#L1311 Change-Id: I1ee53f15ec6b2dae10bfbd0fc3435e018f26f04b partial-bug: 1671887 --- keystone/revoke/core.py | 4 ---- keystone/tests/unit/test_revoke.py | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/keystone/revoke/core.py b/keystone/revoke/core.py index 021a410476..c00ed6991d 100644 --- a/keystone/revoke/core.py +++ b/keystone/revoke/core.py @@ -154,10 +154,6 @@ class Manager(manager.Manager): self.revoke( revoke_model.RevokeEvent(project_id=project_id, user_id=user_id)) - def revoke_by_domain_role_assignment(self, domain_id, role_id): - self.revoke(revoke_model.RevokeEvent(domain_id=domain_id, - role_id=role_id)) - def check_token(self, token): """Check the values from a token against the revocation list. diff --git a/keystone/tests/unit/test_revoke.py b/keystone/tests/unit/test_revoke.py index 8725c30ed2..93cdaa3da5 100644 --- a/keystone/tests/unit/test_revoke.py +++ b/keystone/tests/unit/test_revoke.py @@ -586,13 +586,6 @@ class RevokeListTests(unit.TestCase): self.events.append(event) return event - def _revoke_by_domain_role_assignment(self, domain_id, role_id): - event = add_event(self.revoke_events, - revoke_model.RevokeEvent(domain_id=domain_id, - role_id=role_id)) - self.events.append(event) - return event - def _revoke_by_domain(self, domain_id): event = add_event(self.revoke_events, revoke_model.RevokeEvent(domain_id=domain_id)) @@ -692,12 +685,6 @@ class RevokeListTests(unit.TestCase): events = self.events self._assertEmpty(self.revoke_events) for i in range(0, 10): - events.append( - self._revoke_by_domain_role_assignment(uuid.uuid4().hex, - uuid.uuid4().hex)) - events.append( - self._revoke_by_domain_role_assignment(uuid.uuid4().hex, - uuid.uuid4().hex)) events.append( self._revoke_by_user_and_project(uuid.uuid4().hex, uuid.uuid4().hex))