diff --git a/novaclient/openstack/common/uuidutils.py b/novaclient/openstack/common/uuidutils.py deleted file mode 100644 index 234b880c9..000000000 --- a/novaclient/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 diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 9dfa78099..39278f812 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -31,13 +31,13 @@ import time from oslo_utils import encodeutils from oslo_utils import strutils from oslo_utils import timeutils +from oslo_utils import uuidutils import six from novaclient import client from novaclient import exceptions from novaclient.i18n import _ from novaclient.openstack.common import cliutils -from novaclient.openstack.common import uuidutils from novaclient import utils from novaclient.v2 import availability_zones from novaclient.v2 import quotas diff --git a/openstack-common.conf b/openstack-common.conf index d303f591a..01962c84a 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,7 +4,6 @@ module=apiclient module=cliutils module=install_venv_common -module=uuidutils # The base module to hold the copy of openstack.common base=novaclient