Rename oslo.concurrency to oslo_concurrency

oslo.concurrency-0.3.0 has moved its path to oslo_concurrency,
the old path oslo.concurrency can still work but is deprecated now.

Closes-Bug: #1398656
Change-Id: I52211d7b7e1db3454c99d27042dae506adb2c41c

diff --git a/cinder/backup/drivers/tsm.py b/cinder/backup/drivers/tsm.py
index 5f5f0573bef76a158dd7faa948c14109402ee478..73cfca39e470343ef763bbacd1bc223016f7fe39 100644 (file)
--- a/cinder/backup/drivers/tsm.py
+++ b/cinder/backup/drivers/tsm.py
@@ -29,8 +29,8 @@ import json
 import os
 import stat
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception

diff --git a/cinder/brick/executor.py b/cinder/brick/executor.py
index ea950055b2b7dbf1016c54798c5f82f5bb6efd02..fe82b88265f074c6fd457a8ec7956bbd8b278ae8 100644 (file)
--- a/cinder/brick/executor.py
+++ b/cinder/brick/executor.py
@@ -18,7 +18,7 @@
    and root_helper settings, so this provides that hook.
 """
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 
 class Executor(object):

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index dd7bb6fcff2ac4c68974867ed68980e7ca669177..56d6c91ba5f8dbf3459baafadb58667737953e00 100644 (file)
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -17,8 +17,8 @@ import os
 import socket
 import time
 
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick import exception
 from cinder.brick import executor

diff --git a/cinder/brick/initiator/linuxfc.py b/cinder/brick/initiator/linuxfc.py
index 419228574ca697f08303fba3d816a53ae2c370ec..7600dc2e7887aaa2683bfc56fe26675e00a8fbd3 100644 (file)
--- a/cinder/brick/initiator/linuxfc.py
+++ b/cinder/brick/initiator/linuxfc.py
@@ -16,7 +16,7 @@
 
 import errno
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick.initiator import linuxscsi
 from cinder.i18n import _LW

diff --git a/cinder/brick/initiator/linuxscsi.py b/cinder/brick/initiator/linuxscsi.py
index 8be1d37f95cb6ebc67c2de0fff3e9107e90ce0cd..977007bc3a82d0c3ea111bb0d86017ae9306616c 100644 (file)
--- a/cinder/brick/initiator/linuxscsi.py
+++ b/cinder/brick/initiator/linuxscsi.py
@@ -19,7 +19,7 @@
 import os
 import re
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick import executor
 from cinder.i18n import _, _LW

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index c5afa617c44fd0f2b8dff7d1cd9e69b5013bd3d8..4f6822661b04b24e96637532047288d5c052a71d 100644 (file)
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@ -23,8 +23,8 @@ import re
 import stat
 import time
 
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder.brick import exception

diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py
index be92b2655dc8b7d106e88128156ac462878b2c48..4c926484466c6844bb45ce7d5f1937ef73f76368 100644 (file)
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@ -22,8 +22,8 @@ import math
 import re
 import time
 
-from oslo.concurrency import processutils as putils
 from oslo.utils import excutils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick import exception
 from cinder.brick import executor

diff --git a/cinder/brick/remotefs/remotefs.py b/cinder/brick/remotefs/remotefs.py
index 7a6266ff88d9e16dd67b6e8be62d9ca118bb7b29..7eaf7d71daf934698fbe31776788f4654b624ff1 100644 (file)
--- a/cinder/brick/remotefs/remotefs.py
+++ b/cinder/brick/remotefs/remotefs.py
@@ -19,7 +19,7 @@ import hashlib
 import os
 import re
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder.brick import exception

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index 48bfa53d53d7e096da335263cf46be3b39b01a18..b9ebdba184ccbdc275e2b238f4be30f0ad9ba13f 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/cinder/image/image_utils.py
@@ -28,10 +28,10 @@ import contextlib
 import os
 import tempfile
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _

diff --git a/cinder/service.py b/cinder/service.py
index 0bb4e6d2e491c82e30a55a6a6be597854a28b72e..4401373ba90da8a8a087d219332657b2a84b12f3 100644 (file)
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -22,11 +22,11 @@ import inspect
 import os
 import random
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.db import exception as db_exc
 from oslo import messaging
 from oslo.utils import importutils
+from oslo_concurrency import processutils
 import osprofiler.notifier
 from osprofiler import profiler
 import osprofiler.web

diff --git a/cinder/test.py b/cinder/test.py
index 209b1dfa9016d1a6c2a9d1a05393a82a93de75df..2906d67a4c03735a4c7ffc6bd0aa799b6a8f8a35 100644 (file)
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -29,13 +29,13 @@ import uuid
 import fixtures
 import mock
 import mox
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.config import fixture as config_fixture
 from oslo.i18n import _lazy
 from oslo.messaging import conffixture as messaging_conffixture
 from oslo.utils import strutils
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
 import stubout
 import testtools
 

diff --git a/cinder/tests/api/contrib/test_admin_actions.py b/cinder/tests/api/contrib/test_admin_actions.py
index a1f0c54ac40267fb7f2357b52e1b066240f0f8a3..4d3f6a07dddbfee317397797b30bea23b4df20fb 100644 (file)
--- a/cinder/tests/api/contrib/test_admin_actions.py
+++ b/cinder/tests/api/contrib/test_admin_actions.py
@@ -13,11 +13,11 @@
 import ast
 
 import fixtures
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.config import fixture as config_fixture
 from oslo.serialization import jsonutils
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
 import webob
 from webob import exc
 

diff --git a/cinder/tests/brick/test_brick_connector.py b/cinder/tests/brick/test_brick_connector.py
index 357c511915c09cec5d57cd699f260e47a3ef23bc..bdb52e4911217fba604e3282a6ac9952e5820250 100644 (file)
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/cinder/tests/brick/test_brick_connector.py
@@ -17,7 +17,7 @@ import string
 import tempfile
 import time
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick import exception
 from cinder.brick.initiator import connector

diff --git a/cinder/tests/brick/test_brick_lvm.py b/cinder/tests/brick/test_brick_lvm.py
index 3cfacbab8490a110888cfa9cccfa396b84d30c53..588bd72810564407de0243dbaf30dee4e0fad8c2 100644 (file)
--- a/cinder/tests/brick/test_brick_lvm.py
+++ b/cinder/tests/brick/test_brick_lvm.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import mox
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder.brick import exception
 from cinder.brick.local_dev import lvm as brick

diff --git a/cinder/tests/fake_utils.py b/cinder/tests/fake_utils.py
index 2cae17ffc526014dc6866bda296a6d1cd9ad23ed..4d15713779d7d7e1f192bb1c55765cd73215b16e 100644 (file)
--- a/cinder/tests/fake_utils.py
+++ b/cinder/tests/fake_utils.py
@@ -17,7 +17,7 @@
 import re
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder.openstack.common import log as logging
 from cinder import utils

diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py
index d8b8895d18184715a312bc00e294250408ce5936..4dd5815c6bf5b7aa9c610eb56e677f7f8c09050f 100644 (file)
--- a/cinder/tests/test_backup_ceph.py
+++ b/cinder/tests/test_backup_ceph.py
@@ -21,8 +21,8 @@ import tempfile
 import uuid
 
 import mock
-from oslo.concurrency import processutils
 from oslo.serialization import jsonutils
+from oslo_concurrency import processutils
 import six
 
 from cinder.backup import driver

diff --git a/cinder/tests/test_backup_tsm.py b/cinder/tests/test_backup_tsm.py
index f50af7338307c0b47e7b12de6dfbb7d3669602b0..d5e52361d2a459d395753db4bdcc8c54a2212fd9 100644 (file)
--- a/cinder/tests/test_backup_tsm.py
+++ b/cinder/tests/test_backup_tsm.py
@@ -22,7 +22,7 @@ import json
 import os
 import posix
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder.backup.drivers import tsm
 from cinder import context

diff --git a/cinder/tests/test_emc_vnxdirect.py b/cinder/tests/test_emc_vnxdirect.py
index 4148d59d8692839add03c614bb38d380c69e2632..156e925b17a4bc4056de1a9e284975fdc73c6e8a 100644 (file)
--- a/cinder/tests/test_emc_vnxdirect.py
+++ b/cinder/tests/test_emc_vnxdirect.py
@@ -17,7 +17,7 @@ import os
 import re
 
 import mock
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder import test
@@ -1155,7 +1155,7 @@ Time Remaining:  0 second(s)
         fake_cli.assert_has_calls(expect_cmd)
 
     @mock.patch(
-        "oslo.concurrency.processutils.execute",
+        "oslo_concurrency.processutils.execute",
         mock.Mock(
             return_value=(
                 "fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0)))
@@ -2474,7 +2474,7 @@ class EMCVNXCLIDriverFCTestCase(test.TestCase):
             return None
 
     @mock.patch(
-        "oslo.concurrency.processutils.execute",
+        "oslo_concurrency.processutils.execute",
         mock.Mock(
             return_value=(
                 "fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0)))

diff --git a/cinder/tests/test_eqlx.py b/cinder/tests/test_eqlx.py
index 5139cbbc1747c4c9df8e82d7b1b268f7322636e9..56b66d0c0db23a2c055987fdbda372277adaa78b 100644 (file)
--- a/cinder/tests/test_eqlx.py
+++ b/cinder/tests/test_eqlx.py
@@ -16,7 +16,7 @@
 import time
 
 import mox
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 import paramiko
 
 from cinder import context

diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index 2079c0da6bac49416f6107d61b2b2622133254c8..aa81725ecefe65873169472619a2989f60318e03 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/cinder/tests/test_glusterfs.py
@@ -26,9 +26,9 @@ import mox as mox_lib
 from mox import IgnoreArg
 from mox import IsA
 from mox import stubout
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils as putils
 
 from cinder import brick
 from cinder import compute

diff --git a/cinder/tests/test_gpfs.py b/cinder/tests/test_gpfs.py
index 8ca523107299c2c286497fdd07e43104dac3736f..a994fff8ec962cec9d0c0b10f482ebad96631fbb 100644 (file)
--- a/cinder/tests/test_gpfs.py
+++ b/cinder/tests/test_gpfs.py
@@ -18,9 +18,9 @@ import shutil
 import tempfile
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_ibm_flashsystem.py b/cinder/tests/test_ibm_flashsystem.py
index 5eebe3933d02e8361c7bd16a1b8e244158aabac9..2a453e6a65e9128e38bfb1590d08e504e173ba5e 100644 (file)
--- a/cinder/tests/test_ibm_flashsystem.py
+++ b/cinder/tests/test_ibm_flashsystem.py
@@ -20,9 +20,9 @@ Tests for the IBM FlashSystem volume driver.
 """
 
 import mock
