diff --git a/storyboardclient/openstack/common/apiclient/utils.py b/storyboardclient/openstack/common/apiclient/utils.py index 88375c3..8eab764 100644 --- a/storyboardclient/openstack/common/apiclient/utils.py +++ b/storyboardclient/openstack/common/apiclient/utils.py @@ -25,11 +25,11 @@ ######################################################################## from oslo_utils import encodeutils +from oslo_utils import uuidutils import six from storyboardclient.openstack.common._i18n import _ from storyboardclient.openstack.common.apiclient import exceptions -from storyboardclient.openstack.common import uuidutils def find_resource(manager, name_or_id, **find_args): diff --git a/storyboardclient/openstack/common/uuidutils.py b/storyboardclient/openstack/common/uuidutils.py deleted file mode 100644 index 234b880..0000000 --- a/storyboardclient/openstack/common/uuidutils.py +++ /dev/null @@ -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