From c5e53000ec78dbb90f35b88498d447e217465fa4 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Sat, 6 Dec 2014 12:20:27 +0800 Subject: [PATCH] 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. Change-Id: I2b2b362f766bb82058af6f9ed92189165aa9a629 Closes-Bug: #1398656 --- ironic/common/dhcp_factory.py | 2 +- ironic/common/disk_partitioner.py | 2 +- ironic/common/driver_factory.py | 2 +- ironic/common/images.py | 2 +- ironic/common/utils.py | 2 +- ironic/conductor/manager.py | 2 +- ironic/drivers/modules/console_utils.py | 2 +- ironic/drivers/modules/deploy_utils.py | 2 +- ironic/drivers/modules/image_cache.py | 2 +- ironic/drivers/modules/ipmitool.py | 2 +- ironic/drivers/modules/ssh.py | 2 +- ironic/nova/compute/manager.py | 2 +- ironic/tests/drivers/test_console_utils.py | 2 +- ironic/tests/drivers/test_deploy_utils.py | 2 +- ironic/tests/drivers/test_ipmitool.py | 2 +- ironic/tests/drivers/test_ssh.py | 4 ++-- ironic/tests/test_images.py | 2 +- ironic/tests/test_utils.py | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ironic/common/dhcp_factory.py b/ironic/common/dhcp_factory.py index c6848c6d01..2053929895 100644 --- a/ironic/common/dhcp_factory.py +++ b/ironic/common/dhcp_factory.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.concurrency import lockutils from oslo.config import cfg +from oslo_concurrency import lockutils import stevedore from ironic.common import exception diff --git a/ironic/common/disk_partitioner.py b/ironic/common/disk_partitioner.py index fd09ffc3dd..524709289b 100644 --- a/ironic/common/disk_partitioner.py +++ b/ironic/common/disk_partitioner.py @@ -15,8 +15,8 @@ import re -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py index 2d69ffd19f..ce757460ef 100644 --- a/ironic/common/driver_factory.py +++ b/ironic/common/driver_factory.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.concurrency import lockutils from oslo.config import cfg +from oslo_concurrency import lockutils from stevedore import dispatch from ironic.common import exception diff --git a/ironic/common/images.py b/ironic/common/images.py index 5853d410f9..bdf43911a5 100644 --- a/ironic/common/images.py +++ b/ironic/common/images.py @@ -23,8 +23,8 @@ import os import shutil import jinja2 -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/common/utils.py b/ironic/common/utils.py index efd8d87146..b679006f5f 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -29,9 +29,9 @@ import tempfile import uuid import netaddr -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils +from oslo_concurrency import processutils import paramiko import six diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 27c5347266..20ffbb22bc 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -47,11 +47,11 @@ import threading import eventlet from eventlet import greenpool -from oslo.concurrency import lockutils from oslo.config import cfg from oslo.db import exception as db_exception from oslo import messaging from oslo.utils import excutils +from oslo_concurrency import lockutils from ironic.common import dhcp_factory from ironic.common import driver_factory diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py index fcc10d3490..92f729339b 100644 --- a/ironic/drivers/modules/console_utils.py +++ b/ironic/drivers/modules/console_utils.py @@ -24,8 +24,8 @@ import subprocess import tempfile import time -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py index 29e9236243..160e3b6065 100644 --- a/ironic/drivers/modules/deploy_utils.py +++ b/ironic/drivers/modules/deploy_utils.py @@ -20,9 +20,9 @@ import socket import stat import time -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils +from oslo_concurrency import processutils from ironic.common import disk_partitioner from ironic.common import exception diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py index 8f1f54100b..588001ed29 100644 --- a/ironic/drivers/modules/image_cache.py +++ b/ironic/drivers/modules/image_cache.py @@ -22,8 +22,8 @@ import os import tempfile import time -from oslo.concurrency import lockutils from oslo.config import cfg +from oslo_concurrency import lockutils from ironic.common import exception from ironic.common.glance_service import service_utils diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index 5bb46e7bca..27e9aa57b0 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -36,9 +36,9 @@ import stat import tempfile import time -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils +from oslo_concurrency import processutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py index b0c6a20ba8..af3dac28c7 100644 --- a/ironic/drivers/modules/ssh.py +++ b/ironic/drivers/modules/ssh.py @@ -28,8 +28,8 @@ Currently supported environments are: import os -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/nova/compute/manager.py b/ironic/nova/compute/manager.py index 90b51dde34..b189ff8147 100644 --- a/ironic/nova/compute/manager.py +++ b/ironic/nova/compute/manager.py @@ -23,7 +23,7 @@ work. The goal here is to generalise the areas where n-c talking to a clustered hypervisor has issues, and long term fold them into the main ComputeManager. """ -from oslo.concurrency import lockutils +from oslo_concurrency import lockutils from nova.compute import manager import nova.context diff --git a/ironic/tests/drivers/test_console_utils.py b/ironic/tests/drivers/test_console_utils.py index 99ffee95f5..85638264c3 100644 --- a/ironic/tests/drivers/test_console_utils.py +++ b/ironic/tests/drivers/test_console_utils.py @@ -24,8 +24,8 @@ import subprocess import tempfile import mock -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import exception from ironic.common import utils diff --git a/ironic/tests/drivers/test_deploy_utils.py b/ironic/tests/drivers/test_deploy_utils.py index 2706d2a7ca..4892692829 100644 --- a/ironic/tests/drivers/test_deploy_utils.py +++ b/ironic/tests/drivers/test_deploy_utils.py @@ -19,8 +19,8 @@ import tempfile import fixtures import mock -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import disk_partitioner from ironic.common import exception diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py index 9d6fc4ba10..fe0a69fcfb 100644 --- a/ironic/tests/drivers/test_ipmitool.py +++ b/ironic/tests/drivers/test_ipmitool.py @@ -25,8 +25,8 @@ import tempfile import time import mock -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from ironic.common import boot_devices from ironic.common import driver_factory diff --git a/ironic/tests/drivers/test_ssh.py b/ironic/tests/drivers/test_ssh.py index 86ab81c0e3..04b0bc2410 100644 --- a/ironic/tests/drivers/test_ssh.py +++ b/ironic/tests/drivers/test_ssh.py @@ -17,6 +17,8 @@ import fixtures import mock +from oslo.config import cfg +from oslo_concurrency import processutils import paramiko from ironic.common import boot_devices @@ -32,8 +34,6 @@ from ironic.tests.db import base as db_base from ironic.tests.db import utils as db_utils from ironic.tests.objects import utils as obj_utils -from oslo.concurrency import processutils -from oslo.config import cfg CONF = cfg.CONF diff --git a/ironic/tests/test_images.py b/ironic/tests/test_images.py index a253767ec5..c769796550 100644 --- a/ironic/tests/test_images.py +++ b/ironic/tests/test_images.py @@ -20,8 +20,8 @@ import os import shutil import mock -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils import six.moves.builtins as __builtin__ from ironic.common import exception diff --git a/ironic/tests/test_utils.py b/ironic/tests/test_utils.py index 44deee9cbd..a187d6812b 100644 --- a/ironic/tests/test_utils.py +++ b/ironic/tests/test_utils.py @@ -23,8 +23,8 @@ import uuid import mock import netaddr -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils import six import six.moves.builtins as __builtin__