Use uuidutils from openstack-common

Change-Id: I6fdd1bf59562a3dbef96da8d30c2733a801acd58
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/common/context.py b/heat/common/context.py
index 51488934f50776129bcd37b186bcfe4c7706cd63..70f3f7ecb0b699a83a4bafc2933eef28a1c4e29f 100644 (file)
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -18,12 +18,12 @@ from heat.common import exception
 from heat.common import wsgi
 from heat.openstack.common import cfg
 from heat.openstack.common import importutils
-from heat.common import utils as heat_utils
+from heat.openstack.common import uuidutils
 from heat.db import api as db_api
 
 
 def generate_request_id():
-    return 'req-' + str(heat_utils.gen_uuid())
+    return 'req-' + uuidutils.generate_uuid()
 
 
 class RequestContext(object):

diff --git a/heat/db/sqlalchemy/migrate_repo/versions/012_stack_id_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/012_stack_id_uuid.py
index b406e4b55e2613868c71370c196e90cb5995c2f4..e87e7f1c1e5bb627db3a1d68f9ffe60e4cebd003 100644 (file)
--- a/heat/db/sqlalchemy/migrate_repo/versions/012_stack_id_uuid.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/012_stack_id_uuid.py
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from migrate import *
-from heat.common import utils
+from heat.openstack.common import uuidutils
 
 
 def upgrade(migrate_engine):
@@ -28,7 +28,7 @@ def upgrade(migrate_engine):
                                  name=fkey_name).drop()
 
     stack.c.id.alter(String(36), primary_key=True,
-        default=utils.generate_uuid)
+        default=uuidutils.generate_uuid)
     event.c.stack_id.alter(String(36), nullable=False)
     resource.c.stack_id.alter(String(36), nullable=False)
 

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 2d6d7790df403aeab7f9cc0c6a27b77669392874..125e4bbd842d8a88314c6661ba42ea8f057bb7a7 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -21,7 +21,7 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import types as types
 from json import dumps, loads
-from heat.common import utils
+from heat.openstack.common import uuidutils
 from heat.openstack.common import timeutils
 from heat.db.sqlalchemy.session import get_session
 from sqlalchemy.orm.session import Session
@@ -145,7 +145,7 @@ class Stack(BASE, HeatBase):
     __tablename__ = 'stack'
 
     id = Column(String, primary_key=True,
-        default=utils.generate_uuid)
+        default=uuidutils.generate_uuid)
     name = Column(String)
     raw_template_id = Column(Integer, ForeignKey('raw_template.id'),
                             nullable=False)

diff --git a/heat/engine/service.py b/heat/engine/service.py
index d4256b7553975de685676c255220bd512d834667..adaa4c93648893c589bb5c50e5e945f2623c881d 100644 (file)
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -30,6 +30,7 @@ from heat.openstack.common import log as logging
 from heat.openstack.common import threadgroup
 from heat.openstack.common.gettextutils import _
 from heat.openstack.common.rpc import service
+from heat.openstack.common import uuidutils
 
 
 logger = logging.getLogger(__name__)
@@ -110,7 +111,7 @@ class EngineService(service.Service):
         arg1 -> RPC context.
         arg2 -> Name or UUID of the stack to look up.
         """
-        if identifier.HeatIdentifier.is_uuid(stack_name):
+        if uuidutils.is_uuid_like(stack_name):
             s = db_api.stack_get(context, stack_name)
         else:
             s = db_api.stack_get_by_name(context, stack_name)