Merge "rename oslo.concurrency to oslo_concurrency"

nova/cmd/conductor.py

@@ -16,8 +16,8 @@
 
 import sys
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import config
 from nova import objects

nova/console/xvp.py

@@ -19,9 +19,9 @@ import os
 import signal
 
 import jinja2
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import processutils
 
 from nova import context
 from nova import db

nova/crypto.py

@@ -28,10 +28,10 @@ import re
 import string
 import struct
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import timeutils
+from oslo_concurrency import processutils
 from pyasn1.codec.der import encoder as der_encoder
 from pyasn1.type import univ
 

nova/image/s3.py

@@ -26,8 +26,8 @@ import tempfile
 import boto.s3.connection
 import eventlet
 from lxml import etree
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova.api.ec2 import ec2utils
 import nova.cert.rpcapi

nova/network/base_api.py

@@ -16,8 +16,8 @@
 import functools
 import inspect
 
-from oslo.concurrency import lockutils
 from oslo.utils import excutils
+from oslo_concurrency import lockutils
 
 from nova.db import base
 from nova import hooks

nova/network/floating_ips.py

@@ -15,11 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import excutils
 from oslo.utils import importutils
+from oslo_concurrency import processutils
 import six
 
 from nova import context

nova/network/linux_net.py

@@ -23,12 +23,12 @@ import os
 import re
 
 import netaddr
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import excutils
 from oslo.utils import importutils
 from oslo.utils import timeutils
+from oslo_concurrency import processutils
 import six
 
 from nova import exception
@@ -1655,7 +1655,7 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
 #            ebtables with --concurrent. In order to do that though we need
 #            libvirt to support this. Additionally since ebtables --concurrent
 #            will hang indefinitely waiting on the lock we need to teach
-#            oslo.concurrency.processutils how to timeout a long running
+#            oslo_concurrency.processutils how to timeout a long running
 #            process first. Once those are complete we can replace all of this
 #            with calls to ebtables --concurrent and a reasonable timeout.
 def _exec_ebtables(*cmd, **kwargs):

nova/network/neutronv2/__init__.py

@@ -15,8 +15,8 @@
 
 from neutronclient.common import exceptions
 from neutronclient.v2_0 import client as clientv20
-from oslo.concurrency import lockutils
 from oslo.config import cfg
+from oslo_concurrency import lockutils
 
 from nova.openstack.common import log as logging
 

nova/network/neutronv2/api.py

@@ -19,9 +19,9 @@ import time
 import uuid
 
 from neutronclient.common import exceptions as neutron_client_exc
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.utils import excutils
+from oslo_concurrency import lockutils
 import six
 
 from nova.api.openstack import extensions

nova/service.py

@@ -21,10 +21,10 @@ import os
 import random
 import sys
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import importutils
+from oslo_concurrency import processutils
 
 from nova import baserpc
 from nova import conductor

nova/storage/linuxscsi.py

@@ -14,7 +14,7 @@
 
 """Generic linux scsi subsystem utilities."""
 
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from nova.i18n import _LW
 from nova.openstack.common import log as logging

nova/test.py

@@ -33,11 +33,11 @@ import shutil
 import uuid
 
 import fixtures
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.config import fixture as config_fixture
 from oslo.messaging import conffixture as messaging_conffixture
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
 from oslotest import moxstubout
 import six
 import testtools

nova/tests/unit/fake_processutils.py