-from oslo.concurrency import processutils
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six
 
 import random

diff --git a/cinder/tests/test_ibmnas.py b/cinder/tests/test_ibmnas.py
index a190470849df20219dac760823cf35a9033f790c..ee3736c110dcb6b74d93b6e28bc20c29863f4dcc 100644 (file)
--- a/cinder/tests/test_ibmnas.py
+++ b/cinder/tests/test_ibmnas.py
@@ -180,7 +180,7 @@ class IBMNASDriverTestCase(test.TestCase):
 
     @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
                 '_ssh_operation')
-    @mock.patch('oslo.concurrency.processutils.execute')
+    @mock.patch('oslo_concurrency.processutils.execute')
     def test_create_ibmnas_snap_mount_point_provided(self, mock_ssh,
                                                      mock_execute):
         """Create ibmnas snap if mount point is provided."""
@@ -195,7 +195,7 @@ class IBMNASDriverTestCase(test.TestCase):
 
     @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
                 '_ssh_operation')
-    @mock.patch('oslo.concurrency.processutils.execute')
+    @mock.patch('oslo_concurrency.processutils.execute')
     def test_create_ibmnas_snap_nas_gpfs(self, mock_execute, mock_ssh):
         """Create ibmnas snap if mount point is provided."""
 
@@ -300,7 +300,7 @@ class IBMNASDriverTestCase(test.TestCase):
                           self.TEST_EXTEND_SIZE_IN_GB)
 
     @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh')
