Use uuidutils from oslo.utils

Change-Id: I6313ad1d3da1a8e9efeab5d4f336e6f43f7a9857

diff --git a/cinder/api/contrib/volume_manage.py b/cinder/api/contrib/volume_manage.py
index 47039bdd35aa459ecce817e005b259bf8822c23d..30ed18fd8e382750f51c3b26e3ec695759672e2d 100644 (file)
--- a/cinder/api/contrib/volume_manage.py
+++ b/cinder/api/contrib/volume_manage.py
@@ -13,6 +13,7 @@
 #   under the License.
 
 from oslo_config import cfg
+from oslo_utils import uuidutils
 from webob import exc
 
 from cinder.api import extensions
@@ -22,7 +23,6 @@ from cinder.api.v2 import volumes
 from cinder import exception
 from cinder.i18n import _
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import volume_types

diff --git a/cinder/api/contrib/volume_type_access.py b/cinder/api/contrib/volume_type_access.py
index 50f6131f26a2cfe741ce101efcb494b9c36bc041..b91672f396a22d86b5e301b544fa9ea27c986783 100644 (file)
--- a/cinder/api/contrib/volume_type_access.py
+++ b/cinder/api/contrib/volume_type_access.py
@@ -13,6 +13,7 @@
 
 """The volume type access extension."""
 
+from oslo_utils import uuidutils
 import six
 import webob
 
@@ -21,7 +22,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import uuidutils
 from cinder.volume import volume_types
 
 

diff --git a/cinder/api/v1/volumes.py b/cinder/api/v1/volumes.py
index a7bbda7f33139732ecc46ac60180e95f26a34d60..723395cbcf5368691c09ab38899811a1aed07d71 100644 (file)
--- a/cinder/api/v1/volumes.py
+++ b/cinder/api/v1/volumes.py
@@ -17,6 +17,7 @@
 
 import ast
 
+from oslo_utils import uuidutils
 import webob
 from webob import exc
 
@@ -26,7 +27,6 @@ from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import utils as volume_utils

diff --git a/cinder/api/v2/volumes.py b/cinder/api/v2/volumes.py
index de31de3c4535bcfe191ab9bb44ad3adf50910c9e..0844e7acb9f55e3d413735cd27e784457e10fbdf 100644 (file)
--- a/cinder/api/v2/volumes.py
+++ b/cinder/api/v2/volumes.py
@@ -18,6 +18,7 @@
 
 import ast
 
+from oslo_utils import uuidutils
 import webob
 from webob import exc
 
@@ -30,7 +31,6 @@ from cinder import exception
 from cinder.i18n import _, _LI
 from cinder.image import glance
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import utils as volume_utils

diff --git a/cinder/cmd/manage.py b/cinder/cmd/manage.py
index e11ffd3645c5147a18d8bd6c26f4c054018503f7..d423b074c1031c57e8c974cb7825a3f02a958b27 100644 (file)
--- a/cinder/cmd/manage.py
+++ b/cinder/cmd/manage.py
@@ -64,6 +64,7 @@ warnings.simplefilter('once', DeprecationWarning)
 from oslo import messaging
 from oslo_config import cfg
 from oslo_db.sqlalchemy import migration
+from oslo_utils import uuidutils
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -76,7 +77,6 @@ from cinder.db import migration as db_migration
 from cinder.db.sqlalchemy import api as db_api
 from cinder.i18n import _
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 from cinder import rpc
 from cinder import utils
 from cinder import version

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index d21ba74788e2dd10612153612cc8e85b9e4829cb..2d607a902ba40a3030b23e57f567f264e9a96ecc 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -31,6 +31,7 @@ from oslo_db import exception as db_exc
 from oslo_db import options
 from oslo_db.sqlalchemy import session as db_session
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import osprofiler.sqlalchemy
 import six
 import sqlalchemy
@@ -46,7 +47,6 @@ from cinder.db.sqlalchemy import models
 from cinder import exception
 from cinder.i18n import _, _LW
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 
 
 CONF = cfg.CONF

diff --git a/cinder/openstack/common/uuidutils.py b/cinder/openstack/common/uuidutils.py
deleted file mode 100644 (file)
index 7608acb..0000000
--- a/cinder/openstack/common/uuidutils.py
+++ /dev/null
@@ -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

diff --git a/cinder/scheduler/filters/affinity_filter.py b/cinder/scheduler/filters/affinity_filter.py
index 64f3c04d6036b6565216279b8758fa1d8ddf073e..68906d068efaa99dfa42326606aaa867347092e3 100644 (file)
--- a/cinder/scheduler/filters/affinity_filter.py
+++ b/cinder/scheduler/filters/affinity_filter.py
@@ -13,11 +13,10 @@
 # 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.
