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))