-    @mock.patch('oslo.concurrency.processutils.execute')
+    @mock.patch('oslo_concurrency.processutils.execute')
     def test_delete_snapfiles(self, mock_execute, mock_ssh):
         """Delete_snapfiles test case."""
 
@@ -316,7 +316,7 @@ class IBMNASDriverTestCase(test.TestCase):
                               self.TEST_MNT_POINT)
 
     @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh')
-    @mock.patch('oslo.concurrency.processutils.execute')
+    @mock.patch('oslo_concurrency.processutils.execute')
     def test_delete_snapfiles_nas_gpfs(self, mock_execute, mock_ssh):
         """Delete_snapfiles for gpfs-nas platform test case."""
 
@@ -397,7 +397,7 @@ class IBMNASDriverTestCase(test.TestCase):
                 '_get_provider_location')
     @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
                 '_get_mount_point_for_share')
-    @mock.patch('oslo.concurrency.processutils.execute')
+    @mock.patch('oslo_concurrency.processutils.execute')
     def test_delete_snapshot(self, mock_execute, mock_mount, mock_provider):
         """Delete snapshot simple test case."""
 

diff --git a/cinder/tests/test_image_utils.py b/cinder/tests/test_image_utils.py
index 90bf1c4e080ab34fb156752741c83293ffc18776..5028c83f5cee6c8d3da25b21f42c8f269610a2f7 100644 (file)
--- a/cinder/tests/test_image_utils.py
+++ b/cinder/tests/test_image_utils.py
@@ -16,7 +16,7 @@
 """Unit tests for image utils."""
 
 import mock
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.image import image_utils

