openstack/rally
Code Issues Proposed changes

Moved module "uuidutils" from oslo-incubator to oslo.utils

Browse Source 
Since uuidutils was moved from oslo-incubator
to oslo.utils we need to replace the obsolete module.

Co-Authored-By: Abhishek Chanda <abhishek@cloudscaling.com>

Change-Id: I87bad91900e503597d9806b423ff8ef7b0aacb00
Closes-Bug: #1402618
This commit is contained in:
fhubik 2014-12-15 18:06:52 +01:00 committed by Abhishek Chanda
parent b8a416a71d
commit 252538ba17
3 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack-common.conf
View File

@ -3,7 +3,6 @@
# The list of modules to copy from oslo-incubator.git # The list of modules to copy from oslo-incubator.git
module=cliutils module=cliutils
module=log module=log
module=uuidutils
module=service module=service
module=periodic_task module=periodic_task

3
rally/benchmark/scenarios/neutron/utils.py
View File

@ -13,10 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo.utils import uuidutils as uid
from rally.benchmark.scenarios import base from rally.benchmark.scenarios import base
from rally.benchmark.wrappers import network as network_wrapper from rally.benchmark.wrappers import network as network_wrapper
from rally import log as logging from rally import log as logging
from rally.openstack.common import uuidutils as uid
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

37
rally/openstack/common/uuidutils.py
View File

@ -1,37 +0,0 @@
# 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