Skip to content
Permalink
Browse files

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
  • Loading branch information...
Thingee committed Dec 19, 2014
1 parent 2cde43d commit 8ddcf590b98182eaf7dcfc46f1d8d5b888d2eac9
Showing with 88 additions and 88 deletions.
  1. +1 −1 cinder/backup/drivers/tsm.py
  2. +1 −1 cinder/brick/executor.py
  3. +2 −2 cinder/brick/initiator/connector.py
  4. +1 −1 cinder/brick/initiator/linuxfc.py
  5. +1 −1 cinder/brick/initiator/linuxscsi.py
  6. +1 −1 cinder/brick/iscsi/iscsi.py
  7. +1 −1 cinder/brick/local_dev/lvm.py
  8. +1 −1 cinder/brick/remotefs/remotefs.py
  9. +1 −1 cinder/image/image_utils.py
  10. +1 −1 cinder/service.py
  11. +1 −1 cinder/test.py
  12. +1 −1 cinder/tests/api/contrib/test_admin_actions.py
  13. +1 −1 cinder/tests/brick/test_brick_connector.py
  14. +1 −1 cinder/tests/brick/test_brick_lvm.py
  15. +1 −1 cinder/tests/fake_utils.py
  16. +1 −1 cinder/tests/test_backup_ceph.py
  17. +1 −1 cinder/tests/test_backup_tsm.py
  18. +3 −3 cinder/tests/test_emc_vnxdirect.py
  19. +1 −1 cinder/tests/test_eqlx.py
  20. +1 −1 cinder/tests/test_glusterfs.py
  21. +1 −1 cinder/tests/test_gpfs.py
  22. +1 −1 cinder/tests/test_ibm_flashsystem.py
  23. +5 −5 cinder/tests/test_ibmnas.py
  24. +1 −1 cinder/tests/test_image_utils.py
  25. +1 −1 cinder/tests/test_iscsi.py
  26. +1 −1 cinder/tests/test_pure.py
  27. +1 −1 cinder/tests/test_quobyte.py
  28. +1 −1 cinder/tests/test_service.py
  29. +1 −1 cinder/tests/test_sheepdog.py
  30. +2 −2 cinder/tests/test_srb.py
  31. +1 −1 cinder/tests/test_storwize_svc.py
  32. +1 −1 cinder/tests/test_utils.py
  33. +1 −1 cinder/tests/test_volume_utils.py
  34. +1 −1 cinder/tests/volume/drivers/netapp/test_utils.py
  35. +1 −1 cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py
  36. +1 −1 cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py
  37. +1 −1 cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
  38. +2 −2 cinder/utils.py
  39. +1 −1 cinder/volume/driver.py
  40. +1 −1 cinder/volume/drivers/coraid.py
  41. +2 −2 cinder/volume/drivers/emc/emc_vnx_cli.py
  42. +1 −1 cinder/volume/drivers/eqlx.py
  43. +1 −1 cinder/volume/drivers/fujitsu_eternus_dx_fc.py
  44. +1 −1 cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py
  45. +1 −1 cinder/volume/drivers/glusterfs.py
  46. +1 −1 cinder/volume/drivers/hds/nfs.py
  47. +2 −2 cinder/volume/drivers/hitachi/hbsd_basiclib.py
  48. +1 −1 cinder/volume/drivers/hitachi/hbsd_horcm.py
  49. +1 −1 cinder/volume/drivers/ibm/flashsystem.py
  50. +1 −1 cinder/volume/drivers/ibm/gpfs.py
  51. +1 −1 cinder/volume/drivers/ibm/ibmnas.py
  52. +1 −1 cinder/volume/drivers/ibm/storwize_svc/ssh.py
  53. +1 −1 cinder/volume/drivers/lvm.py
  54. +1 −1 cinder/volume/drivers/netapp/dataontap/nfs_base.py
  55. +1 −1 cinder/volume/drivers/netapp/utils.py
  56. +1 −1 cinder/volume/drivers/nfs.py
  57. +1 −1 cinder/volume/drivers/pure.py
  58. +1 −1 cinder/volume/drivers/quobyte.py
  59. +1 −1 cinder/volume/drivers/remotefs.py
  60. +1 −1 cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
  61. +1 −1 cinder/volume/drivers/san/san.py
  62. +1 −1 cinder/volume/drivers/sheepdog.py
  63. +1 −1 cinder/volume/drivers/smbfs.py
  64. +2 −2 cinder/volume/drivers/srb.py
  65. +1 −1 cinder/volume/flows/manager/create_volume.py
  66. +1 −1 cinder/volume/iscsi.py
  67. +1 −1 cinder/volume/targets/driver.py
  68. +1 −1 cinder/volume/targets/iscsi.py
  69. +1 −1 cinder/volume/targets/lio.py
  70. +1 −1 cinder/volume/targets/tgt.py
  71. +1 −1 cinder/volume/utils.py
  72. +1 −1 cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
  73. +1 −1 cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
  74. +1 −1 cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
  75. +1 −1 cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
  76. +1 −1 cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
@@ -29,8 +29,8 @@
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
@@ -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):
@@ -17,8 +17,8 @@
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
@@ -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
@@ -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
@@ -23,8 +23,8 @@
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
@@ -22,8 +22,8 @@
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
@@ -19,7 +19,7 @@
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
@@ -28,10 +28,10 @@
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 _
@@ -22,11 +22,11 @@
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
@@ -29,13 +29,13 @@
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

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

@@ -17,7 +17,7 @@
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
@@ -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
@@ -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
@@ -21,8 +21,8 @@
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
@@ -22,7 +22,7 @@
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
@@ -17,7 +17,7 @@
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 @@ def test_create_destroy_volume_snapshot(self):
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 @@ def fake_safe_get(self, value):
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)))
@@ -16,7 +16,7 @@
import time

import mox
from oslo.concurrency import processutils
from oslo_concurrency import processutils
import paramiko

from cinder import context
@@ -26,9 +26,9 @@
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
@@ -18,9 +18,9 @@
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
@@ -20,9 +20,9 @@
"""

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
@@ -180,7 +180,7 @@ def test_ssh_operation_exception(self, mock_ssh):

@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 @@ def test_create_ibmnas_snap_mount_point_provided(self, mock_ssh,

@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 @@ def test_extend_volume(self, mock_resize, mock_local):
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 @@ def test_delete_snapfiles(self, mock_execute, mock_ssh):
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 @@ def test_create_snapshot(self, mock_snap, mock_mount, mock_provider,
'_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."""

@@ -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
@@ -18,8 +18,8 @@
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
@@ -17,8 +17,8 @@
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
@@ -26,9 +26,9 @@
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
@@ -22,9 +22,9 @@

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
@@ -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
@@ -17,8 +17,8 @@
"""

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 @@ def test_extend_thin_pool_thin(self):
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()
@@ -23,10 +23,10 @@
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
@@ -19,9 +19,9 @@
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

0 comments on commit 8ddcf59

Please sign in to comment.
You can’t perform that action at this time.