openstack
/
heat
Code Issues Proposed changes

Use uuidutils from openstack-common 

Change-Id: I6fdd1bf59562a3dbef96da8d30c2733a801acd58
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-11-30 15:47:56 +01:00
parent 04fe836b82
commit c985e79960
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/context.py
View File

@ -18,12 +18,12 @@ from heat.common import exception
from heat.common import wsgi from heat.common import wsgi
from heat.openstack.common import cfg from heat.openstack.common import cfg
from heat.openstack.common import importutils 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 from heat.db import api as db_api
def generate_request_id(): def generate_request_id():
return 'req-' + str(heat_utils.gen_uuid()) return 'req-' + uuidutils.generate_uuid()
class RequestContext(object): class RequestContext(object):

4
heat/db/sqlalchemy/migrate_repo/versions/012_stack_id_uuid.py
View File

@ -1,6 +1,6 @@
from sqlalchemy import * from sqlalchemy import *
from migrate import * from migrate import *
from heat.common import utils from heat.openstack.common import uuidutils
def upgrade(migrate_engine): def upgrade(migrate_engine):
@ -28,7 +28,7 @@ def upgrade(migrate_engine):
name=fkey_name).drop() name=fkey_name).drop()
stack.c.id.alter(String(36), primary_key=True, 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) event.c.stack_id.alter(String(36), nullable=False)
resource.c.stack_id.alter(String(36), nullable=False) resource.c.stack_id.alter(String(36), nullable=False)

4
heat/db/sqlalchemy/models.py
View File

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

3
heat/engine/service.py
View File

@ -30,6 +30,7 @@ from heat.openstack.common import log as logging
from heat.openstack.common import threadgroup from heat.openstack.common import threadgroup
from heat.openstack.common.gettextutils import _ from heat.openstack.common.gettextutils import _
from heat.openstack.common.rpc import service from heat.openstack.common.rpc import service
from heat.openstack.common import uuidutils
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -110,7 +111,7 @@ class EngineService(service.Service):
arg1 -> RPC context. arg1 -> RPC context.
arg2 -> Name or UUID of the stack to look up. 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) s = db_api.stack_get(context, stack_name)
else: else:
s = db_api.stack_get_by_name(context, stack_name) s = db_api.stack_get_by_name(context, stack_name)