From 7022b5fad5bec29344597b455c1d9ed449e30744 Mon Sep 17 00:00:00 2001
From: Nguyen Hung Phuong <phuongnh@vn.fujitsu.com>
Date: Fri, 19 Aug 2016 10:59:35 +0700
Subject: [PATCH] Merge imports in code

This patch merges all lines importing i18n into 1 line:

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I828542a62cc577065f3bef9223d25cfe7a939785
---
 ironic/api/middleware/parsable_error.py         | 3 +--
 ironic/common/driver_factory.py                 | 3 +--
 ironic/common/exception.py                      | 3 +--
 ironic/common/images.py                         | 3 +--
 ironic/common/keystone.py                       | 3 +--
 ironic/common/neutron.py                        | 5 +----
 ironic/common/service.py                        | 4 +---
 ironic/common/utils.py                          | 4 +---
 ironic/conductor/base_manager.py                | 6 +-----
 ironic/conductor/manager.py                     | 5 +----
 ironic/conductor/task_manager.py                | 4 +---
 ironic/conductor/utils.py                       | 5 +----
 ironic/db/sqlalchemy/api.py                     | 3 +--
 ironic/dhcp/neutron.py                          | 4 +---
 ironic/drivers/modules/agent.py                 | 5 +----
 ironic/drivers/modules/agent_base_vendor.py     | 5 +----
 ironic/drivers/modules/agent_client.py          | 4 +---
 ironic/drivers/modules/amt/common.py            | 3 +--
 ironic/drivers/modules/amt/management.py        | 4 +---
 ironic/drivers/modules/amt/power.py             | 5 +----
 ironic/drivers/modules/console_utils.py         | 4 +---
 ironic/drivers/modules/deploy_utils.py          | 4 +---
 ironic/drivers/modules/drac/job.py              | 3 +--
 ironic/drivers/modules/drac/management.py       | 3 +--
 ironic/drivers/modules/iboot.py                 | 3 +--
 ironic/drivers/modules/ilo/boot.py              | 4 +---
 ironic/drivers/modules/ilo/common.py            | 5 +----
 ironic/drivers/modules/ilo/deploy.py            | 3 +--
 ironic/drivers/modules/ilo/inspect.py           | 4 +---
 ironic/drivers/modules/ilo/power.py             | 3 +--
 ironic/drivers/modules/image_cache.py           | 3 +--
 ironic/drivers/modules/inspector.py             | 4 +---
 ironic/drivers/modules/ipminative.py            | 4 +---
 ironic/drivers/modules/ipmitool.py              | 5 +----
 ironic/drivers/modules/irmc/boot.py             | 4 +---
 ironic/drivers/modules/irmc/inspect.py          | 4 +---
 ironic/drivers/modules/irmc/management.py       | 3 +--
 ironic/drivers/modules/irmc/power.py            | 3 +--
 ironic/drivers/modules/msftocs/msftocsclient.py | 3 +--
 ironic/drivers/modules/msftocs/power.py         | 3 +--
 ironic/drivers/modules/network/flat.py          | 4 +---
 ironic/drivers/modules/network/neutron.py       | 4 +---
 ironic/drivers/modules/oneview/common.py        | 3 +--
 ironic/drivers/modules/oneview/deploy.py        | 3 +--
 ironic/drivers/modules/oneview/deploy_utils.py  | 5 +----
 ironic/drivers/modules/oneview/power.py         | 3 +--
 ironic/drivers/modules/oneview/vendor.py        | 4 +---
 ironic/drivers/modules/pxe.py                   | 4 +---
 ironic/drivers/modules/seamicro.py              | 4 +---
 ironic/drivers/modules/snmp.py                  | 3 +--
 ironic/drivers/modules/ssh.py                   | 4 +---
 ironic/drivers/modules/ucs/helper.py            | 3 +--
 ironic/drivers/modules/ucs/management.py        | 3 +--
 ironic/drivers/modules/ucs/power.py             | 3 +--
 ironic/drivers/modules/virtualbox.py            | 4 +---
 ironic/drivers/modules/wol.py                   | 3 +--
 ironic/drivers/utils.py                         | 4 +---
 57 files changed, 57 insertions(+), 157 deletions(-)