-
+from oslo_utils import uuidutils
 
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
-from cinder.openstack.common import uuidutils
 from cinder.volume import api as volume
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/scheduler/filters/instance_locality_filter.py b/cinder/scheduler/filters/instance_locality_filter.py
index 3f0cc10c4b4ffde01bd2d74260a91f6dbb1ccfc2..2730e14ec5a89dd6fdc1de7ce63aaae99d526af4 100644 (file)
--- a/cinder/scheduler/filters/instance_locality_filter.py
+++ b/cinder/scheduler/filters/instance_locality_filter.py
@@ -12,14 +12,13 @@
 # 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.
-
+from oslo_utils import uuidutils
 
 from cinder.compute import nova
 from cinder import exception
 from cinder.i18n import _, _LW
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
-from cinder.openstack.common import uuidutils
 from cinder.volume import utils as volume_utils
 
 

diff --git a/cinder/tests/scheduler/fakes.py b/cinder/tests/scheduler/fakes.py
index 35e5337c7717385425ad62a1b2ea3b7fc2081c2c..8bda883c3465b9dec783c73da8c95a161a41aa4a 100644 (file)
--- a/cinder/tests/scheduler/fakes.py
+++ b/cinder/tests/scheduler/fakes.py
@@ -17,8 +17,8 @@ Fakes For Scheduler tests.
 """
 
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
-from cinder.openstack.common import uuidutils
 from cinder.scheduler import filter_scheduler
 from cinder.scheduler import host_manager
 

diff --git a/cinder/tests/test_cmd.py b/cinder/tests/test_cmd.py
index d62b52210771ac736e9c1c355f2b74d6e6fd8ee9..36837459247e43dd66f6483cf133fc8e9e74586d 100644 (file)
--- a/cinder/tests/test_cmd.py
+++ b/cinder/tests/test_cmd.py
@@ -312,7 +312,7 @@ class TestCinderManageCmd(test.TestCase):
     def tearDown(self):
         super(TestCinderManageCmd, self).tearDown()
 
-    @mock.patch('cinder.openstack.common.uuidutils.is_uuid_like')
+    @mock.patch('oslo_utils.uuidutils.is_uuid_like')
     def test_param2id(self, is_uuid_like):
         mock_object_id = mock.MagicMock()
         is_uuid_like.return_value = True
@@ -321,7 +321,7 @@ class TestCinderManageCmd(test.TestCase):
         self.assertEqual(mock_object_id, object_id)
         is_uuid_like.assert_called_once_with(mock_object_id)
 
-    @mock.patch('cinder.openstack.common.uuidutils.is_uuid_like')
+    @mock.patch('oslo_utils.uuidutils.is_uuid_like')
     def test_param2id_int_string(self, is_uuid_like):
         object_id_str = '10'
         is_uuid_like.return_value = False

diff --git a/cinder/tests/test_db_api.py b/cinder/tests/test_db_api.py
index bffeb120252a3c3842ec91c359467569ad2e7c88..aad3a352d6379b3d3b0a629e6b8f81a51b9d2225 100644 (file)
--- a/cinder/tests/test_db_api.py
+++ b/cinder/tests/test_db_api.py
@@ -17,11 +17,11 @@
 import datetime
 
 from oslo_config import cfg
+from oslo_utils import uuidutils
 
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common import uuidutils
 from cinder.quota import ReservableResource
 from cinder import test
 

diff --git a/cinder/tests/test_vmware_vmdk.py b/cinder/tests/test_vmware_vmdk.py
index 942355e7f558dc0ccc4d1f9988920f4b2978c21b..eac4f5d28c6656ccf95ede5493bca4e5ddb5a984 100644 (file)
--- a/cinder/tests/test_vmware_vmdk.py
+++ b/cinder/tests/test_vmware_vmdk.py
@@ -959,7 +959,7 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
                           image_service, fake_image_id)
 
     @mock.patch.object(VMDK_DRIVER, '_extend_vmdk_virtual_disk')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_select_ds_for_volume')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     @mock.patch.object(VMDK_DRIVER,
@@ -1424,7 +1424,7 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
         m.VerifyAll()
 
     @mock.patch.object(VMDK_DRIVER, '_delete_temp_backing')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_get_volume_group_folder')
     @mock.patch('cinder.volume.volume_types.get_volume_type_extra_specs')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
@@ -1645,7 +1645,7 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
     @mock.patch.object(vmware_images, 'download_stream_optimized_disk')
     @mock.patch('cinder.openstack.common.fileutils.file_open')
     @mock.patch.object(VMDK_DRIVER, '_temporary_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_create_backing_in_inventory')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     @mock.patch.object(VMDK_DRIVER, 'session')
@@ -1701,7 +1701,7 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
     @mock.patch.object(VMDK_DRIVER, '_restore_backing')
     @mock.patch('cinder.openstack.common.fileutils.file_open')
     @mock.patch.object(VMDK_DRIVER, '_temporary_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     def test_restore_backup(self, vops, generate_uuid, temporary_file,
                             file_open, restore_backing, extend_volume):
@@ -1770,7 +1770,7 @@ class VMwareEsxVmdkDriverTestCase(test.TestCase):
     @mock.patch.object(VMDK_DRIVER, '_select_ds_for_volume')
     @mock.patch.object(VMDK_DRIVER,
                        '_create_backing_from_stream_optimized_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     def test_restore_backing(
             self, generate_uuid, create_backing, select_ds, get_disk_type,
             vops, delete_temp_backing):
@@ -2518,7 +2518,7 @@ class VMwareVcVmdkDriverTestCase(VMwareEsxVmdkDriverTestCase):
         self._test_extend_vmdk_virtual_disk(volume_ops)
 
     @mock.patch.object(VMDK_DRIVER, '_extend_vmdk_virtual_disk')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_select_ds_for_volume')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     @mock.patch.object(VMDK_DRIVER,
@@ -2589,7 +2589,7 @@ class VMwareVcVmdkDriverTestCase(VMwareEsxVmdkDriverTestCase):
                                                          fetch_optimized_image)
 
     @mock.patch.object(VMDK_DRIVER, '_delete_temp_backing')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_get_volume_group_folder')
     @mock.patch('cinder.volume.volume_types.get_volume_type_extra_specs')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
@@ -2613,7 +2613,7 @@ class VMwareVcVmdkDriverTestCase(VMwareEsxVmdkDriverTestCase):
     @mock.patch.object(vmware_images, 'download_stream_optimized_disk')
     @mock.patch('cinder.openstack.common.fileutils.file_open')
     @mock.patch.object(VMDK_DRIVER, '_temporary_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, '_create_backing_in_inventory')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     @mock.patch.object(VMDK_DRIVER, 'session')
@@ -2626,7 +2626,7 @@ class VMwareVcVmdkDriverTestCase(VMwareEsxVmdkDriverTestCase):
     @mock.patch.object(VMDK_DRIVER, '_restore_backing')
     @mock.patch('cinder.openstack.common.fileutils.file_open')
     @mock.patch.object(VMDK_DRIVER, '_temporary_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     @mock.patch.object(VMDK_DRIVER, 'volumeops')
     def test_restore_backup(self, vops, generate_uuid, temporary_file,
                             file_open, restore_backing, extend_volume):
@@ -2640,7 +2640,7 @@ class VMwareVcVmdkDriverTestCase(VMwareEsxVmdkDriverTestCase):
     @mock.patch.object(VMDK_DRIVER, '_select_ds_for_volume')
     @mock.patch.object(VMDK_DRIVER,
                        '_create_backing_from_stream_optimized_file')
-    @mock.patch('cinder.openstack.common.uuidutils.generate_uuid')
+    @mock.patch('oslo_utils.uuidutils.generate_uuid')
     def test_restore_backing(
             self, generate_uuid, create_backing, select_ds, get_disk_type,
             vops, delete_temp_backing):

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 39987bc7974cbc41a033ca9793f5b9208a7ec99f..dd7cd8ed1441ae33f21b34ee3ca48cbfe860bacf 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -26,6 +26,7 @@ import functools
 from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 
 from cinder import context
@@ -36,7 +37,6 @@ from cinder.i18n import _, _LE
 from cinder.image import glance
 from cinder import keymgr
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 import cinder.policy
 from cinder import quota
 from cinder import quota_utils

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index 31daa1c2ba41f92115e61e6f5c752c5ce931017a..cbffd2a53d2b10effa313f5bcd8a5d3c0501aa51 100644 (file)
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -30,12 +30,12 @@ import tempfile
 from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
 from cinder.openstack.common import fileutils
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import uuidutils
 from cinder.volume import driver
 from cinder.volume.drivers.vmware import api
 from cinder.volume.drivers.vmware import datastore as hub

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 4c3c31b93fb3361b4a5d240e93d1f4ae3c08cf41..37bfd3450fb4865c670ca22c81d27a98708e7e5f 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -45,6 +45,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 from osprofiler import profiler
 
 from cinder import compute
@@ -56,7 +57,6 @@ from cinder.image import glance
 from cinder import manager
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import periodic_task
-from cinder.openstack.common import uuidutils
 from cinder import quota
 from cinder import utils
 from cinder.volume.configuration import Configuration

diff --git a/openstack-common.conf b/openstack-common.conf
index ddda2dc76a61dfa4ceb392be0b369eee12acc35f..df8f28e4097bbc1a5bd1a64ff962d6f825b73d0e 100644 (file)
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -20,7 +20,6 @@ module=scheduler.filters
 module=scheduler.weights
 module=service
 module=strutils
-module=uuidutils
 module=versionutils
 
 # The base module to hold the copy of openstack.common