diff --git a/cinder/tests/test_iscsi.py b/cinder/tests/test_iscsi.py
index ac1ed5ea3505d6110e2545eaee5e0f93ec6215ac..c43a441ec26d28c6f39773bcebb24331f65f9c6e 100644 (file)
--- a/cinder/tests/test_iscsi.py
+++ b/cinder/tests/test_iscsi.py
@@ -18,8 +18,8 @@ import shutil
 import string
 import tempfile
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from cinder.brick.iscsi import iscsi
 from cinder import test

diff --git a/cinder/tests/test_pure.py b/cinder/tests/test_pure.py
index b0bae9a59092689357d2001ed6b64869e8d29bfe..1fe5f6a1bf8de81175b6b42db8416cf156f919cf 100644 (file)
--- a/cinder/tests/test_pure.py
+++ b/cinder/tests/test_pure.py
@@ -17,8 +17,8 @@ import json
 import urllib2
 
 import mock
-from oslo.concurrency import processutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/test_quobyte.py b/cinder/tests/test_quobyte.py
index 7520802b7732ac1c55472db469aabde1efcf2046..42e0fde6abe68f9cc33e134dc171f296fda08744 100644 (file)
--- a/cinder/tests/test_quobyte.py
+++ b/cinder/tests/test_quobyte.py
@@ -26,9 +26,9 @@ import mox as mox_lib
 from mox import IgnoreArg
 from mox import IsA
 from mox import stubout
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils as putils
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_service.py b/cinder/tests/test_service.py
index f63271cd2e1f33c4482a4d34068880427394abae..2ddb3162a4100a22fd615021903b8c1310c8c74c 100644 (file)
--- a/cinder/tests/test_service.py
+++ b/cinder/tests/test_service.py
@@ -22,9 +22,9 @@ Unit Tests for remote procedure calls using queue
 
 import mock
 import mox
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.db import exception as db_exc
+from oslo_concurrency import processutils
 
 from cinder import context
 from cinder import db

diff --git a/cinder/tests/test_sheepdog.py b/cinder/tests/test_sheepdog.py
index ccce1c09366224b95f1c9e94c657716a8206c876..ccedc27b20a6d49be7e6badb6b4059f8a11fce29 100644 (file)
--- a/cinder/tests/test_sheepdog.py
+++ b/cinder/tests/test_sheepdog.py
@@ -17,8 +17,8 @@
 
 import contextlib
 
-from oslo.concurrency import processutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder.image import image_utils
 from cinder import test