diff --git a/ironic/api/middleware/parsable_error.py b/ironic/api/middleware/parsable_error.py
index 742ee534fc..b0de053029 100644
--- a/ironic/api/middleware/parsable_error.py
+++ b/ironic/api/middleware/parsable_error.py
@@ -27,8 +27,7 @@ from oslo_log import log
 import six
 import webob
 
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 
 LOG = log.getLogger(__name__)
 
diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py
index 500396a924..1650a1a94a 100644
--- a/ironic/common/driver_factory.py
+++ b/ironic/common/driver_factory.py
@@ -20,8 +20,7 @@ from oslo_log import log
 from stevedore import dispatch
 
 from ironic.common import exception
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _LI, _LW
 from ironic.conf import CONF
 from ironic.drivers import base as driver_base
 
diff --git a/ironic/common/exception.py b/ironic/common/exception.py
index b483b8d7de..e9c83bcef3 100644
--- a/ironic/common/exception.py
+++ b/ironic/common/exception.py
@@ -24,8 +24,7 @@ from oslo_log import log as logging
 import six
 from six.moves import http_client
 
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.conf import CONF
 
 LOG = logging.getLogger(__name__)
diff --git a/ironic/common/images.py b/ironic/common/images.py
index 2505ea53e3..908671c922 100644
--- a/ironic/common/images.py
+++ b/ironic/common/images.py
@@ -31,8 +31,7 @@ from oslo_utils import fileutils
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils as glance_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import image_service as service
 from ironic.common import utils
 from ironic.conf import CONF
diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py
index ee22ad2a61..870e79733c 100644
--- a/ironic/common/keystone.py
+++ b/ironic/common/keystone.py
@@ -21,8 +21,7 @@ import six
 from six.moves.urllib import parse  # for legacy options loading only
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.conf import auth as ironic_auth
 from ironic.conf import CONF
 
diff --git a/ironic/common/neutron.py b/ironic/common/neutron.py
index 1ef515ea03..0b16acdd85 100644
--- a/ironic/common/neutron.py
+++ b/ironic/common/neutron.py
@@ -15,10 +15,7 @@ from neutronclient.v2_0 import client as clientv20
 from oslo_log import log
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import keystone
 from ironic.conf import CONF
 
diff --git a/ironic/common/service.py b/ironic/common/service.py
index a64a2a3d06..be4ba0fa26 100644
--- a/ironic/common/service.py
+++ b/ironic/common/service.py
@@ -27,9 +27,7 @@ from ironic.api import app
 from ironic.common import config
 from ironic.common import context
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _, _LE, _LI
 from ironic.common import rpc
 from ironic.conf import CONF
 from ironic import objects
diff --git a/ironic/common/utils.py b/ironic/common/utils.py
index e6daf7027d..e2226c896e 100644
--- a/ironic/common/utils.py
+++ b/ironic/common/utils.py
@@ -37,9 +37,7 @@ import pytz
 import six
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.conf import CONF
 
 LOG = logging.getLogger(__name__)
diff --git a/ironic/conductor/base_manager.py b/ironic/conductor/base_manager.py
index cf9176a6ff..d347f9533e 100644
--- a/ironic/conductor/base_manager.py
+++ b/ironic/conductor/base_manager.py
@@ -27,11 +27,7 @@ from ironic.common import context as ironic_context
 from ironic.common import driver_factory
 from ironic.common import exception
 from ironic.common import hash_ring as hash
-from ironic.common.i18n import _
-from ironic.common.i18n import _LC
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LC, _LE, _LI, _LW
 from ironic.common import rpc
 from ironic.common import states
 from ironic.conductor import task_manager
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index 1af0b924e7..6c2bea542a 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -56,10 +56,7 @@ from ironic.common import dhcp_factory
 from ironic.common import driver_factory
 from ironic.common import exception
 from ironic.common.glance_service import service_utils as glance_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import images
 from ironic.common import states
 from ironic.common import swift
diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py
index 6688330655..5aa549c168 100644
--- a/ironic/conductor/task_manager.py
+++ b/ironic/conductor/task_manager.py
@@ -104,9 +104,7 @@ import six
 
 from ironic.common import driver_factory
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import states
 from ironic import objects
 
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py
index dd8286f84d..c7bcc59bc1 100644
--- a/ironic/conductor/utils.py
+++ b/ironic/conductor/utils.py
@@ -16,10 +16,7 @@ from oslo_log import log
 from oslo_utils import excutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import states
 from ironic.conductor import task_manager
 
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py
index a8030dd87b..3f4973a7dc 100644
--- a/ironic/db/sqlalchemy/api.py
+++ b/ironic/db/sqlalchemy/api.py
@@ -33,8 +33,7 @@ from sqlalchemy.orm import joinedload
 from sqlalchemy import sql
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.db import api
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py
index 021af95b7d..af44e0bb47 100644
--- a/ironic/dhcp/neutron.py
+++ b/ironic/dhcp/neutron.py
@@ -21,9 +21,7 @@ from oslo_log import log as logging
 from oslo_utils import netutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import network
 from ironic.common import neutron
 from ironic.conf import CONF
diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py
index d545370213..1b045974cf 100644
--- a/ironic/drivers/modules/agent.py
+++ b/ironic/drivers/modules/agent.py
@@ -21,10 +21,7 @@ import six.moves.urllib_parse as urlparse
 from ironic.common import dhcp_factory
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import image_service
 from ironic.common import images
 from ironic.common import raid
diff --git a/ironic/drivers/modules/agent_base_vendor.py b/ironic/drivers/modules/agent_base_vendor.py
index f6da43a724..0d8afd7b04 100644
--- a/ironic/drivers/modules/agent_base_vendor.py
+++ b/ironic/drivers/modules/agent_base_vendor.py
@@ -29,10 +29,7 @@ import retrying
 from ironic.api.controllers.v1 import ramdisk
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import rpcapi
diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index c8a82f19ff..7e0d92a93f 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -18,9 +18,7 @@ from oslo_serialization import jsonutils
 import requests
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.conf import CONF
 
 LOG = log.getLogger(__name__)
diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py
index 831c1b0b3d..03f06a0ff7 100644
--- a/ironic/drivers/modules/amt/common.py
+++ b/ironic/drivers/modules/amt/common.py
@@ -24,8 +24,7 @@ import six
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import utils
 
 
diff --git a/ironic/drivers/modules/amt/management.py b/ironic/drivers/modules/amt/management.py
index bcc31b4da7..d41d43cda6 100644
--- a/ironic/drivers/modules/amt/management.py
+++ b/ironic/drivers/modules/amt/management.py
@@ -21,9 +21,7 @@ from oslo_utils import excutils
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _, _LE, _LI
 from ironic.conductor import task_manager
 from ironic.drivers import base
 from ironic.drivers.modules.amt import common as amt_common
diff --git a/ironic/drivers/modules/amt/power.py b/ironic/drivers/modules/amt/power.py
index d74a95671e..8106c0d9a6 100644
--- a/ironic/drivers/modules/amt/power.py
+++ b/ironic/drivers/modules/amt/power.py
@@ -23,10 +23,7 @@ from oslo_utils import excutils
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base
diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py
index 7992312324..ffb22537f0 100644
--- a/ironic/drivers/modules/console_utils.py
+++ b/ironic/drivers/modules/console_utils.py
@@ -32,9 +32,7 @@ from oslo_service import loopingcall
 from oslo_utils import netutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import utils
 from ironic.conf import CONF
 
diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py
index 9b5dc0c716..e197ef869c 100644
--- a/ironic/drivers/modules/deploy_utils.py
+++ b/ironic/drivers/modules/deploy_utils.py
@@ -31,9 +31,7 @@ from six.moves.urllib import parse
 from ironic.common import dhcp_factory
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import image_service
 from ironic.common import keystone
 from ironic.common import states
diff --git a/ironic/drivers/modules/drac/job.py b/ironic/drivers/modules/drac/job.py
index e7cf94c30c..c8086d74f2 100644
--- a/ironic/drivers/modules/drac/job.py
+++ b/ironic/drivers/modules/drac/job.py
@@ -19,8 +19,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.drivers.modules.drac import common as drac_common
 
 drac_exceptions = importutils.try_import('dracclient.exceptions')
diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py
index 1799f1a07f..f1159ae1b4 100644
--- a/ironic/drivers/modules/drac/management.py
+++ b/ironic/drivers/modules/drac/management.py
@@ -24,8 +24,7 @@ from oslo_utils import importutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.conductor import task_manager
 from ironic.drivers import base
 from ironic.drivers.modules.drac import common as drac_common
diff --git a/ironic/drivers/modules/iboot.py b/ironic/drivers/modules/iboot.py
index 3b9c1cbe42..d01faf590e 100644
--- a/ironic/drivers/modules/iboot.py
+++ b/ironic/drivers/modules/iboot.py
@@ -26,8 +26,7 @@ from oslo_service import loopingcall
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py
index 1a5c5dae4c..7df57cd4a7 100644
--- a/ironic/drivers/modules/ilo/boot.py
+++ b/ironic/drivers/modules/ilo/boot.py
@@ -27,9 +27,7 @@ import six.moves.urllib.parse as urlparse
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import image_service
 from ironic.common import images
 from ironic.common import states
diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py
index b22e32ece8..269c0d56af 100644
--- a/ironic/drivers/modules/ilo/common.py
+++ b/ironic/drivers/modules/ilo/common.py
@@ -30,10 +30,7 @@ from six.moves.urllib.parse import urljoin
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import images
 from ironic.common import swift
 from ironic.common import utils
diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py
index 3e6213abd2..942f2f5e01 100644
--- a/ironic/drivers/modules/ilo/deploy.py
+++ b/ironic/drivers/modules/ilo/deploy.py
@@ -20,8 +20,7 @@ from oslo_log import log as logging
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LW
 from ironic.common import image_service
 from ironic.common import states
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ilo/inspect.py b/ironic/drivers/modules/ilo/inspect.py
index 9ff7a4b799..e7571816ee 100644
--- a/ironic/drivers/modules/ilo/inspect.py
+++ b/ironic/drivers/modules/ilo/inspect.py
@@ -16,9 +16,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LI, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import utils as conductor_utils
diff --git a/ironic/drivers/modules/ilo/power.py b/ironic/drivers/modules/ilo/power.py
index 53cd4082ca..9c13e66487 100644
--- a/ironic/drivers/modules/ilo/power.py
+++ b/ironic/drivers/modules/ilo/power.py
@@ -22,8 +22,7 @@ from oslo_utils import importutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.conductor import utils as manager_utils
diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py
index 533ce75835..541cce4400 100644
--- a/ironic/drivers/modules/image_cache.py
+++ b/ironic/drivers/modules/image_cache.py
@@ -30,8 +30,7 @@ import six
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _LI, _LW
 from ironic.common import image_service
 from ironic.common import images
 from ironic.common import utils
diff --git a/ironic/drivers/modules/inspector.py b/ironic/drivers/modules/inspector.py
index 59c5a31575..66c7833f3b 100644
--- a/ironic/drivers/modules/inspector.py
+++ b/ironic/drivers/modules/inspector.py
@@ -21,9 +21,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _, _LE, _LI
 from ironic.common import keystone
 from ironic.common import states
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py
index 45471f8806..a91a85b01d 100644
--- a/ironic/drivers/modules/ipminative.py
+++ b/ironic/drivers/modules/ipminative.py
@@ -29,9 +29,7 @@ from oslo_utils import strutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py
index 950cd06bed..6a8d5d4e97 100644
--- a/ironic/drivers/modules/ipmitool.py
+++ b/ironic/drivers/modules/ipmitool.py
@@ -48,10 +48,7 @@ import six
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py
index c4bc594733..c1d53bf247 100644
--- a/ironic/drivers/modules/irmc/boot.py
+++ b/ironic/drivers/modules/irmc/boot.py
@@ -27,9 +27,7 @@ from oslo_utils import importutils
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _, _LE, _LI
 from ironic.common import images
 from ironic.common import states
 from ironic.conductor import utils as manager_utils
diff --git a/ironic/drivers/modules/irmc/inspect.py b/ironic/drivers/modules/irmc/inspect.py
index a700e38ae1..91ef22025e 100644
--- a/ironic/drivers/modules/irmc/inspect.py
+++ b/ironic/drivers/modules/irmc/inspect.py
@@ -19,9 +19,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LI, _LW
 from ironic.common import states
 from ironic.drivers import base
 from ironic.drivers.modules.irmc import common as irmc_common
