From e92a2033a2e3326a861361f1cf221eccf62d4c1e Mon Sep 17 00:00:00 2001 From: Luong Anh Tuan Date: Mon, 5 Dec 2016 11:42:51 +0700 Subject: [PATCH] Replaces uuid.uuid4 with uuidutils.generate_uuid() Openstack common has a wrapper for generating uuids.We should use that function when generating uuids for consistency. Change-Id: Ie3b9c10d8cab332d51b49d8a9b41283d3ef36b7a Closes-Bug: #1082248 --- oslo_cache/tests/test_cache.py | 14 ++-- oslo_cache/tests/test_cache_backend_mongo.py | 78 ++++++++++---------- 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/oslo_cache/tests/test_cache.py b/oslo_cache/tests/test_cache.py index 2294e8e1..53f238e6 100644 --- a/oslo_cache/tests/test_cache.py +++ b/oslo_cache/tests/test_cache.py @@ -15,12 +15,12 @@ import copy import time -import uuid from dogpile.cache import proxy import mock from oslo_config import cfg from oslo_config import fixture as config_fixture +from oslo_utils import uuidutils from oslotest import base from oslo_cache import _opts @@ -29,8 +29,8 @@ from oslo_cache import exception NO_VALUE = cache.NO_VALUE -TEST_GROUP = uuid.uuid4().hex -TEST_GROUP2 = uuid.uuid4().hex +TEST_GROUP = uuidutils.generate_uuid(dashed=False) +TEST_GROUP2 = uuidutils.generate_uuid(dashed=False) class BaseTestCase(base.BaseTestCase): @@ -135,7 +135,8 @@ class CacheRegionTest(BaseTestCase): self.assertEqual(value.value, cached_value.value) self.assertEqual(cached_value.value, test_obj.test_value.value) # Change the underlying value on the test object. - test_obj.test_value = TestProxyValue(uuid.uuid4().hex) + test_obj.test_value = TestProxyValue( + uuidutils.generate_uuid(dashed=False)) self.assertEqual(cached_value.value, test_obj.get_test_value().value) # override the system time to ensure the non-cached new value @@ -163,7 +164,7 @@ class CacheRegionTest(BaseTestCase): # Run the test with the dummy group cache_time value self.config_fixture.config(cache_time=cache_time, group=TEST_GROUP) - test_value = TestProxyValue(uuid.uuid4().hex) + test_value = TestProxyValue(uuidutils.generate_uuid(dashed=False)) self.assertEqual(cache_time, expiration_time()) do_test(value=test_value) @@ -179,7 +180,8 @@ class CacheRegionTest(BaseTestCase): # Run the test with the dummy group cache_time value set to None and # the global value set. self.config_fixture.config(cache_time=None, group=TEST_GROUP) - test_value = TestProxyValue(uuid.uuid4().hex) + test_value = TestProxyValue( + uuidutils.generate_uuid(dashed=False)) self.assertIsNone(expiration_time()) do_test(value=test_value) diff --git a/oslo_cache/tests/test_cache_backend_mongo.py b/oslo_cache/tests/test_cache_backend_mongo.py index fcedd081..90237846 100644 --- a/oslo_cache/tests/test_cache_backend_mongo.py +++ b/oslo_cache/tests/test_cache_backend_mongo.py @@ -15,9 +15,9 @@ import collections import copy import functools -import uuid from dogpile.cache import region as dp_region +from oslo_utils import uuidutils import six from six.moves import range @@ -177,7 +177,7 @@ class MockCollection(object): def _insert(self, data): if '_id' not in data: - data['_id'] = uuid.uuid4().hex + data['_id'] = uuidutils.generate_uuid(dashed=False) object_id = data['_id'] self._documents[object_id] = self._internalize_dict(data) return object_id @@ -213,7 +213,7 @@ class MockCollection(object): del self._documents[doc_id] return { - "connectionId": uuid.uuid4().hex, + "connectionId": uuidutils.generate_uuid(dashed=False), "n": len(to_delete), "ok": 1.0, "err": None, @@ -327,7 +327,7 @@ class MongoCache(test_cache.BaseTestCase): region = dp_region.make_region().configure('oslo_cache.mongo', arguments=self.arguments) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue10") # There is no proxy so can access MongoCacheBackend directly self.assertEqual(1, region.backend.api.w) @@ -340,7 +340,7 @@ class MongoCache(test_cache.BaseTestCase): # still be string and NOT enum self.assertEqual('inValidValue', region.backend.api.read_preference) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) self.assertRaises(ValueError, region.set, random_key, "dummyValue10") @@ -353,7 +353,7 @@ class MongoCache(test_cache.BaseTestCase): self.assertEqual('secondaryPreferred', region.backend.api.read_preference) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue10") # Now as pymongo is loaded so expected read_preference value is enum. @@ -414,7 +414,7 @@ class MongoCache(test_cache.BaseTestCase): # Should be None because of delayed initialization self.assertIsNone(region1.backend.api._data_manipulator) - random_key1 = uuid.uuid4().hex + random_key1 = uuidutils.generate_uuid(dashed=False) region1.set(random_key1, "dummyValue10") self.assertEqual("dummyValue10", region1.get(random_key1)) # Now should have initialized @@ -437,7 +437,7 @@ class MongoCache(test_cache.BaseTestCase): # Should be None because of delayed initialization self.assertIsNone(region2.backend.api._data_manipulator) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region2.set(random_key, "dummyValue20") self.assertEqual("dummyValue20", region2.get(random_key)) # Now should have initialized @@ -462,7 +462,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) # should return NO_VALUE as key does not exist in cache self.assertEqual(NO_VALUE, region.get(random_key)) @@ -473,7 +473,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue") self.assertEqual("dummyValue", region.get(random_key)) @@ -483,7 +483,7 @@ class MongoCache(test_cache.BaseTestCase): region = dp_region.make_region().configure('oslo_cache.mongo', arguments=self.arguments) self.assertEqual(3600, region.backend.api.ttl_seconds) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue") self.assertEqual("dummyValue", region.get(random_key)) @@ -493,7 +493,7 @@ class MongoCache(test_cache.BaseTestCase): region = dp_region.make_region().configure('oslo_cache.mongo', arguments=self.arguments) self.assertEqual(1800, region.backend.api.ttl_seconds) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue") self.assertEqual("dummyValue", region.get(random_key)) @@ -504,7 +504,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, None) self.assertIsNone(region.get(random_key)) @@ -515,7 +515,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "") self.assertEqual("", region.get(random_key)) @@ -526,7 +526,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue") self.assertEqual("dummyValue", region.get(random_key)) @@ -543,10 +543,10 @@ class MongoCache(test_cache.BaseTestCase): 'oslo_cache.mongo', arguments=self.arguments ) - random_key = uuid.uuid4().hex - random_key1 = uuid.uuid4().hex - random_key2 = uuid.uuid4().hex - random_key3 = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) + random_key1 = uuidutils.generate_uuid(dashed=False) + random_key2 = uuidutils.generate_uuid(dashed=False) + random_key3 = uuidutils.generate_uuid(dashed=False) mapping = {random_key1: 'dummyValue1', random_key2: 'dummyValue2', random_key3: 'dummyValue3'} @@ -564,10 +564,10 @@ class MongoCache(test_cache.BaseTestCase): 'oslo_cache.mongo', arguments=self.arguments ) - random_key = uuid.uuid4().hex - random_key1 = uuid.uuid4().hex - random_key2 = uuid.uuid4().hex - random_key3 = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) + random_key1 = uuidutils.generate_uuid(dashed=False) + random_key2 = uuidutils.generate_uuid(dashed=False) + random_key3 = uuidutils.generate_uuid(dashed=False) mapping = {random_key1: 'dummyValue1', random_key2: '', random_key3: 'dummyValue3'} @@ -587,10 +587,10 @@ class MongoCache(test_cache.BaseTestCase): 'oslo_cache.mongo', arguments=self.arguments ) - random_key = uuid.uuid4().hex - random_key1 = uuid.uuid4().hex - random_key2 = uuid.uuid4().hex - random_key3 = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) + random_key1 = uuidutils.generate_uuid(dashed=False) + random_key2 = uuidutils.generate_uuid(dashed=False) + random_key3 = uuidutils.generate_uuid(dashed=False) mapping = {random_key1: 'dummyValue1', random_key2: 'dummyValue2', random_key3: 'dummyValue3'} @@ -615,11 +615,11 @@ class MongoCache(test_cache.BaseTestCase): 'oslo_cache.mongo', arguments=self.arguments ) - random_key = uuid.uuid4().hex - random_key1 = uuid.uuid4().hex - random_key2 = uuid.uuid4().hex - random_key3 = uuid.uuid4().hex - random_key4 = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) + random_key1 = uuidutils.generate_uuid(dashed=False) + random_key2 = uuidutils.generate_uuid(dashed=False) + random_key3 = uuidutils.generate_uuid(dashed=False) + random_key4 = uuidutils.generate_uuid(dashed=False) mapping = {random_key1: 'dummyValue1', random_key2: None, random_key3: '', @@ -657,7 +657,7 @@ class MongoCache(test_cache.BaseTestCase): arguments=self.arguments ) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue") self.assertEqual("dummyValue", region.get(random_key)) @@ -671,10 +671,10 @@ class MongoCache(test_cache.BaseTestCase): 'oslo_cache.mongo', arguments=self.arguments ) - random_key = uuid.uuid4().hex - random_key1 = uuid.uuid4().hex - random_key2 = uuid.uuid4().hex - random_key3 = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) + random_key1 = uuidutils.generate_uuid(dashed=False) + random_key2 = uuidutils.generate_uuid(dashed=False) + random_key3 = uuidutils.generate_uuid(dashed=False) mapping = {random_key1: 'dummyValue1', random_key2: 'dummyValue2', random_key3: 'dummyValue3'} @@ -715,13 +715,13 @@ class MongoCache(test_cache.BaseTestCase): self.assertEqual(True, api_methargs['continue_on_error']) self.assertEqual(60, api_methargs['secondary_acceptable_latency_ms']) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue1") self.assertEqual("dummyValue1", region.get(random_key)) region.set(random_key, "dummyValue2") self.assertEqual("dummyValue2", region.get(random_key)) - random_key = uuid.uuid4().hex + random_key = uuidutils.generate_uuid(dashed=False) region.set(random_key, "dummyValue3") self.assertEqual("dummyValue3", region.get(random_key))