diff --git a/cinder/tests/test_srb.py b/cinder/tests/test_srb.py
index 4599b2a32fbf5c63efa2df624b507e762d368f1e..91783fa510bf540e4f13e2561a53a310ed125244 100644 (file)
--- a/cinder/tests/test_srb.py
+++ b/cinder/tests/test_srb.py
@@ -17,8 +17,8 @@ Unit tests for the Scality Rest Block Volume Driver.
 """
 
 import mock
-from oslo.concurrency import processutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import context
 from cinder import exception
@@ -117,7 +117,7 @@ class SRBLvmTestCase(test_brick_lvm.BrickLvmTestCase):
                                self.fake_execute)
         self.assertTrue(self.thin_vg.supports_thin_provisioning('sudo'))
         self.thin_vg.update_volume_group_info = mock.MagicMock()
-        with mock.patch('oslo.concurrency.processutils.execute'):
+        with mock.patch('oslo_concurrency.processutils.execute'):
             executor = mock.MagicMock()
             self.thin_vg._execute = executor
             self.thin_vg.extend_thin_pool()

diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index 5e74244b70a0d3b430a0158ceca5211624a9c64a..9272d9427718991a8f7468ff25df8a70c1f58056 100644 (file)
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py
@@ -23,10 +23,10 @@ import re
 import time
 
 import mock
-from oslo.concurrency import processutils
 from oslo.utils import excutils
 from oslo.utils import importutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py
index 26753469765451e62b603c820fa83714e5f3c77c..a4712497e9fcb9a56feee11941edc4cfeb639a6c 100644 (file)
--- a/cinder/tests/test_utils.py
+++ b/cinder/tests/test_utils.py
@@ -19,9 +19,9 @@ import os
 import uuid
 
 import mock
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_concurrency import processutils as putils
 import paramiko
 import six
 

diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py
index 13fc9943682234f67522108dcc5b41215a8c7505..2a1defa103ad90959486241fe79d35f1b5230974 100644 (file)
--- a/cinder/tests/test_volume_utils.py
+++ b/cinder/tests/test_volume_utils.py
@@ -16,8 +16,8 @@
 """Tests For miscellaneous util methods used with volume."""
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/volume/drivers/netapp/test_utils.py b/cinder/tests/volume/drivers/netapp/test_utils.py
index a368b7da6a342a6f41fe72b33296268c2658a680..ac97bc731da360d76536184f7b754730f8e7fe17 100644 (file)
--- a/cinder/tests/volume/drivers/netapp/test_utils.py
+++ b/cinder/tests/volume/drivers/netapp/test_utils.py
@@ -20,7 +20,7 @@ Mock unit tests for the NetApp driver utility module
 import platform
 
 import mock
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py b/cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py
index 18a696adf86b1a0269085514c82c56c3308f0bf7..1b55c4e0fdfdeabe627e2a4613b34b425db2ebdf 100644 (file)
--- a/cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py
+++ b/cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py
@@ -21,7 +21,7 @@
 
 import mock
 from mock import patch
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py b/cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py
index 642854f49c596a268dac1c1ac630b87b445dffe0..46c9c100c1769270f97cb8e58d3ab0e0762a7f93 100644 (file)
--- a/cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py
+++ b/cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py
@@ -18,7 +18,7 @@
 """Unit tests for Cisco fc zone client cli."""
 
 from mock import patch
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
index d68385d52cb9cc099d2c49b7c48bfb1a5e688b88..91d5d33839e7c695c6e3b27c365366777f2c1eb6 100644 (file)
--- a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
+++ b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
@@ -17,9 +17,9 @@
 
 """Unit tests for Cisco FC zone driver."""
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import importutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/utils.py b/cinder/utils.py
index d91a4e54a67ea896b2edb1fde5867ca972e670b9..aa6fadcc980d4295e1b25041af85c2ab3377e38a 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -35,11 +35,11 @@ from xml import sax
 from xml.sax import expatreader
 from xml.sax import saxutils
 
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import importutils
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils
 import six
 
 from cinder.brick.initiator import connector

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index f985fea1be9bee1e432c77beb12433262bb8b860..0c949a053cd4a6da6b13066f5d3914d565c9d8e6 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -19,9 +19,9 @@ Drivers for volumes.
 
 import time
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index ad350bee05f41bd1e6655653ce0d95109b897347..26f10e51fc0ebf5318cd3b7513358284abd70034 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -26,10 +26,10 @@ import math
 import urllib
 import urllib2
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import units
+from oslo_concurrency import lockutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 18a70c6d843b968f59556b4b22dd3698eb9eb0ba..508dd99ee31d1a0bef686f8c4a90f5a819160d69 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -21,12 +21,12 @@ import random
 import re
 import time
 
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils as json
 from oslo.utils import excutils
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py
index 7ce2cc015e05b78e0090c22f0fed8f8f1cbba8d4..6462219018ac44cfa5aaa48823b54888b1c40f49 100644 (file)
--- a/cinder/volume/drivers/eqlx.py
+++ b/cinder/volume/drivers/eqlx.py
@@ -21,9 +21,9 @@ import random
 import eventlet
 from eventlet import greenthread
 import greenlet
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW, _LI

diff --git a/cinder/volume/drivers/fujitsu_eternus_dx_fc.py b/cinder/volume/drivers/fujitsu_eternus_dx_fc.py
index 8a17fccf06d0bbb78870cbf5d03ca6547d439f2c..0d71d4fdc58251d57584ecf146fcb695f2ff9e3b 100644 (file)
--- a/cinder/volume/drivers/fujitsu_eternus_dx_fc.py
+++ b/cinder/volume/drivers/fujitsu_eternus_dx_fc.py
@@ -17,7 +17,7 @@
 FC Drivers for ETERNUS DX arrays based on SMI-S.
 
 """