diff --git a/ironic/drivers/modules/irmc/management.py b/ironic/drivers/modules/irmc/management.py
index c46cfd10c6..b56e994337 100644
--- a/ironic/drivers/modules/irmc/management.py
+++ b/ironic/drivers/modules/irmc/management.py
@@ -20,8 +20,7 @@ from oslo_utils import importutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.conductor import task_manager
 from ironic.drivers.modules import ipmitool
 from ironic.drivers.modules.irmc import common as irmc_common
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index cdf2eafc33..5966b8ce62 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -19,8 +19,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base
diff --git a/ironic/drivers/modules/msftocs/msftocsclient.py b/ironic/drivers/modules/msftocs/msftocsclient.py
index 3c7d75829f..d511c68ada 100644
--- a/ironic/drivers/modules/msftocs/msftocsclient.py
+++ b/ironic/drivers/modules/msftocs/msftocsclient.py
@@ -27,8 +27,7 @@ from requests import auth
 from requests import exceptions as requests_exceptions
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 
 LOG = log.getLogger(__name__)
 
diff --git a/ironic/drivers/modules/msftocs/power.py b/ironic/drivers/modules/msftocs/power.py
index c04ae8116b..e5ce620667 100644
--- a/ironic/drivers/modules/msftocs/power.py
+++ b/ironic/drivers/modules/msftocs/power.py
@@ -19,8 +19,7 @@ MSFT OCS Power Driver
 from oslo_log import log
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base
diff --git a/ironic/drivers/modules/network/flat.py b/ironic/drivers/modules/network/flat.py
index 591c4e8dfe..ff3c540065 100644
--- a/ironic/drivers/modules/network/flat.py
+++ b/ironic/drivers/modules/network/flat.py
@@ -19,9 +19,7 @@ from oslo_log import log
 from oslo_utils import uuidutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LI, _LW
 from ironic.common import neutron
 from ironic.drivers import base
 
diff --git a/ironic/drivers/modules/network/neutron.py b/ironic/drivers/modules/network/neutron.py
index 7db4fd4ff6..82bbece2df 100644
--- a/ironic/drivers/modules/network/neutron.py
+++ b/ironic/drivers/modules/network/neutron.py
@@ -20,9 +20,7 @@ from oslo_log import log
 from oslo_utils import uuidutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LI, _LW
 from ironic.common import neutron
 from ironic.drivers import base
 from ironic import objects
diff --git a/ironic/drivers/modules/oneview/common.py b/ironic/drivers/modules/oneview/common.py
index 7114a5cd35..b3d40b58ab 100644
--- a/ironic/drivers/modules/oneview/common.py
+++ b/ironic/drivers/modules/oneview/common.py
@@ -17,8 +17,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conf import CONF
 from ironic.drivers import utils
diff --git a/ironic/drivers/modules/oneview/deploy.py b/ironic/drivers/modules/oneview/deploy.py
index 455e6e27e0..19262ca4c9 100644
--- a/ironic/drivers/modules/oneview/deploy.py
+++ b/ironic/drivers/modules/oneview/deploy.py
@@ -21,8 +21,7 @@ from oslo_log import log as logging
 import six
 
 from ironic.common import exception
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _LE, _LI
 from ironic.common import states
 from ironic.drivers.modules import agent
 from ironic.drivers.modules import iscsi_deploy
diff --git a/ironic/drivers/modules/oneview/deploy_utils.py b/ironic/drivers/modules/oneview/deploy_utils.py
index 6138fb6de3..b96f9885be 100644
--- a/ironic/drivers/modules/oneview/deploy_utils.py
+++ b/ironic/drivers/modules/oneview/deploy_utils.py
@@ -18,10 +18,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LI, _LW
 from ironic.common import states
 from ironic.drivers.modules.oneview import common
 
