Rename utils.py to mgr_utils.py to avoid namespace collision

The file ironic/tests/unit/conductor/utils.py is used during testing but
there is also an ironic/conductor/utils.py and then it is confusing
which test_* file belongs to which file.

Rename utils.py to mgr_utils.py and rename the test file

Intentionally not renaming test_conductor_utils.py to test_utils.py at
this time as we would lose git history for the files. This is best done
in a follow-up patch.

Updated all import statements for unit tests using this file.

Change-Id: I5dfa1ffc01c5f54dc41a7caed83cd0bca3fb0be6

ironic/tests/unit/common/test_network.py

@@ -17,7 +17,7 @@ from oslo_utils import uuidutils
 
 from ironic.common import network
 from ironic.conductor import task_manager
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as object_utils

ironic/tests/unit/common/test_pxe_utils.py

@@ -22,7 +22,7 @@ import six
 
 from ironic.common import pxe_utils
 from ironic.conductor import task_manager
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as object_utils
 

ironic/tests/unit/conductor/test__mgr_utils.py

@@ -18,24 +18,24 @@
 """Tests for Ironic Manager test utils."""
 
 from ironic.tests import base
-from ironic.tests.unit.conductor import utils
+from ironic.tests.unit.conductor import mgr_utils
 
 
 class UtilsTestCase(base.TestCase):
 
     def test_fails_to_load_extension(self):
         self.assertRaises(AttributeError,
-                          utils.mock_the_extension_manager,
+                          mgr_utils.mock_the_extension_manager,
                           'fake',
                           'bad.namespace')
         self.assertRaises(AttributeError,
-                          utils.mock_the_extension_manager,
+                          mgr_utils.mock_the_extension_manager,
                           'no-such-driver',
                           'ironic.drivers')
 
     def test_get_mockable_ext_mgr(self):
-        (mgr, ext) = utils.mock_the_extension_manager('fake',
-                                                      'ironic.drivers')
+        (mgr, ext) = mgr_utils.mock_the_extension_manager('fake',
+                                                          'ironic.drivers')
 
         # confirm that stevedore did not scan the actual entrypoints
         self.assertNotEqual(mgr._extension_manager.namespace, 'ironic.drivers')

ironic/tests/unit/conductor/test_conductor_utils.py

@@ -20,7 +20,7 @@ from ironic.conductor import task_manager
 from ironic.conductor import utils as conductor_utils
 from ironic import objects
 from ironic.tests import base as tests_base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/conductor/test_manager.py

@@ -45,7 +45,7 @@ from ironic.drivers.modules import fake
 from ironic import objects
 from ironic.objects import base as obj_base
 from ironic.tests import base as tests_base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as tests_db_base
 from ironic.tests.unit.db import utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/dhcp/test_neutron.py

@@ -24,7 +24,7 @@ from ironic.common import exception
 from ironic.common import pxe_utils
 from ironic.conductor import task_manager
 from ironic.dhcp import neutron
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as object_utils
 

ironic/tests/unit/drivers/modules/amt/test_management.py

@@ -24,7 +24,7 @@ from ironic.conductor import task_manager
 from ironic.drivers.modules.amt import common as amt_common
 from ironic.drivers.modules.amt import management as amt_mgmt
 from ironic.drivers.modules.amt import resource_uris
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils

ironic/tests/unit/drivers/modules/amt/test_power.py

@@ -26,7 +26,7 @@ from ironic.drivers.modules.amt import common as amt_common
 from ironic.drivers.modules.amt import management as amt_mgmt
 from ironic.drivers.modules.amt import power as amt_power
 from ironic.drivers.modules.amt import resource_uris
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils

ironic/tests/unit/drivers/modules/amt/test_vendor.py

@@ -20,7 +20,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.amt import management as amt_mgmt
 from ironic.drivers.modules import iscsi_deploy
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/cimc/test_common.py

