Merge "Make ManagerWithFind abstract and fix its descendants"

This commit is contained in:
Jenkins
2013-06-06 08:14:10 +00:00
committed by Gerrit Code Review
7 changed files with 13 additions and 10 deletions

View File

@@ -18,7 +18,7 @@
""" """
Base utilities to build API operation managers and objects on top of. Base utilities to build API operation managers and objects on top of.
""" """
import abc
import contextlib import contextlib
import hashlib import hashlib
import os import os
@@ -167,6 +167,12 @@ class ManagerWithFind(Manager):
""" """
Like a `Manager`, but with additional `find()`/`findall()` methods. Like a `Manager`, but with additional `find()`/`findall()` methods.
""" """
__metaclass__ = abc.ABCMeta
@abc.abstractmethod
def list(self):
pass
def find(self, **kwargs): def find(self, **kwargs):
""" """
Find a single item with attributes matching ``**kwargs``. Find a single item with attributes matching ``**kwargs``.
@@ -204,9 +210,6 @@ class ManagerWithFind(Manager):
return found return found
def list(self):
raise NotImplementedError
class Resource(object): class Resource(object):
""" """

View File

@@ -28,7 +28,7 @@ class QuotaClassSet(base.Resource):
self.manager.update(self.class_name, *args, **kwargs) self.manager.update(self.class_name, *args, **kwargs)
class QuotaClassSetManager(base.ManagerWithFind): class QuotaClassSetManager(base.Manager):
resource_class = QuotaClassSet resource_class = QuotaClassSet
def get(self, class_name): def get(self, class_name):

View File

@@ -28,7 +28,7 @@ class QuotaSet(base.Resource):
self.manager.update(self.tenant_id, *args, **kwargs) self.manager.update(self.tenant_id, *args, **kwargs)
class QuotaSetManager(base.ManagerWithFind): class QuotaSetManager(base.Manager):
resource_class = QuotaSet resource_class = QuotaSet
def get(self, tenant_id): def get(self, tenant_id):

View File

@@ -27,7 +27,7 @@ class VolumeBackupsRestore(base.Resource):
return "<VolumeBackupsRestore: %s>" % self.id return "<VolumeBackupsRestore: %s>" % self.id
class VolumeBackupRestoreManager(base.ManagerWithFind): class VolumeBackupRestoreManager(base.Manager):
"""Manage :class:`VolumeBackupsRestore` resources.""" """Manage :class:`VolumeBackupsRestore` resources."""
resource_class = VolumeBackupsRestore resource_class = VolumeBackupsRestore

View File

@@ -27,7 +27,7 @@ class QuotaClassSet(base.Resource):
self.manager.update(self.class_name, *args, **kwargs) self.manager.update(self.class_name, *args, **kwargs)
class QuotaClassSetManager(base.ManagerWithFind): class QuotaClassSetManager(base.Manager):
resource_class = QuotaClassSet resource_class = QuotaClassSet
def get(self, class_name): def get(self, class_name):

View File

@@ -27,7 +27,7 @@ class QuotaSet(base.Resource):
self.manager.update(self.tenant_id, *args, **kwargs) self.manager.update(self.tenant_id, *args, **kwargs)
class QuotaSetManager(base.ManagerWithFind): class QuotaSetManager(base.Manager):
resource_class = QuotaSet resource_class = QuotaSet
def get(self, tenant_id): def get(self, tenant_id):

View File

@@ -27,7 +27,7 @@ class VolumeBackupsRestore(base.Resource):
return "<VolumeBackupsRestore: %s>" % self.id return "<VolumeBackupsRestore: %s>" % self.id
class VolumeBackupRestoreManager(base.ManagerWithFind): class VolumeBackupRestoreManager(base.Manager):
"""Manage :class:`VolumeBackupsRestore` resources.""" """Manage :class:`VolumeBackupsRestore` resources."""
resource_class = VolumeBackupsRestore resource_class = VolumeBackupsRestore