@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""This modules stubs out functions in oslo.concurrency.processutils."""
+"""This modules stubs out functions in oslo_concurrency.processutils."""
 
 import re
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 import six
 
 from nova.openstack.common import log as logging

nova/tests/unit/network/test_linux_net.py

@@ -20,10 +20,10 @@ import os
 
 import mock
 from mox3 import mox
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import timeutils
+from oslo_concurrency import processutils
 
 from nova import context
 from nova import db

nova/tests/unit/network/test_manager.py

@@ -21,11 +21,11 @@ import fixtures
 import mock
 from mox3 import mox
 import netaddr
-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 six
 
 from nova import context

nova/tests/unit/network/test_neutronv2.py

@@ -2661,7 +2661,7 @@ class TestNeutronv2WithMock(test.TestCase):
             'fake-user', 'fake-project',
             auth_token='bff4a5a6b9eb4ea2a6efec6eefb77936')
 
-    @mock.patch('oslo.concurrency.lockutils.lock')
+    @mock.patch('oslo_concurrency.lockutils.lock')
     def test_get_instance_nw_info_locks_per_instance(self, mock_lock):
         instance = objects.Instance(uuid=uuid.uuid4())
         api = neutronapi.API()

nova/tests/unit/test_crypto.py

@@ -20,7 +20,7 @@ import os
 
 import mock
 from mox3 import mox
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from nova import crypto
 from nova import db

nova/tests/unit/test_service.py

@@ -22,8 +22,8 @@ import sys
 
 import mock
 from mox3 import mox
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 import testtools
 
 from nova import context

nova/tests/unit/test_utils.py

@@ -24,9 +24,9 @@ import tempfile
 import mock
 from mox3 import mox
 import netaddr
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import timeutils
+from oslo_concurrency import processutils
 
 import nova
 from nova import exception

nova/tests/unit/virt/disk/test_api.py

@@ -16,7 +16,7 @@
 import tempfile
 
 import fixtures
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from nova import test
 from nova import utils

nova/tests/unit/virt/disk/vfs/test_localfs.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova import test

nova/tests/unit/virt/hyperv/test_vmops.py

@@ -16,9 +16,9 @@ import os
 
 from eventlet import timeout as etimeout
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.tests.unit import fake_instance

nova/tests/unit/virt/libvirt/test_driver.py

@@ -32,14 +32,14 @@ import fixtures
 from lxml import etree
 import mock
 from mox3 import mox
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import encodeutils
 from oslo.utils import importutils
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils
 import six
 
 from nova.api.metadata import base as instance_metadata

nova/tests/unit/virt/libvirt/test_imagebackend.py

@@ -21,10 +21,10 @@ import tempfile
 
 import fixtures
 import mock
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.config import fixture as config_fixture
 from oslo.utils import units
+from oslo_concurrency import lockutils
 
 from nova import context
 from nova import exception

nova/tests/unit/virt/libvirt/test_imagecache.py

@@ -21,10 +21,10 @@ import os
 import time
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import importutils
+from oslo_concurrency import processutils
 
 from nova import conductor
 from nova import context

nova/tests/unit/virt/libvirt/test_lvm.py

@@ -16,8 +16,8 @@
 import contextlib
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova import test

nova/tests/unit/virt/libvirt/test_utils.py

@@ -18,8 +18,8 @@ import os
 import tempfile
 
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.openstack.common import fileutils

nova/tests/unit/virt/libvirt/test_vif.py

@@ -16,8 +16,8 @@ import contextlib
 
 from lxml import etree
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.network import linux_net

nova/tests/unit/virt/libvirt/test_volume.py

@@ -19,8 +19,8 @@ import time
 
 import fixtures
 import mock
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.storage import linuxscsi

nova/tests/unit/virt/test_images.py

@@ -15,7 +15,7 @@
 import os
 
 import mock
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova import test

nova/tests/unit/virt/xenapi/test_vm_utils.py

@@ -20,12 +20,12 @@ from eventlet import greenthread
 import fixtures
 import mock
 from mox3 import mox
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.config import fixture as config_fixture
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils
 import six
 
 from nova.compute import flavors

nova/tests/unit/virt/xenapi/test_xenapi.py

@@ -24,11 +24,11 @@ import re
 
 import mock
 from mox3 import mox
-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 importutils
+from oslo_concurrency import lockutils
 
 from nova.compute import api as compute_api
 from nova.compute import arch

nova/utils.py

@@ -36,13 +36,13 @@ from xml.sax import saxutils
 
 import eventlet
 import netaddr
-from oslo.concurrency import lockutils
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo import messaging
 from oslo.utils import excutils
 from oslo.utils import importutils
 from oslo.utils import timeutils
+from oslo_concurrency import lockutils
+from oslo_concurrency import processutils
 import six
 
 from nova import exception

nova/virt/disk/api.py

@@ -30,9 +30,9 @@ import tempfile
 if os.name != 'nt':
     import crypt
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.i18n import _

nova/virt/hyperv/vmops.py

@@ -22,11 +22,11 @@ import os
 import time
 
 from eventlet import timeout as etimeout
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 
 from nova.api.metadata import base as instance_metadata
 from nova import exception

nova/virt/libvirt/driver.py

@@ -43,7 +43,6 @@ import eventlet
 from eventlet import greenthread
 from eventlet import tpool
 from lxml import etree
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import encodeutils
@@ -52,6 +51,7 @@ from oslo.utils import importutils
 from oslo.utils import strutils
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six
 
 from nova.api.metadata import base as instance_metadata

nova/virt/libvirt/imagecache.py

@@ -25,9 +25,9 @@ import os
 import re
 import time
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_concurrency import processutils
 
 from nova.i18n import _LE
 from nova.i18n import _LI

nova/virt/libvirt/lvm.py

@@ -21,9 +21,9 @@
 
 import functools
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six
 
 from nova import exception

nova/virt/libvirt/utils.py

@@ -24,8 +24,8 @@ import platform
 import re
 
 from lxml import etree
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova.i18n import _
 from nova.i18n import _LI

nova/virt/libvirt/vif.py

@@ -19,8 +19,8 @@
 
 import copy
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
+from oslo_concurrency import processutils
 
 from nova import exception
 from nova.i18n import _

nova/virt/libvirt/volume.py

@@ -21,9 +21,9 @@ import os
 import time
 import urllib2
 
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import strutils
+from oslo_concurrency import processutils
 import six
 import six.moves.urllib.parse as urlparse
 

nova/virt/vmwareapi/imagecache.py

@@ -35,10 +35,10 @@ the timestamp folder will be locked  and the timestamps will be purged.
 This will ensure that a image is not deleted during the spawn.
 """
 
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.utils import timeutils
 from oslo.vmware import exceptions as vexc
+from oslo_concurrency import lockutils
 
 from nova.i18n import _LI, _LW
 from nova.openstack.common import log as logging

nova/virt/vmwareapi/vmops.py

@@ -24,12 +24,12 @@ import os
 import time
 
 import decorator
-from oslo.concurrency import lockutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import strutils
 from oslo.utils import units
 from oslo.vmware import exceptions as vexc
+from oslo_concurrency import lockutils
 
 from nova.api.metadata import base as instance_metadata
 from nova import compute

nova/virt/xenapi/vm_utils.py

@@ -28,13 +28,13 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from eventlet import greenthread
-from oslo.concurrency import processutils
 from oslo.config import cfg
 from oslo.utils import excutils
 from oslo.utils import importutils
 from oslo.utils import strutils
 from oslo.utils import timeutils
 from oslo.utils import units
+from oslo_concurrency import processutils
 import six
 import six.moves.urllib.parse as urlparse
 

nova/volume/encryptors/luks.py

@@ -16,7 +16,7 @@
 
 import re
 
-from oslo.concurrency import processutils
+from oslo_concurrency import processutils
 
 from nova.openstack.common import log as logging
 from nova import utils