Remove use of uuidutils.generate_uuid

Oslo is removing uuidutils.generate_uuid() during the icehouse cycle.
This patch moves generate_uuid to designate.utils.

Change-Id: I65c6d8e0d985c67f43682e9f3ae80997ee96d0f7
Partial-Bug: #1253497

10 files changed, 38 insertions, 26 deletions

diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
index 5c9f6413..01bf1868 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
@@ -19,7 +19,7 @@
 from sqlalchemy import ForeignKey, Enum, Integer, String, DateTime, Text
 from sqlalchemy.schema import Column, MetaData
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.storage.impl_sqlalchemy.migrate_repo.utils import Table
 from designate.storage.impl_sqlalchemy.migrate_repo.utils import create_tables
 from designate.storage.impl_sqlalchemy.migrate_repo.utils import drop_tables
@@ -31,7 +31,8 @@ meta = MetaData()
 RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'NS']
 
 servers = Table('servers', meta,
-                Column('id', UUID(), default=generate_uuid, primary_key=True),
+                Column('id', UUID(), default=utils.generate_uuid,
+                       primary_key=True),
                 Column('created_at', DateTime(), default=timeutils.utcnow),
                 Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
                 Column('version', Integer(), default=1, nullable=False),
@@ -40,7 +41,8 @@ servers = Table('servers', meta,
                 Column('ipv6', Inet(), default=None, unique=True))
 
 domains = Table('domains', meta,
-                Column('id', UUID(), default=generate_uuid, primary_key=True),
+                Column('id', UUID(), default=utils.generate_uuid,
+                       primary_key=True),
                 Column('created_at', DateTime(), default=timeutils.utcnow),
                 Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
                 Column('version', Integer(), default=1, nullable=False),
@@ -54,7 +56,8 @@ domains = Table('domains', meta,
                 Column('minimum', Integer(), default=3600, nullable=False))
 
 records = Table('records', meta,
-                Column('id', UUID(), default=generate_uuid, primary_key=True),
+                Column('id', UUID(), default=utils.generate_uuid,
+                       primary_key=True),
                 Column('created_at', DateTime(), default=timeutils.utcnow),
                 Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
                 Column('version', Integer(), default=1, nullable=False),
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
index cdef7c73..85895d17 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
@@ -16,7 +16,7 @@
 from sqlalchemy import Enum, Integer, String, DateTime
 from sqlalchemy.schema import Table, Column, MetaData
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.sqlalchemy.types import UUID
 
 
@@ -26,7 +26,8 @@ TSIG_ALGORITHMS = ['hmac-md5', 'hmac-sha1', 'hmac-sha224', 'hmac-sha256',
                    'hmac-sha384', 'hmac-sha512']
 
 tsigkeys = Table('tsigkeys', meta,
-                 Column('id', UUID(), default=generate_uuid, primary_key=True),
+                 Column('id', UUID(), default=utils.generate_uuid,
+                        primary_key=True),
                  Column('created_at', DateTime(), default=timeutils.utcnow),
                  Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
                  Column('version', Integer(), default=1, nullable=False),
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
index bb7b810d..b2125304 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
@@ -16,14 +16,15 @@
 from sqlalchemy import Integer, String, DateTime, UniqueConstraint
 from sqlalchemy.schema import Table, Column, MetaData
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.sqlalchemy.types import UUID
 
 
 meta = MetaData()
 
 quotas = Table('quotas', meta,
-               Column('id', UUID(), default=generate_uuid, primary_key=True),
+               Column('id', UUID(), default=utils.generate_uuid,
+                      primary_key=True),
                Column('created_at', DateTime(), default=timeutils.utcnow),
                Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
                Column('version', Integer(), default=1, nullable=False),
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
index 3652b0df..240baffe 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
@@ -21,7 +21,7 @@ from sqlalchemy.schema import Table, Column, MetaData
 from migrate import ForeignKeyConstraint
 from migrate.changeset.constraint import UniqueConstraint
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.sqlalchemy.types import UUID
 
 
@@ -34,7 +34,7 @@ recordsets_table = Table(
     'recordsets',
     meta,
 
-    Column('id', UUID(), default=generate_uuid, primary_key=True),
+    Column('id', UUID(), default=utils.generate_uuid, primary_key=True),
     Column('created_at', DateTime(), default=timeutils.utcnow),
     Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
     Column('version', Integer(), default=1, nullable=False),
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
index 4947496b..9a4db2f3 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
@@ -15,7 +15,7 @@
 from sqlalchemy import Integer, String, DateTime, Unicode
 from sqlalchemy.schema import Table, Column, MetaData
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.sqlalchemy.types import UUID
 from designate.openstack.common import log as logging
 
@@ -26,7 +26,7 @@ tlds_table = Table(
     'tlds',
     meta,
 
-    Column('id', UUID(), default=generate_uuid, primary_key=True),
+    Column('id', UUID(), default=utils.generate_uuid, primary_key=True),
     Column('created_at', DateTime(), default=timeutils.utcnow),
     Column('updated_at', DateTime(), onupdate=timeutils.utcnow),
     Column('version', Integer(), default=1, nullable=False),
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
index 3d1a7146..cddd7175 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
@@ -17,7 +17,7 @@
 from sqlalchemy import Integer, String, DateTime
 from sqlalchemy.schema import Table, Column, MetaData
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
+from designate import utils
 from designate.sqlalchemy.types import UUID
 
 meta = MetaData()
@@ -25,7 +25,7 @@ meta = MetaData()
 blacklists = Table(
     'blacklists',
     meta,
-    Column('id', UUID(), default=generate_uuid,
+    Column('id', UUID(), default=utils.generate_uuid,
            primary_key=True),
     Column('created_at', DateTime(),
            default=timeutils.utcnow),
diff --git a/designate/storage/impl_sqlalchemy/models.py b/designate/storage/impl_sqlalchemy/models.py
index a71c6112..ef5c7f58 100644
--- a/designate/storage/impl_sqlalchemy/models.py
+++ b/designate/storage/impl_sqlalchemy/models.py
@@ -22,10 +22,10 @@ from sqlalchemy import (Column, DateTime, String, Text, Integer, ForeignKey,
 from sqlalchemy.orm import relationship, backref
 from designate.openstack.common import log as logging
 from designate.openstack.common import timeutils
-from designate.openstack.common.uuidutils import generate_uuid
 from designate.sqlalchemy.types import UUID
 from designate.sqlalchemy.models import Base as CommonBase
 from designate.sqlalchemy.models import SoftDeleteMixin
+from designate import utils
 from sqlalchemy.ext.declarative import declarative_base
 
 LOG = logging.getLogger(__name__)
@@ -39,7 +39,7 @@ TSIG_ALGORITHMS = ['hmac-md5', 'hmac-sha1', 'hmac-sha224', 'hmac-sha256',
 
 
 class Base(CommonBase):
-    id = Column(UUID, default=generate_uuid, primary_key=True)
+    id = Column(UUID, default=utils.generate_uuid, primary_key=True)
     version = Column(Integer, default=1, nullable=False)
     created_at = Column(DateTime, default=timeutils.utcnow)
     updated_at = Column(DateTime, onupdate=timeutils.utcnow)
diff --git a/designate/tests/__init__.py b/designate/tests/__init__.py
index 721bccc2..5bbb5737 100644
--- a/designate/tests/__init__.py
+++ b/designate/tests/__init__.py
@@ -30,7 +30,7 @@ from designate.openstack.common.fixture import config
 from designate.openstack.common import importutils
 from designate.openstack.common import policy
 from designate.openstack.common import test
-from designate.openstack.common import uuidutils
+from designate import utils
 from designate.context import DesignateContext
 from designate.tests import resources
 from designate import exceptions
@@ -328,8 +328,8 @@ class TestCase(test.BaseTestCase):
 
     def get_admin_context(self):
         return DesignateContext.get_admin_context(
-            tenant=uuidutils.generate_uuid(),
-            user=uuidutils.generate_uuid())
+            tenant=utils.generate_uuid(),
+            user=utils.generate_uuid())
 
     # Fixture methods
     def get_quota_fixture(self, fixture=0, values={}):
diff --git a/designate/tests/test_backend/test_powerdns.py b/designate/tests/test_backend/test_powerdns.py
index 8bc1325c..e82d65e7 100644
--- a/designate/tests/test_backend/test_powerdns.py
+++ b/designate/tests/test_backend/test_powerdns.py
@@ -20,7 +20,7 @@ from mock import MagicMock
 from designate import tests
 from designate.tests import DatabaseFixture
 from designate.tests.test_backend import BackendTestMixin
-from designate.openstack.common import uuidutils
+from designate import utils
 
 # impl_powerdns needs to register its options before being instanciated.
 # Import it and pretend to use it to avoid flake8 unused import errors.
@@ -38,21 +38,21 @@ class PowerDNSBackendTestCase(tests.TestCase, BackendTestMixin):
     def get_tsigkey_fixture(self):
         return super(PowerDNSBackendTestCase, self).get_tsigkey_fixture(
             values={
-                'id': uuidutils.generate_uuid()
+                'id': utils.generate_uuid()
             }
         )
 
     def get_server_fixture(self):
         return super(PowerDNSBackendTestCase, self).get_server_fixture(
             values={
-                'id': uuidutils.generate_uuid()
+                'id': utils.generate_uuid()
             }
         )
 
     def get_domain_fixture(self):
         return super(PowerDNSBackendTestCase, self).get_domain_fixture(
             values={
-                'id': uuidutils.generate_uuid(),
+                'id': utils.generate_uuid(),
                 'ttl': 42,
                 'serial': 42,
                 'refresh': 42,
diff --git a/designate/utils.py b/designate/utils.py
index 247c4f51..fa7571b7 100644
--- a/designate/utils.py
+++ b/designate/utils.py
@@ -14,15 +14,18 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import copy
+import json
 import os
 import pkg_resources
-import json
+import uuid
+
 from jinja2 import Template
-from designate.openstack.common import log as logging
 from oslo.config import cfg
+
+from designate import exceptions
+from designate.openstack.common import log as logging
 from designate.openstack.common import processutils
 from designate.openstack.common import timeutils
-from designate import exceptions
 
 LOG = logging.getLogger(__name__)
 
@@ -229,3 +232,7 @@ def deep_dict_merge(a, b):
             result[k] = copy.deepcopy(v)
 
     return result
+
+
+def generate_uuid():
+    return str(uuid.uuid4())