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: I839aef8095960ebe00e6e7992c5415b7d7dfa3d9
Closes-Bug: #1082248

panko/api/app.py

@@ -14,10 +14,10 @@
 # under the License.
 
 import os
-import uuid
 
 from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import uuidutils
 from paste import deploy
 import pecan
 
@@ -79,7 +79,7 @@ def load_app(conf):
     if not cfg_file:
         raise cfg.ConfigFilesNotFoundError([conf.api_paste_config])
 
-    configkey = str(uuid.uuid4())
+    configkey = uuidutils.generate_uuid()
     APPCONFIGS[configkey] = conf
 
     LOG.info("Full WSGI config used: %s" % cfg_file)

panko/tests/db.py

@@ -16,11 +16,11 @@
 
 """Base classes for API tests."""
 import os
-import uuid
 import warnings
 
 import fixtures
 import mock
+from oslo_utils import uuidutils
 from oslotest import mockpatch
 import six
 from six.moves.urllib import parse as urlparse
@@ -58,13 +58,13 @@ class MongoDbManager(fixtures.Fixture):
     def url(self):
         return '%(url)s_%(db)s' % {
             'url': self._url,
-            'db': uuid.uuid4().hex
+            'db': uuidutils.generate_uuid(dashed=False)
         }
 
 
 class SQLManager(fixtures.Fixture):
     def __init__(self, url, conf):
-        db_name = 'panko_%s' % uuid.uuid4().hex
+        db_name = 'panko_%s' % uuidutils.generate_uuid(dashed=False)
         engine = sqlalchemy.create_engine(url)
         conn = engine.connect()
         self._create_database(conn, db_name)
@@ -104,7 +104,8 @@ class ElasticSearchManager(fixtures.Fixture):
         self.event_connection = storage.get_connection(
             self.url, self.conf)
         # prefix each test with unique index name
-        self.event_connection.index_name = 'events_%s' % uuid.uuid4().hex
+        inx_uuid = uuidutils.generate_uuid(dashed=False)
+        self.event_connection.index_name = 'events_%s' % inx_uuid
         # force index on write so data is queryable right away
         self.event_connection._refresh_on_write = True
 
@@ -120,7 +121,7 @@ class HBaseManager(fixtures.Fixture):
             self.url, self.conf)
         # Unique prefix for each test to keep data is distinguished because
         # all test data is stored in one table
-        data_prefix = str(uuid.uuid4().hex)
+        data_prefix = uuidutils.generate_uuid(dashed=False)
 
         def table(conn, name):
             return mocks.MockHBaseTable(name, conn, data_prefix)

panko/tests/functional/api/v2/test_acl_scenarios.py

@@ -16,10 +16,10 @@
 
 import datetime
 import os
-import uuid
 
 from keystonemiddleware import fixture as ksm_fixture
 from oslo_utils import fileutils
+from oslo_utils import uuidutils
 import six
 import webtest
 
@@ -27,8 +27,8 @@ from panko.api import app
 from panko.event.storage import models as ev_model
 from panko.tests.functional.api import v2
 
-VALID_TOKEN = uuid.uuid4().hex
+VALID_TOKEN = uuidutils.generate_uuid(dashed=False)
-VALID_TOKEN2 = uuid.uuid4().hex
+VALID_TOKEN2 = uuidutils.generate_uuid(dashed=False)
 
 
 class TestAPIACL(v2.FunctionalTest):
@@ -89,7 +89,7 @@ class TestBaseApiEventRBAC(v2.FunctionalTest):
         super(TestBaseApiEventRBAC, self).setUp()
         traits = [ev_model.Trait('project_id', 1, 'project-good'),
                   ev_model.Trait('user_id', 1, 'user-good')]
-        self.message_id = str(uuid.uuid4())
+        self.message_id = uuidutils.generate_uuid()
         ev = ev_model.Event(self.message_id, 'event_type',
                             datetime.datetime.now(), traits, {})
         self.event_conn.record_events([ev])

panko/tests/functional/api/v2/test_event_scenarios.py

@@ -15,17 +15,17 @@
 """Test event, event_type and trait retrieval."""
 
 import datetime
-import uuid
 
 from oslo_serialization import jsonutils
