diff options
| author |   asteroide <thomas.duval@orange.com> | 2015-09-24 16:27:16 +0200 |
|---|---|---|
| committer | asteroide <thomas.duval@orange.com> | 2015-09-24 16:27:16 +0200 |
| commit | 92d11d139e9f76d4fd76859aea78643fc32ef36b (patch) | |
| tree | bd5a2e7b50853498074ab55bdaee4452c460010b /keystone-moon/keystone/token/persistence | |
| parent | 49325d99acfadaadfad99c596c4ada6b5ec849de (diff) | |
Update Keystone code from repository.
Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00
Diffstat (limited to 'keystone-moon/keystone/token/persistence')
| -rw-r--r-- | keystone-moon/keystone/token/persistence/backends/kvs.py | 2 | ||||
| -rw-r--r-- | keystone-moon/keystone/token/persistence/backends/sql.py | 2 | ||||
| -rw-r--r-- | keystone-moon/keystone/token/persistence/core.py | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/keystone-moon/keystone/token/persistence/backends/kvs.py b/keystone-moon/keystone/token/persistence/backends/kvs.py index 1bd08a31..51931586 100644 --- a/keystone-moon/keystone/token/persistence/backends/kvs.py +++ b/keystone-moon/keystone/token/persistence/backends/kvs.py @@ -33,7 +33,7 @@ CONF = cfg.CONF LOG = log.getLogger(__name__) -class Token(token.persistence.Driver): +class Token(token.persistence.TokenDriverV8): """KeyValueStore backend for tokens. This is the base implementation for any/all key-value-stores (e.g. diff --git a/keystone-moon/keystone/token/persistence/backends/sql.py b/keystone-moon/keystone/token/persistence/backends/sql.py index 08c3a216..6fc1d223 100644 --- a/keystone-moon/keystone/token/persistence/backends/sql.py +++ b/keystone-moon/keystone/token/persistence/backends/sql.py @@ -83,7 +83,7 @@ def _expiry_range_all(session, upper_bound_func): yield upper_bound_func() -class Token(token.persistence.Driver): +class Token(token.persistence.TokenDriverV8): # Public interface def get_token(self, token_id): if token_id is None: diff --git a/keystone-moon/keystone/token/persistence/core.py b/keystone-moon/keystone/token/persistence/core.py index 15a58085..e68970ac 100644 --- a/keystone-moon/keystone/token/persistence/core.py +++ b/keystone-moon/keystone/token/persistence/core.py @@ -230,7 +230,7 @@ class Manager(object): @six.add_metaclass(abc.ABCMeta) -class Driver(object): +class TokenDriverV8(object): """Interface description for a Token driver.""" @abc.abstractmethod @@ -357,3 +357,6 @@ class Driver(object): """Archive or delete tokens that have expired. """ raise exception.NotImplemented() # pragma: no cover + + +Driver = manager.create_legacy_driver(TokenDriverV8) |