diff options
| -rw-r--r-- | cinderclient/base.py | 89 | ||||
| -rw-r--r-- | cinderclient/tests/v1/test_limits.py | 24 | ||||
| -rw-r--r-- | cinderclient/tests/v1/test_services.py | 2 | ||||
| -rw-r--r-- | cinderclient/tests/v2/test_limits.py | 24 | ||||
| -rw-r--r-- | cinderclient/tests/v2/test_services.py | 2 |
5 files changed, 30 insertions, 111 deletions
diff --git a/cinderclient/base.py b/cinderclient/base.py index 280286c..5274f24 100644 --- a/cinderclient/base.py +++ b/cinderclient/base.py @@ -26,9 +26,13 @@ import os import six from cinderclient import exceptions +from cinderclient.openstack.common.apiclient import base as common_base from cinderclient import utils +Resource = common_base.Resource + + # Python 2.4 compat try: all @@ -215,88 +219,3 @@ class ManagerWithFind(six.with_metaclass(abc.ABCMeta, Manager)): continue return found - - -class Resource(object): - """ - A resource represents a particular instance of an object (server, flavor, - etc). This is pretty much just a bag for attributes. - - :param manager: Manager object - :param info: dictionary representing resource attributes - :param loaded: prevent lazy-loading if set to True - """ - HUMAN_ID = False - - def __init__(self, manager, info, loaded=False): - self.manager = manager - self._info = info - self._add_details(info) - self._loaded = loaded - - # NOTE(sirp): ensure `id` is already present because if it isn't we'll - # enter an infinite loop of __getattr__ -> get -> __init__ -> - # __getattr__ -> ... - if 'id' in self.__dict__ and len(str(self.id)) == 36: - self.manager.write_to_completion_cache('uuid', self.id) - - human_id = self.human_id - if human_id: - self.manager.write_to_completion_cache('human_id', human_id) - - @property - def human_id(self): - """Subclasses may override this provide a pretty ID which can be used - for bash completion. - """ - if 'name' in self.__dict__ and self.HUMAN_ID: - return utils.slugify(self.name) - return None - - def _add_details(self, info): - for (k, v) in six.iteritems(info): - try: - setattr(self, k, v) - except AttributeError: - # In this case we already defined the attribute on the class - pass - - def __getattr__(self, k): - if k not in self.__dict__: - #NOTE(bcwaldon): disallow lazy-loading if already loaded once - if not self.is_loaded(): - self.get() - return self.__getattr__(k) - - raise AttributeError(k) - else: - return self.__dict__[k] - - def __repr__(self): - reprkeys = sorted(k for k in self.__dict__ if k[0] != '_' - and k != 'manager') - info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys) - return "<%s %s>" % (self.__class__.__name__, info) - - def get(self): - # set_loaded() first ... so if we have to bail, we know we tried. - self.set_loaded(True) - if not hasattr(self.manager, 'get'): - return - - new = self.manager.get(self.id) - if new: - self._add_details(new._info) - - def __eq__(self, other): - if not isinstance(other, self.__class__): - return False - if hasattr(self, 'id') and hasattr(other, 'id'): - return self.id == other.id - return self._info == other._info - - def is_loaded(self): - return self._loaded - - def set_loaded(self, val): - self._loaded = val diff --git a/cinderclient/tests/v1/test_limits.py b/cinderclient/tests/v1/test_limits.py index b4520e3..06fd178 100644 --- a/cinderclient/tests/v1/test_limits.py +++ b/cinderclient/tests/v1/test_limits.py @@ -77,49 +77,49 @@ class TestLimits(utils.TestCase): l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2", "unit2", "next2") for item in l.rate: - self.assertTrue(item in [l1, l2]) + self.assertIn(item, [l1, l2]) class TestRateLimit(utils.TestCase): def test_equal(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit() - self.assertTrue(l1 == l2) + self.assertEqual(l1, l2) def test_not_equal_verbs(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(verb="verb2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_uris(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(uri="uri2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_regexps(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(regex="regex2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_values(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(value="value2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_remains(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(remain="remain2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_units(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(unit="unit2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_next_available(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(next_available="next2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_repr(self): l1 = _get_default_RateLimit() @@ -130,17 +130,17 @@ class TestAbsoluteLimit(utils.TestCase): def test_equal(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value1") - self.assertTrue(l1 == l2) + self.assertEqual(l1, l2) def test_not_equal_values(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_names(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name2", "value1") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_repr(self): l1 = limits.AbsoluteLimit("name1", "value1") diff --git a/cinderclient/tests/v1/test_services.py b/cinderclient/tests/v1/test_services.py index 6d855d3..1e44a53 100644 --- a/cinderclient/tests/v1/test_services.py +++ b/cinderclient/tests/v1/test_services.py @@ -71,5 +71,5 @@ class ServicesTest(utils.TestCase): values = {"host": "host1", 'binary': 'cinder-volume', "disabled_reason": "disable bad host"} cs.assert_called('PUT', '/os-services/disable-log-reason', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'disabled') diff --git a/cinderclient/tests/v2/test_limits.py b/cinderclient/tests/v2/test_limits.py index 92b50cd..c41d22c 100644 --- a/cinderclient/tests/v2/test_limits.py +++ b/cinderclient/tests/v2/test_limits.py @@ -77,49 +77,49 @@ class TestLimits(utils.TestCase): l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2", "unit2", "next2") for item in l.rate: - self.assertTrue(item in [l1, l2]) + self.assertIn(item, [l1, l2]) class TestRateLimit(utils.TestCase): def test_equal(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit() - self.assertTrue(l1 == l2) + self.assertEqual(l1, l2) def test_not_equal_verbs(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(verb="verb2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_uris(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(uri="uri2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_regexps(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(regex="regex2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_values(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(value="value2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_remains(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(remain="remain2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_units(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(unit="unit2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_next_available(self): l1 = _get_default_RateLimit() l2 = _get_default_RateLimit(next_available="next2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_repr(self): l1 = _get_default_RateLimit() @@ -130,17 +130,17 @@ class TestAbsoluteLimit(utils.TestCase): def test_equal(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value1") - self.assertTrue(l1 == l2) + self.assertEqual(l1, l2) def test_not_equal_values(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value2") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_not_equal_names(self): l1 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name2", "value1") - self.assertFalse(l1 == l2) + self.assertNotEqual(l1, l2) def test_repr(self): l1 = limits.AbsoluteLimit("name1", "value1") diff --git a/cinderclient/tests/v2/test_services.py b/cinderclient/tests/v2/test_services.py index 5d624dd..d0fe3d9 100644 --- a/cinderclient/tests/v2/test_services.py +++ b/cinderclient/tests/v2/test_services.py @@ -71,5 +71,5 @@ class ServicesTest(utils.TestCase): values = {"host": "host1", 'binary': 'cinder-volume', "disabled_reason": "disable bad host"} cs.assert_called('PUT', '/os-services/disable-log-reason', values) - self.assertTrue(isinstance(s, services.Service)) + self.assertIsInstance(s, services.Service) self.assertEqual(s.status, 'disabled') |