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

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

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):

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

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

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

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

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

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

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 _

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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."""
 

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

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

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

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

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

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

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()

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 
 

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

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

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

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

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

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

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

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

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