From 92d11d139e9f76d4fd76859aea78643fc32ef36b Mon Sep 17 00:00:00 2001 From: asteroide Date: Thu, 24 Sep 2015 16:27:16 +0200 Subject: Update Keystone code from repository. Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00 --- keystone-moon/keystone/catalog/backends/kvs.py | 2 +- keystone-moon/keystone/catalog/backends/sql.py | 2 +- keystone-moon/keystone/catalog/core.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'keystone-moon/keystone/catalog') diff --git a/keystone-moon/keystone/catalog/backends/kvs.py b/keystone-moon/keystone/catalog/backends/kvs.py index 30a121d8..fe975d9d 100644 --- a/keystone-moon/keystone/catalog/backends/kvs.py +++ b/keystone-moon/keystone/catalog/backends/kvs.py @@ -18,7 +18,7 @@ from keystone.common import driver_hints from keystone.common import kvs -class Catalog(kvs.Base, catalog.Driver): +class Catalog(kvs.Base, catalog.CatalogDriverV8): # Public interface def get_catalog(self, user_id, tenant_id): return self.db.get('catalog-%s-%s' % (tenant_id, user_id)) diff --git a/keystone-moon/keystone/catalog/backends/sql.py b/keystone-moon/keystone/catalog/backends/sql.py index 0db6d498..fe69db58 100644 --- a/keystone-moon/keystone/catalog/backends/sql.py +++ b/keystone-moon/keystone/catalog/backends/sql.py @@ -86,7 +86,7 @@ class Endpoint(sql.ModelBase, sql.DictBase): extra = sql.Column(sql.JsonBlob()) -class Catalog(catalog.Driver): +class Catalog(catalog.CatalogDriverV8): # Regions def list_regions(self, hints): session = sql.get_session() diff --git a/keystone-moon/keystone/catalog/core.py b/keystone-moon/keystone/catalog/core.py index 6883b024..8bb72619 100644 --- a/keystone-moon/keystone/catalog/core.py +++ b/keystone-moon/keystone/catalog/core.py @@ -278,8 +278,8 @@ class Manager(manager.Manager): @six.add_metaclass(abc.ABCMeta) -class Driver(object): - """Interface description for an Catalog driver.""" +class CatalogDriverV8(object): + """Interface description for the Catalog driver.""" def _get_list_limit(self): return CONF.catalog.list_limit or CONF.list_limit @@ -543,3 +543,6 @@ class Driver(object): v3_catalog.append(service_v3) return v3_catalog + + +Driver = manager.create_legacy_driver(CatalogDriverV8) -- cgit 1.2.3-korg