Remove openstack.common.uuidutils

openstack-common.conf

@@ -8,7 +8,6 @@ module=loopingcall
 module=policy
 module=service
 module=threadgroup
-module=uuidutils
 module=middleware.request_id
 
 # The base module to hold the copy of openstack.common

senlin/engine/service.py

@@ -16,6 +16,7 @@ import functools
 import eventlet
 from oslo.config import cfg
 from oslo import messaging
+from oslo.utils import uuidutils
 from osprofiler import profiler
 
 from senlin.common import context
@@ -30,7 +31,6 @@ from senlin.engine import senlin_lock
 from senlin.engine import thread_mgr
 from senlin.openstack.common import log as logging
 from senlin.openstack.common import service
-from senlin.openstack.common import uuidutils
 
 LOG = logging.getLogger(__name__)
 

senlin/openstack/common/uuidutils.py

@@ -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