+from oslo_utils import uuidutils
 import webtest.app
 
 from panko.event.storage import models
 from panko.tests import db as tests_db
 from panko.tests.functional.api import v2
 
-USER_ID = uuid.uuid4().hex
+USER_ID = uuidutils.generate_uuid(dashed=False)
-PROJ_ID = uuid.uuid4().hex
+PROJ_ID = uuidutils.generate_uuid(dashed=False)
 HEADERS = {"X-Roles": "admin",
            "X-User-Id": USER_ID,
            "X-Project-Id": PROJ_ID}
@@ -527,10 +527,10 @@ class AclRestrictedEventTestBase(v2.FunctionalTest):
 
     def setUp(self):
         super(AclRestrictedEventTestBase, self).setUp()
-        self.admin_user_id = uuid.uuid4().hex
+        self.admin_user_id = uuidutils.generate_uuid(dashed=False)
-        self.admin_proj_id = uuid.uuid4().hex
+        self.admin_proj_id = uuidutils.generate_uuid(dashed=False)
-        self.user_id = uuid.uuid4().hex
+        self.user_id = uuidutils.generate_uuid(dashed=False)
-        self.proj_id = uuid.uuid4().hex
+        self.proj_id = uuidutils.generate_uuid(dashed=False)
         self._generate_models()
 
     def _generate_models(self):
@@ -676,7 +676,7 @@ class EventRestrictionTestBase(v2.FunctionalTest):
                                     self.trait_time)]]
 
             event_models.append(
-                models.Event(message_id=str(uuid.uuid4()),
+                models.Event(message_id=uuidutils.generate_uuid(),
                              event_type='foo.bar',
                              generated=self.trait_time,
                              traits=trait_models,

panko/tests/functional/gabbi/fixtures.py

@@ -18,12 +18,12 @@
 import datetime
 import os
 from unittest import case
-import uuid
 
 from gabbi import fixture
 from oslo_config import cfg
 from oslo_policy import opts
 from oslo_utils import fileutils
+from oslo_utils import uuidutils
 import six
 from six.moves.urllib import parse as urlparse
 import sqlalchemy_utils
@@ -80,7 +80,7 @@ class ConfigFixture(fixture.GabbiFixture):
         )
 
         parsed_url = list(urlparse.urlparse(db_url))
-        parsed_url[2] += '-%s' % str(uuid.uuid4()).replace('-', '')
+        parsed_url[2] += '-%s' % uuidutils.generate_uuid(dashed=False)
         db_url = urlparse.urlunparse(parsed_url)
 
         conf.set_override('connection', db_url, group='database')

panko/tests/unit/dispatcher/test_db.py

@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import datetime
-import uuid
 
 import mock
+from oslo_utils import uuidutils
 from oslotest import base
 
 from panko.dispatcher import database
@@ -34,7 +34,7 @@ class TestDispatcherDB(base.BaseTestCase):
             self.dispatcher = database.DatabaseDispatcher(None)
 
     def test_event_conn(self):
-        event = event_models.Event(uuid.uuid4(), 'test',
+        event = event_models.Event(uuidutils.generate_uuid(), 'test',
                                    datetime.datetime(2012, 7, 2, 13, 53, 40),
                                    [], {}).serialize()
         with mock.patch.object(self.dispatcher.event_conn,

tools/make_test_event_data.py

@@ -24,9 +24,9 @@ source .tox/py27/bin/activate
 import argparse
 import datetime
 import random
-import uuid
 
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from panko.event.storage import models
 from panko import service
@@ -51,11 +51,11 @@ def make_test_data(conn, start, end, interval, event_types):
     while timestamp <= end:
         data = []
         for i in range(event_types):
-            traits = [models.Trait('id1_%d' % i, 1, str(uuid.uuid4())),
+            traits = [models.Trait('id1_%d' % i, 1, uuidutils.generate_uuid()),
                       models.Trait('id2_%d' % i, 2, random.randint(1, 10)),
                       models.Trait('id3_%d' % i, 3, random.random()),
                       models.Trait('id4_%d' % i, 4, timestamp)]
-            data.append(models.Event(str(uuid.uuid4()),
+            data.append(models.Event(uuidutils.generate_uuid(),
                                      'event_type%d' % i,
                                      timestamp,
                                      traits,