Merge "Use oslo.utils instead of ironic.openstack.common"

6 files changed, 13 insertions, 8 deletions

diff --git a/ironic/drivers/drac.py b/ironic/drivers/drac.py
index 97e76e754..05df2b81d 100644
--- a/ironic/drivers/drac.py
+++ b/ironic/drivers/drac.py
@@ -14,13 +14,14 @@
 DRAC Driver for remote system management using Dell Remote Access Card.
 """
 
+from oslo.utils import importutils
+
 from ironic.common import exception
 from ironic.common.i18n import _
 from ironic.drivers import base
 from ironic.drivers.modules.drac import management
 from ironic.drivers.modules.drac import power
 from ironic.drivers.modules import pxe
-from ironic.openstack.common import importutils
 
 
 class PXEDracDriver(base.BaseDriver):
diff --git a/ironic/drivers/modules/drac/client.py b/ironic/drivers/modules/drac/client.py
index 73cfe13cf..07a3acfbc 100644
--- a/ironic/drivers/modules/drac/client.py
+++ b/ironic/drivers/modules/drac/client.py
@@ -17,8 +17,9 @@ Wrapper for pywsman.Client
 
 from xml.etree import ElementTree
 
+from oslo.utils import importutils
+
 from ironic.common import exception
-from ironic.openstack.common import importutils
 
 pywsman = importutils.try_import('pywsman')
 
diff --git a/ironic/drivers/modules/drac/common.py b/ironic/drivers/modules/drac/common.py
index dddf68bbc..045791308 100644
--- a/ironic/drivers/modules/drac/common.py
+++ b/ironic/drivers/modules/drac/common.py
@@ -15,10 +15,11 @@
 Common functionalities shared between different DRAC modules.
 """
 
+from oslo.utils import importutils
+
 from ironic.common import exception
 from ironic.common.i18n import _
 from ironic.drivers.modules.drac import client as drac_client
-from ironic.openstack.common import importutils
 
 pywsman = importutils.try_import('pywsman')
 
diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py
index 4598f078b..30fe8a23b 100644
--- a/ironic/drivers/modules/drac/management.py
+++ b/ironic/drivers/modules/drac/management.py
@@ -19,14 +19,15 @@
 DRAC Management Driver
 """
 
+from oslo.utils import excutils
+from oslo.utils import importutils
+
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common import i18n
 from ironic.drivers import base
 from ironic.drivers.modules.drac import common as drac_common
 from ironic.drivers.modules.drac import resource_uris
-from ironic.openstack.common import excutils
-from ironic.openstack.common import importutils
 from ironic.openstack.common import log as logging
 
 pywsman = importutils.try_import('pywsman')
diff --git a/ironic/drivers/modules/drac/power.py b/ironic/drivers/modules/drac/power.py
index b53281724..66ce3645e 100644
--- a/ironic/drivers/modules/drac/power.py
+++ b/ironic/drivers/modules/drac/power.py
@@ -15,14 +15,15 @@
 DRAC Power Driver using the Base Server Profile
 """
 
+from oslo.utils import excutils
+from oslo.utils import importutils
+
 from ironic.common import exception
 from ironic.common import i18n
 from ironic.common import states
 from ironic.drivers import base
 from ironic.drivers.modules.drac import common as drac_common
 from ironic.drivers.modules.drac import resource_uris
-from ironic.openstack.common import excutils
-from ironic.openstack.common import importutils
 from ironic.openstack.common import log as logging
 
 pywsman = importutils.try_import('pywsman')
diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py
index 620de6859..efeb58b5c 100644
--- a/ironic/drivers/modules/iscsi_deploy.py
+++ b/ironic/drivers/modules/iscsi_deploy.py
@@ -16,6 +16,7 @@
 import os
 
 from oslo.config import cfg
+from oslo.utils import strutils
 
 from ironic.common import exception
 from ironic.common import i18n
@@ -30,7 +31,6 @@ from ironic.drivers.modules import image_cache
 from ironic.drivers import utils as driver_utils
 from ironic.openstack.common import fileutils
 from ironic.openstack.common import log as logging
-from ironic.openstack.common import strutils
 
 LOG = logging.getLogger(__name__)