-from oslo.concurrency import lockutils
+from oslo_concurrency import lockutils
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py b/cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py
index afd05182d2b5225e5a7c69db602f1810c0b57367..8ca64152c0c864160530b17863fac894c8957694 100644 (file)
--- a/cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py
+++ b/cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py
@@ -17,7 +17,7 @@
 ISCSI Drivers for ETERNUS DX arrays based on SMI-S.
 
 """
-from oslo.concurrency import lockutils
+from oslo_concurrency import lockutils
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index c60e15d59bc0738392a660d1596f038709edf18e..d8fcc21769dc8d9939b0a6ca1abf49e136a21973 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -17,9 +17,9 @@ import errno
 import os
 import stat
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder.brick.remotefs import remotefs as remotefs_brick
 from cinder import exception

diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hds/nfs.py
index 730efd8ddf98b2d2f399d9746358b7620f9b3ad2..0139265762ca295f1508e1b960613f3ad51cc1da 100644 (file)
--- a/cinder/volume/drivers/hds/nfs.py
+++ b/cinder/volume/drivers/hds/nfs.py
@@ -21,10 +21,10 @@ import os
 import time
 from xml.etree import ElementTree as ETree
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/volume/drivers/hitachi/hbsd_basiclib.py b/cinder/volume/drivers/hitachi/hbsd_basiclib.py
index 3df38b8d31aeeb886176f9979d6866ddc9fd0af4..23693696b78095642f844f2634544cbdfb1b6c6c 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_basiclib.py
+++ b/cinder/volume/drivers/hitachi/hbsd_basiclib.py
@@ -16,9 +16,9 @@ import inspect
 import os
 import shlex
 
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils as putils
 from oslo.utils import excutils
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/hitachi/hbsd_horcm.py b/cinder/volume/drivers/hitachi/hbsd_horcm.py
index a7b2272d71f099d5c985393fe9400f3312d86bd9..116385bd89b7a7a32b61a4430edad99b64a57cc4 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_horcm.py
+++ b/cinder/volume/drivers/hitachi/hbsd_horcm.py
@@ -20,9 +20,9 @@ import shlex
 import threading
 import time
 
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/ibm/flashsystem.py b/cinder/volume/drivers/ibm/flashsystem.py
index d83951269881755be767f2a4b1f5903d9c19e178..1b66c463a7c056dfdf3bbbdcb5397e4c0c7aca0d 100644 (file)
--- a/cinder/volume/drivers/ibm/flashsystem.py
+++ b/cinder/volume/drivers/ibm/flashsystem.py
@@ -29,10 +29,10 @@ import re
 import string
 import threading
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py
index 08e101a00ab4e2572d134486011d1addf61191df..4fef4b1de40c786e7e472a48650cf8b90930e5b4 100644 (file)
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@ -21,9 +21,9 @@ import os
 import re
 import shutil
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py
index 1690c561ba559c8fd4e414d709f4047df48b1ab0..25e9951783d5c0b0fedcd16d123e2e57f8367d27 100644 (file)
--- a/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@ -32,9 +32,9 @@ Notes:
 import os
 import re
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LI, _LW

diff --git a/cinder/volume/drivers/ibm/storwize_svc/ssh.py b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
index 2243a21d38464eea29176107b686beaaec9d31a0..cea9c05db35bcb555d5de552800f03d4989ee537 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/ssh.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
@@ -16,7 +16,7 @@
 
 import re
 
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index 0f21c7cf5ef9552d3730f8555ac89e6d93e46a18..bc6f26c071d67097c4463e223cee383f3ed19f3a 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -22,9 +22,9 @@ import math
 import os
 import socket
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder.brick import exception as brick_exception
 from cinder.brick.local_dev import lvm as lvm

diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_base.py b/cinder/volume/drivers/netapp/dataontap/nfs_base.py
index deb5b065ce9b033af191333b228ea72e2f6a10c1..8c441f088af53032213c7a79ca5bf9f8d2e19ad7 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/nfs_base.py
+++ b/cinder/volume/drivers/netapp/dataontap/nfs_base.py
@@ -25,9 +25,9 @@ import re
 from threading import Timer
 import time
 
-from oslo.concurrency import processutils
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/utils.py b/cinder/volume/drivers/netapp/utils.py
index 2269a35f392eec57cf3ec78b9c1ae355244b69ae..d376d48cc0ea8be6975028ab12f9bc151e4e0e04 100644 (file)
--- a/cinder/volume/drivers/netapp/utils.py
+++ b/cinder/volume/drivers/netapp/utils.py
@@ -25,7 +25,7 @@ import decimal
 import platform
 import socket
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index a6ee75164a4f140f6a14e1d7a9b6abf4a9027178..b3d327a496db14634713f326361d2cdc75861880 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -17,9 +17,9 @@ import errno
 import os
 import time
 
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder.brick.remotefs import remotefs as remotefs_brick

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 12c7362b2fadc9615661fb369a20174099bec1e7..f966a46f8036e2dae9e744081a5782ad30e61fe4 100644 (file)
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -24,10 +24,10 @@ import re
 import urllib2
 import uuid
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _LE, _LI, _LW

diff --git a/cinder/volume/drivers/quobyte.py b/cinder/volume/drivers/quobyte.py
index 71a6d9cd956ee19b3fdf5517307ed897848ab206..f8e85738adc0344b887af8440e28b67d8ce90654 100644 (file)
--- a/cinder/volume/drivers/quobyte.py
+++ b/cinder/volume/drivers/quobyte.py
@@ -17,8 +17,8 @@
 import errno
 import os
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 import xattr
 
 from cinder import compute

diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index 2e20e9cb530d3bee465be654604f9cdad191b9fb..5b00c1bcc3dc056057de0de57f16e813eb9afcf6 100644 (file)
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -21,9 +21,9 @@ import re
 import tempfile
 import time
 
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils as putils
 
 from cinder import compute
 from cinder import db

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
index 6a105174dfa4f964af143ce7011f3fee5c31ac52..14e3b253d55e8b18184739cc43c617b20cf8bfc0 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
@@ -21,8 +21,8 @@ operations on the SAN.
 """
 
 from lxml import etree
