diff --git a/nova/cache_utils.py b/nova/cache_utils.py index 6a5bd4418ae1..1892e93f75f2 100644 --- a/nova/cache_utils.py +++ b/nova/cache_utils.py @@ -109,22 +109,8 @@ class CacheClient(object): return None return value - def get_or_create(self, key, creator): - return self.region.get_or_create(key, creator) - def set(self, key, value): return self.region.set(key, value) - def add(self, key, value): - return self.region.get_or_create(key, lambda: value) - def delete(self, key): return self.region.delete(key) - - def get_multi(self, keys): - values = self.region.get_multi(keys) - return [None if value is cache.NO_VALUE else value for value in - values] - - def delete_multi(self, keys): - return self.region.delete_multi(keys) diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py index 7e52aea5a582..87960f49ad58 100644 --- a/nova/tests/unit/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -11644,7 +11644,8 @@ class ComputeAPIAggrTestCase(BaseTestCase): 'foo_key2': 'foo_value2', 'availability_zone': 'fake_zone'} fake_notifier.NOTIFICATIONS = [] - availability_zones._get_cache().add('fake_key', 'fake_value') + availability_zones._get_cache().region.get_or_create( + 'fake_ky', lambda: 'fake_value') aggr = self.api.update_aggregate_metadata(self.context, aggr.id, metadata) self.assertIsNone(availability_zones._get_cache().get('fake_key')) diff --git a/nova/tests/unit/test_availability_zones.py b/nova/tests/unit/test_availability_zones.py index 020b7188a8cb..94cbca9fc37a 100644 --- a/nova/tests/unit/test_availability_zones.py +++ b/nova/tests/unit/test_availability_zones.py @@ -78,7 +78,7 @@ class AvailabilityZoneTestCases(test.TestCase): aggregate.delete_host(service['host']) def test_rest_availability_zone_reset_cache(self): - az._get_cache().add('cache', 'fake_value') + az._get_cache().region.get_or_create('cache', lambda: 'fake_value') az.reset_cache() self.assertIsNone(az._get_cache().get('cache'))