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/credential | |
| parent | 49325d99acfadaadfad99c596c4ada6b5ec849de (diff) | |
Update Keystone code from repository.
Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00
Diffstat (limited to 'keystone-moon/keystone/credential')
| -rw-r--r-- | keystone-moon/keystone/credential/backends/sql.py | 2 | ||||
| -rw-r--r-- | keystone-moon/keystone/credential/controllers.py | 2 | ||||
| -rw-r--r-- | keystone-moon/keystone/credential/core.py | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/keystone-moon/keystone/credential/backends/sql.py b/keystone-moon/keystone/credential/backends/sql.py index 12daed3f..6dc9cd65 100644 --- a/keystone-moon/keystone/credential/backends/sql.py +++ b/keystone-moon/keystone/credential/backends/sql.py @@ -29,7 +29,7 @@ class CredentialModel(sql.ModelBase, sql.DictBase): extra = sql.Column(sql.JsonBlob()) -class Credential(credential.Driver): +class Credential(credential.CredentialDriverV8): # credential crud diff --git a/keystone-moon/keystone/credential/controllers.py b/keystone-moon/keystone/credential/controllers.py index 65c17278..321acc48 100644 --- a/keystone-moon/keystone/credential/controllers.py +++ b/keystone-moon/keystone/credential/controllers.py @@ -81,7 +81,7 @@ class CredentialV3(controller.V3Controller): else: return ref - @controller.filterprotected('user_id') + @controller.filterprotected('user_id', 'type') def list_credentials(self, context, filters): hints = CredentialV3.build_driver_hints(context, filters) refs = self.credential_api.list_credentials(hints) diff --git a/keystone-moon/keystone/credential/core.py b/keystone-moon/keystone/credential/core.py index 2368439e..d72856df 100644 --- a/keystone-moon/keystone/credential/core.py +++ b/keystone-moon/keystone/credential/core.py @@ -51,7 +51,7 @@ class Manager(manager.Manager): @six.add_metaclass(abc.ABCMeta) -class Driver(object): +class CredentialDriverV8(object): # credential crud @abc.abstractmethod @@ -140,3 +140,6 @@ class Driver(object): except exception.CredentialNotFound: LOG.debug('Deletion of credential is not required: %s', cr['id']) + + +Driver = manager.create_legacy_driver(CredentialDriverV8) |