-from oslo.concurrency import processutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index 0fade4e1f9cc5caa70361a586f3281b79652ffe1..d68cd1438437a872257e6df6ece33dcbff9a51a4 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -22,9 +22,9 @@ controller on the SAN hardware.  We expect to access it over SSH or some API.
 import random
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py
index 1943f6134efef3008367d167f6fdb0067622bbab..026ee7f9e7faf1f55e4861642e44a21a250c52c2 100644 (file)
--- a/cinder/volume/drivers/sheepdog.py
+++ b/cinder/volume/drivers/sheepdog.py
@@ -20,9 +20,9 @@ SheepDog Volume Driver.
 """
 import re
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/smbfs.py b/cinder/volume/drivers/smbfs.py
index 0fd8d9488561c9e6f1b57f729e7fcc452249ef0f..938ce46bd37686cf44534c249bb92d298521c660 100644 (file)
--- a/cinder/volume/drivers/smbfs.py
+++ b/cinder/volume/drivers/smbfs.py
@@ -16,9 +16,9 @@
 import os
 import re
 
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils as putils
 
 from cinder.brick.remotefs import remotefs
 from cinder import exception

diff --git a/cinder/volume/drivers/srb.py b/cinder/volume/drivers/srb.py
index a14402de043754cacf2fbf8f2c160fccf13b975f..e82764de773bfbd8f7e3c9d367031faae93e38fe 100644 (file)
--- a/cinder/volume/drivers/srb.py
+++ b/cinder/volume/drivers/srb.py
@@ -24,11 +24,11 @@ import functools
 import sys
 import time
 
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils as putils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import units
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder.brick.local_dev import lvm

diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
index c089f15874ebfa41bfdd5a0124a7d6c7adb817bf..02d2dc5dd04818d182ffe36f9e4d90be4e3731d3 100644 (file)
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@ -12,9 +12,9 @@
 
 import traceback
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_concurrency import processutils
 import taskflow.engines
 from taskflow.patterns import linear_flow
 from taskflow.utils import misc

diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py
index 7198b8324caf1232d0744cbf8fbcabd892f1196f..46a30ad72649a399ae00ae9fa7e4bf559ab7119a 100644 (file)
--- a/cinder/volume/iscsi.py
+++ b/cinder/volume/iscsi.py
@@ -16,7 +16,7 @@
 import os
 import re
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder.brick.iscsi import iscsi
 from cinder import exception

diff --git a/cinder/volume/targets/driver.py b/cinder/volume/targets/driver.py
index b694cf8740cee1bebae24fe034f2ef0a8bce79ae..fc385a8ab441bef3dad2d963af573e3ded5830f3 100644 (file)
--- a/cinder/volume/targets/driver.py
+++ b/cinder/volume/targets/driver.py
@@ -12,7 +12,7 @@
 
 import abc
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 import six
 
 

diff --git a/cinder/volume/targets/iscsi.py b/cinder/volume/targets/iscsi.py
index 87917cf277183d3c6b326ef8576bd083affe51ac..4ec69fba24f69d222ba29c22b15f5cdf138445bc 100644 (file)
--- a/cinder/volume/targets/iscsi.py
+++ b/cinder/volume/targets/iscsi.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LW, _LE

diff --git a/cinder/volume/targets/lio.py b/cinder/volume/targets/lio.py
index f25d528af19b90d022e1924830ee2f3765dfb1e3..3f38dacd2129bccb6b895d42ee396d6b732b5d8b 100644 (file)
--- a/cinder/volume/targets/lio.py
+++ b/cinder/volume/targets/lio.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW

diff --git a/cinder/volume/targets/tgt.py b/cinder/volume/targets/tgt.py
index 3fa9df58ced9d8faf2078c79b08110a017defb89..eff730b3bd52edcdaf3ab02a1de87e7d11a08393 100644 (file)
--- a/cinder/volume/targets/tgt.py
+++ b/cinder/volume/targets/tgt.py
@@ -15,7 +15,7 @@ import os
 import re
 import time
 
-from oslo.concurrency import processutils as putils
+from oslo_concurrency import processutils as putils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index 34f9f668952da0880ef08c71124ef47f1afae63f..89aa147b8c99cf11162432a171df3260ddf21b8c 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -18,11 +18,11 @@
 import math
 
 from Crypto.Random import random
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import strutils
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from cinder.brick.local_dev import lvm as brick_lvm
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
index ecdded689e20c7fe35becc7bbd3a3d209ca2da10..063b7c155f7d5ddba320129dfae7f1b7a8bba894 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
@@ -25,8 +25,8 @@ import random
 import re
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
index 41d8319eb84326d03f47801b815b94a49e05a5c2..f865666757dd1dc83ed018178362d4b57b52de18 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
@@ -30,10 +30,10 @@ add_connection and delete_connection interfaces.
 """
 
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
+from oslo_concurrency import lockutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
index 5871328c7ba05c022194168c4197215a5755732f..e5b63ab19ed3cb1325aed35b8df8cf91ba1eff65 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
@@ -18,8 +18,8 @@
 import random
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 import six
 
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
index 879a43e790c06e618a556fcf0e8230ef01fa63d8..00b1412cd7f01cf9c8cf49edeeb50bd4b476f8bd 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
@@ -22,8 +22,8 @@ import random
 import re
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 import six
 
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
index fa31c94755ae691f0c8d6999b9b143c00c0012bc..c8bc494c381501f4f45ff8d74ac82d441ebf8408 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
@@ -27,10 +27,10 @@ add_connection and delete_connection interfaces.
 :zone_name_prefix: Used by: class: 'FCZoneDriver'. Defaults to 'openstack'
 """
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
+from oslo_concurrency import lockutils
 import six
 
 from cinder import exception