@@ -20,7 +20,7 @@ from oslo_utils import importutils
 from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.cimc import common as cimc_common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/drac/test_bios.py

@@ -27,7 +27,7 @@ from ironic.drivers.modules.drac import bios
 from ironic.drivers.modules.drac import client as drac_client
 from ironic.drivers.modules.drac import management as drac_mgmt
 from ironic.drivers.modules.drac import resource_uris
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import bios_wsman_mock

ironic/tests/unit/drivers/modules/drac/test_management.py

@@ -28,7 +28,7 @@ from ironic.drivers.modules.drac import client as drac_client
 from ironic.drivers.modules.drac import common as drac_common
 from ironic.drivers.modules.drac import management as drac_mgmt
 from ironic.drivers.modules.drac import resource_uris
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils

ironic/tests/unit/drivers/modules/drac/test_power.py

@@ -24,7 +24,7 @@ from ironic.drivers.modules.drac import client as drac_client
 from ironic.drivers.modules.drac import common as drac_common
 from ironic.drivers.modules.drac import power as drac_power
 from ironic.drivers.modules.drac import resource_uris
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers.modules.drac import utils as test_utils

ironic/tests/unit/drivers/modules/ilo/test_common.py

@@ -30,7 +30,7 @@ from ironic.common import swift
 from ironic.common import utils
 from ironic.conductor import task_manager
 from ironic.drivers.modules.ilo import common as ilo_common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ilo/test_deploy.py

@@ -38,7 +38,7 @@ from ironic.drivers.modules.ilo import common as ilo_common
 from ironic.drivers.modules.ilo import deploy as ilo_deploy
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ilo/test_inspect.py

@@ -28,7 +28,7 @@ from ironic.db import api as dbapi
 from ironic.drivers.modules.ilo import common as ilo_common
 from ironic.drivers.modules.ilo import inspect as ilo_inspect
 from ironic.drivers.modules.ilo import power as ilo_power
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ilo/test_management.py

@@ -24,7 +24,7 @@ from ironic.conductor import task_manager
 from ironic.drivers.modules.ilo import common as ilo_common
 from ironic.drivers.modules.ilo import management as ilo_management
 from ironic.drivers.modules import ipmitool
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ilo/test_power.py

@@ -26,7 +26,7 @@ from ironic.conductor import task_manager
 from ironic.conductor import utils as manager_utils
 from ironic.drivers.modules.ilo import common as ilo_common
 from ironic.drivers.modules.ilo import power as ilo_power
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/irmc/test_common.py

@@ -21,7 +21,7 @@ import mock
 from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.irmc import common as irmc_common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \

ironic/tests/unit/drivers/modules/irmc/test_deploy.py

@@ -39,7 +39,7 @@ from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules.irmc import common as irmc_common
 from ironic.drivers.modules.irmc import deploy as irmc_deploy
 from ironic.drivers.modules import iscsi_deploy
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/irmc/test_management.py

@@ -29,7 +29,7 @@ from ironic.drivers.modules import ipmitool
 from ironic.drivers.modules.irmc import common as irmc_common
 from ironic.drivers.modules.irmc import management as irmc_management
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \

ironic/tests/unit/drivers/modules/irmc/test_power.py

@@ -27,7 +27,7 @@ from ironic.conductor import utils as manager_utils
 from ironic.drivers.modules.irmc import common as irmc_common
 from ironic.drivers.modules.irmc import deploy as irmc_deploy
 from ironic.drivers.modules.irmc import power as irmc_power
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/msftocs/test_common.py

@@ -22,7 +22,7 @@ import mock
 from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.msftocs import common as msftocs_common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/msftocs/test_management.py

@@ -25,7 +25,7 @@ from ironic.conductor import task_manager
 from ironic.drivers.modules.msftocs import common as msftocs_common
 from ironic.drivers.modules.msftocs import msftocsclient
 from ironic.drivers import utils as drivers_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/msftocs/test_power.py

