openstack/trove
Code Issues Proposed changes

Replace oslo.uuidutils module with trove.utils

Browse Source 
Oslo is removing uuidutils during the icehouse cycle.
Consequently we need to remove all references to uuidutils, and
replace them with the corresponding function from trove.utils.

Change-Id: Idd4b25e98624dfb6a25e275cac44a54324f50449
Closes-bug: 1253497
This commit is contained in:
Zhongyue Luo 2013-12-30 12:02:11 +08:00
parent 0aaaeb24d4
commit 1085ea267b
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack-common.conf
View File

@ -28,7 +28,6 @@ module=testutils
module=threadgroup
module=timeutils
module=utils
module=uuidutils
module=wsgi
# The base module to hold the copy of openstack.common

6
trove/datastore/models.py
View File

@ -18,9 +18,9 @@
from trove.common import cfg
from trove.common import exception
from trove.common import utils
from trove.db import models as dbmodels
from trove.db import get_db_api
from trove.openstack.common import uuidutils
CONF = cfg.CONF
@ -178,7 +178,7 @@ def update_datastore(name, manager, default_version):
except exception.ModelNotFoundError:
# Create a new one
datastore = DBDatastore()
datastore.id = uuidutils.generate_uuid()
datastore.id = utils.generate_uuid()
datastore.name = name
datastore.manager = manager
if default_version:
@ -194,7 +194,7 @@ def update_datastore_version(datastore, name, image_id, packages, active):
except exception.ModelNotFoundError:
# Create a new one
version = DBDatastoreVersion()
version.id = uuidutils.generate_uuid()
version.id = utils.generate_uuid()
version.name = name
version.datastore_id = datastore.id
version.image_id = image_id

39
trove/openstack/common/uuidutils.py
View File

@ -1,39 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright (c) 2012 Intel Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
UUID related utilities and helper functions.
"""
import uuid
def generate_uuid():
return str(uuid.uuid4())
def is_uuid_like(val):
"""Returns validation of a value as a UUID.
For our purposes, a UUID is a canonical form string:
aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
"""
try:
return str(uuid.UUID(val)) == val
except (TypeError, ValueError, AttributeError):
return False