From: Mike Perez Date: Fri, 19 Dec 2014 23:38:11 +0000 (-0800) Subject: Rename oslo.concurrency to oslo_concurrency X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8ddcf590b98182eaf7dcfc46f1d8d5b888d2eac9;p=openstack-build%2Fcinder-build.git 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 5f5f0573b..73cfca39e 100644 --- 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 ea950055b..fe82b8826 100644 --- 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 dd7bb6fcf..56d6c91ba 100644 --- 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 419228574..7600dc2e7 100644 --- 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 8be1d37f9..977007bc3 100644 --- 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 c5afa617c..4f6822661 100644 --- 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 be92b2655..4c9264844 100644 --- 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 7a6266ff8..7eaf7d71d 100644 --- 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 48bfa53d5..b9ebdba18 100644 --- 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 0bb4e6d2e..4401373ba 100644 --- 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 209b1dfa9..2906d67a4 100644 --- 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 a1f0c54ac..4d3f6a07d 100644 --- 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 357c51191..bdb52e491 100644 --- 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 3cfacbab8..588bd7281 100644 --- 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 2cae17ffc..4d1571377 100644 --- 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 d8b8895d1..4dd5815c6 100644 --- 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 f50af7338..d5e52361d 100644 --- 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 4148d59d8..156e925b1 100644 --- 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 5139cbbc1..56b66d0c0 100644 --- 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 2079c0da6..aa81725ec 100644 --- 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 8ca523107..a994fff8e 100644 --- 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 5eebe3933..2a453e6a6 100644 --- 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 a19047084..ee3736c11 100644 --- 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 90bf1c4e0..5028c83f5 100644 --- 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 ac1ed5ea3..c43a441ec 100644 --- 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 b0bae9a59..1fe5f6a1b 100644 --- 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 7520802b7..42e0fde6a 100644 --- 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 f63271cd2..2ddb3162a 100644 --- 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 ccce1c093..ccedc27b2 100644 --- 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 4599b2a32..91783fa51 100644 --- 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 5e74244b7..9272d9427 100644 --- 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 267534697..a4712497e 100644 --- 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 13fc99436..2a1defa10 100644 --- 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 a368b7da6..ac97bc731 100644 --- 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 18a696adf..1b55c4e0f 100644 --- 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 642854f49..46c9c100c 100644 --- 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 d68385d52..91d5d3383 100644 --- 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 d91a4e54a..aa6fadcc9 100644 --- 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 f985fea1b..0c949a053 100644 --- 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 ad350bee0..26f10e51f 100644 --- 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 18a70c6d8..508dd99ee 100644 --- 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 7ce2cc015..646221901 100644 --- 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 8a17fccf0..0d71d4fdc 100644 --- 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 afd05182d..8ca64152c 100644 --- 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 c60e15d59..d8fcc2176 100644 --- 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 730efd8dd..013926576 100644 --- 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 3df38b8d3..23693696b 100644 --- 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 a7b2272d7..116385bd8 100644 --- 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 d83951269..1b66c463a 100644 --- 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 08e101a00..4fef4b1de 100644 --- 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 1690c561b..25e995178 100644 --- 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 2243a21d3..cea9c05db 100644 --- 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 0f21c7cf5..bc6f26c07 100644 --- 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 deb5b065c..8c441f088 100644 --- 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 2269a35f3..d376d48cc 100644 --- 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 a6ee75164..b3d327a49 100644 --- 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 12c7362b2..f966a46f8 100644 --- 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 71a6d9cd9..f8e85738a 100644 --- 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 2e20e9cb5..5b00c1bcc 100644 --- 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 6a105174d..14e3b253d 100644 --- 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 0fade4e1f..d68cd1438 100644 --- 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 1943f6134..026ee7f9e 100644 --- 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 0fd8d9488..938ce46bd 100644 --- 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 a14402de0..e82764de7 100644 --- 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 c089f1587..02d2dc5dd 100644 --- 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 7198b8324..46a30ad72 100644 --- 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 b694cf874..fc385a8ab 100644 --- 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 87917cf27..4ec69fba2 100644 --- 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 f25d528af..3f38dacd2 100644 --- 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 3fa9df58c..eff730b3b 100644 --- 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 34f9f6689..89aa147b8 100644 --- 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 ecdded689..063b7c155 100644 --- 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 41d8319eb..f86566675 100644 --- 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 5871328c7..e5b63ab19 100644 --- 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 879a43e79..00b1412cd 100644 --- 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 fa31c9475..c8bc494c3 100644 --- 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