@@ -24,7 +24,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.msftocs import common as msftocs_common
 from ironic.drivers.modules.msftocs import msftocsclient
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/oneview/test_common.py

@@ -22,7 +22,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.oneview import common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/drivers/modules/oneview/test_management.py

@@ -25,7 +25,7 @@ from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.oneview import common
 from ironic.drivers.modules.oneview import management
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/oneview/test_power.py

@@ -24,7 +24,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.oneview import common
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/oneview/test_vendor.py

@@ -28,7 +28,7 @@ from ironic.drivers.modules import agent_client
 from ironic.drivers.modules.oneview import power
 from ironic.drivers.modules.oneview import vendor
 from ironic.drivers.modules import pxe
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_agent.py

@@ -30,7 +30,7 @@ from ironic.drivers.modules import agent_client
 from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import fake
 from ironic.drivers.modules import pxe
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as object_utils

ironic/tests/unit/drivers/modules/test_agent_base_vendor.py

@@ -31,7 +31,7 @@ from ironic.drivers.modules import agent_client
 from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import fake
 from ironic import objects
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as object_utils

ironic/tests/unit/drivers/modules/test_deploy_utils.py

@@ -47,7 +47,7 @@ from ironic.drivers.modules import image_cache
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers.modules import pxe
 from ironic.tests import base as tests_base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_iboot.py

@@ -26,7 +26,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import iboot
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_inspector.py

@@ -20,7 +20,7 @@ from ironic.common import keystone
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import inspector
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/drivers/modules/test_ipminative.py

@@ -31,7 +31,7 @@ from ironic.conductor import task_manager
 from ironic.drivers.modules import console_utils
 from ironic.drivers.modules import ipminative
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_ipmitool.py

@@ -43,7 +43,7 @@ from ironic.drivers.modules import console_utils
 from ironic.drivers.modules import ipmitool as ipmi
 from ironic.drivers import utils as driver_utils
 from ironic.tests import base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_iscsi_deploy.py

@@ -38,7 +38,7 @@ from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import fake
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers.modules import pxe
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_pxe.py

@@ -34,7 +34,7 @@ from ironic.common import utils
 from ironic.conductor import task_manager
 from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import pxe
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_seamicro.py

@@ -26,7 +26,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import console_utils
 from ironic.drivers.modules import seamicro
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_snmp.py

@@ -32,7 +32,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import snmp as snmp
 from ironic.tests import base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_ssh.py

@@ -31,7 +31,7 @@ from ironic.common import utils
 from ironic.conductor import task_manager
 from ironic.drivers.modules import ssh
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/test_virtualbox.py

@@ -22,7 +22,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import virtualbox
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/drivers/modules/test_wol.py

@@ -26,7 +26,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import wol
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/drivers/modules/ucs/test_helper.py

@@ -22,7 +22,7 @@ from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.db import api as dbapi
 from ironic.drivers.modules.ucs import helper as ucs_helper
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ucs/test_management.py

@@ -25,7 +25,7 @@ from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.ucs import helper as ucs_helper
 from ironic.drivers.modules.ucs import management as ucs_mgmt
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/modules/ucs/test_power.py

@@ -22,7 +22,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.ucs import helper as ucs_helper
 from ironic.drivers.modules.ucs import power as ucs_power
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils

ironic/tests/unit/drivers/test_fake.py

@@ -25,7 +25,7 @@ from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base as driver_base
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils
 

ironic/tests/unit/drivers/test_utils.py

@@ -21,7 +21,7 @@ from ironic.conductor import task_manager
 from ironic.conductor import utils as manager_utils
 from ironic.drivers.modules import fake
 from ironic.drivers import utils as driver_utils
-from ironic.tests.unit.conductor import utils as mgr_utils
+from ironic.tests.unit.conductor import mgr_utils
 from ironic.tests.unit.db import base as db_base
 from ironic.tests.unit.objects import utils as obj_utils