diff --git a/ironic/drivers/modules/oneview/power.py b/ironic/drivers/modules/oneview/power.py
index 17801e1827..dc4ebcfd86 100644
--- a/ironic/drivers/modules/oneview/power.py
+++ b/ironic/drivers/modules/oneview/power.py
@@ -18,8 +18,7 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base
diff --git a/ironic/drivers/modules/oneview/vendor.py b/ironic/drivers/modules/oneview/vendor.py
index 18001a6c65..d785bc738d 100644
--- a/ironic/drivers/modules/oneview/vendor.py
+++ b/ironic/drivers/modules/oneview/vendor.py
@@ -17,9 +17,7 @@
 from oslo_log import log
 import retrying
 
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LI, _LW
 from ironic.common import states
 from ironic.conductor import utils as manager_utils
 from ironic.drivers.modules import agent
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py
index 0ddf747aba..7e844c0de4 100644
--- a/ironic/drivers/modules/pxe.py
+++ b/ironic/drivers/modules/pxe.py
@@ -28,9 +28,7 @@ from ironic.common import boot_devices
 from ironic.common import dhcp_factory
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import image_service as service
 from ironic.common import pxe_utils
 from ironic.common import states
diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py
index a57c7a1639..818248bee6 100644
--- a/ironic/drivers/modules/seamicro.py
+++ b/ironic/drivers/modules/seamicro.py
@@ -28,9 +28,7 @@ from six.moves.urllib import parse as urlparse
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py
index af5d7b72b0..b8de688ec0 100644
--- a/ironic/drivers/modules/snmp.py
+++ b/ironic/drivers/modules/snmp.py
@@ -36,8 +36,7 @@ from oslo_utils import importutils
 import six
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py
index 99fe2c2353..fbf8803d0b 100644
--- a/ironic/drivers/modules/ssh.py
+++ b/ironic/drivers/modules/ssh.py
@@ -39,9 +39,7 @@ import retrying
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/ucs/helper.py b/ironic/drivers/modules/ucs/helper.py
index a907e0c284..b27e8c1c9c 100644
--- a/ironic/drivers/modules/ucs/helper.py
+++ b/ironic/drivers/modules/ucs/helper.py
@@ -21,8 +21,7 @@ from oslo_utils import importutils
 import six
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.drivers.modules import deploy_utils
 
 ucs_helper = importutils.try_import('UcsSdk.utils.helper')
diff --git a/ironic/drivers/modules/ucs/management.py b/ironic/drivers/modules/ucs/management.py
index 7a04e7657c..8f6a45a27b 100644
--- a/ironic/drivers/modules/ucs/management.py
+++ b/ironic/drivers/modules/ucs/management.py
@@ -23,8 +23,7 @@ from oslo_utils import importutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.drivers import base
 from ironic.drivers.modules.ucs import helper as ucs_helper
 
diff --git a/ironic/drivers/modules/ucs/power.py b/ironic/drivers/modules/ucs/power.py
index f819e8adae..2a18351695 100644
--- a/ironic/drivers/modules/ucs/power.py
+++ b/ironic/drivers/modules/ucs/power.py
@@ -22,8 +22,7 @@ from oslo_service import loopingcall
 from oslo_utils import importutils
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
+from ironic.common.i18n import _, _LE
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.conf import CONF
diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py
index e8095232eb..c3eda6a4cf 100644
--- a/ironic/drivers/modules/virtualbox.py
+++ b/ironic/drivers/modules/virtualbox.py
@@ -19,9 +19,7 @@ from oslo_utils import importutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/modules/wol.py b/ironic/drivers/modules/wol.py
index 34458166df..9c6d232029 100644
--- a/ironic/drivers/modules/wol.py
+++ b/ironic/drivers/modules/wol.py
@@ -24,8 +24,7 @@ import time
 from oslo_log import log
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LI
+from ironic.common.i18n import _, _LI
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
diff --git a/ironic/drivers/utils.py b/ironic/drivers/utils.py
index 60fe13fc15..10841f1a8f 100644
--- a/ironic/drivers/utils.py
+++ b/ironic/drivers/utils.py
@@ -22,9 +22,7 @@ from oslo_utils import timeutils
 import six
 
 from ironic.common import exception
-from ironic.common.i18n import _
-from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
+from ironic.common.i18n import _, _LE, _LW
 from ironic.common import swift
 from ironic.conductor import utils
 from ironic.drivers import base