Move unit tests to correct directory

Move unit tests that test ironic/drivers/modules/*
from ironic/tests/drivers/* to ironic/tests/drivers/modules/*

Update any unit test imports that were broken by move.

Change-Id: Ic5c2e4143ad76e9d910a4361483dc09145dc1dff

56 files changed, 10 insertions, 10 deletions

diff --git a/ironic/tests/unit/drivers/amt/__init__.py b/ironic/tests/unit/drivers/modules/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/amt/__init__.py
+++ b/ironic/tests/unit/drivers/modules/__init__.py
diff --git a/ironic/tests/unit/drivers/cimc/__init__.py b/ironic/tests/unit/drivers/modules/amt/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/cimc/__init__.py
+++ b/ironic/tests/unit/drivers/modules/amt/__init__.py
diff --git a/ironic/tests/unit/drivers/amt/test_common.py b/ironic/tests/unit/drivers/modules/amt/test_common.py
index 6c80036ea..d6ab30f5c 100644
--- a/ironic/tests/unit/drivers/amt/test_common.py
+++ b/ironic/tests/unit/drivers/modules/amt/test_common.py
@@ -24,7 +24,7 @@ from ironic.drivers.modules.amt import resource_uris
 from ironic.tests.unit import base
 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.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 from ironic.tests.unit.objects import utils as obj_utils
diff --git a/ironic/tests/unit/drivers/amt/test_management.py b/ironic/tests/unit/drivers/modules/amt/test_management.py
index 4d567c480..2935389a7 100644
--- a/ironic/tests/unit/drivers/amt/test_management.py
+++ b/ironic/tests/unit/drivers/modules/amt/test_management.py
@@ -27,7 +27,7 @@ from ironic.drivers.modules.amt import resource_uris
 from ironic.tests.unit.conductor import utils as 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.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 from ironic.tests.unit.objects import utils as obj_utils
diff --git a/ironic/tests/unit/drivers/amt/test_power.py b/ironic/tests/unit/drivers/modules/amt/test_power.py
index 1d203a441..878f71d5f 100644
--- a/ironic/tests/unit/drivers/amt/test_power.py
+++ b/ironic/tests/unit/drivers/modules/amt/test_power.py
@@ -29,7 +29,7 @@ from ironic.drivers.modules.amt import resource_uris
 from ironic.tests.unit.conductor import utils as 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.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.objects import utils as obj_utils
 
 INFO_DICT = db_utils.get_test_amt_info()
diff --git a/ironic/tests/unit/drivers/amt/test_vendor.py b/ironic/tests/unit/drivers/modules/amt/test_vendor.py
index 07d893251..07d893251 100644
--- a/ironic/tests/unit/drivers/amt/test_vendor.py
+++ b/ironic/tests/unit/drivers/modules/amt/test_vendor.py
diff --git a/ironic/tests/unit/drivers/drac/__init__.py b/ironic/tests/unit/drivers/modules/cimc/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/drac/__init__.py
+++ b/ironic/tests/unit/drivers/modules/cimc/__init__.py
diff --git a/ironic/tests/unit/drivers/cimc/test_common.py b/ironic/tests/unit/drivers/modules/cimc/test_common.py
index 0924f81de..0924f81de 100644
--- a/ironic/tests/unit/drivers/cimc/test_common.py
+++ b/ironic/tests/unit/drivers/modules/cimc/test_common.py
diff --git a/ironic/tests/unit/drivers/cimc/test_management.py b/ironic/tests/unit/drivers/modules/cimc/test_management.py
index 49f42a386..3a8d53493 100644
--- a/ironic/tests/unit/drivers/cimc/test_management.py
+++ b/ironic/tests/unit/drivers/modules/cimc/test_management.py
@@ -20,7 +20,7 @@ from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.conductor import task_manager
 from ironic.drivers.modules.cimc import common
-from ironic.tests.unit.drivers.cimc import test_common
+from ironic.tests.unit.drivers.modules.cimc import test_common
 
 imcsdk = importutils.try_import('ImcSdk')
 
diff --git a/ironic/tests/unit/drivers/cimc/test_power.py b/ironic/tests/unit/drivers/modules/cimc/test_power.py
index 57ac5d97f..f6a05bb8d 100644
--- a/ironic/tests/unit/drivers/cimc/test_power.py
+++ b/ironic/tests/unit/drivers/modules/cimc/test_power.py
@@ -22,7 +22,7 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules.cimc import common
 from ironic.drivers.modules.cimc import power
-from ironic.tests.unit.drivers.cimc import test_common
+from ironic.tests.unit.drivers.modules.cimc import test_common
 
 imcsdk = importutils.try_import('ImcSdk')
 
diff --git a/ironic/tests/unit/drivers/ilo/__init__.py b/ironic/tests/unit/drivers/modules/drac/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/ilo/__init__.py
+++ b/ironic/tests/unit/drivers/modules/drac/__init__.py
diff --git a/ironic/tests/unit/drivers/drac/bios_wsman_mock.py b/ironic/tests/unit/drivers/modules/drac/bios_wsman_mock.py
index 245d27c01..245d27c01 100644
--- a/ironic/tests/unit/drivers/drac/bios_wsman_mock.py
+++ b/ironic/tests/unit/drivers/modules/drac/bios_wsman_mock.py
diff --git a/ironic/tests/unit/drivers/drac/test_bios.py b/ironic/tests/unit/drivers/modules/drac/test_bios.py
index e3f2c4e39..8d62c152e 100644
--- a/ironic/tests/unit/drivers/drac/test_bios.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_bios.py
@@ -30,8 +30,8 @@ from ironic.drivers.modules.drac import resource_uris
 from ironic.tests.unit.conductor import utils as 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.drac import bios_wsman_mock
-from ironic.tests.unit.drivers.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import bios_wsman_mock
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.objects import utils as obj_utils
 from six.moves.urllib.parse import unquote
 
diff --git a/ironic/tests/unit/drivers/drac/test_client.py b/ironic/tests/unit/drivers/modules/drac/test_client.py
index 93f8fbb24..c31a1b78e 100644
--- a/ironic/tests/unit/drivers/drac/test_client.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_client.py
@@ -24,7 +24,7 @@ from ironic.common import exception
 from ironic.drivers.modules.drac import client as drac_client
 from ironic.tests.unit import base
 from ironic.tests.unit.db import utils as db_utils
-from ironic.tests.unit.drivers.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 
diff --git a/ironic/tests/unit/drivers/drac/test_common.py b/ironic/tests/unit/drivers/modules/drac/test_common.py
index 2f2b7b7d4..2f2b7b7d4 100644
--- a/ironic/tests/unit/drivers/drac/test_common.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_common.py
diff --git a/ironic/tests/unit/drivers/drac/test_management.py b/ironic/tests/unit/drivers/modules/drac/test_management.py
index 249f31bdd..c8e348931 100644
--- a/ironic/tests/unit/drivers/drac/test_management.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_management.py
@@ -31,7 +31,7 @@ from ironic.drivers.modules.drac import resource_uris
 from ironic.tests.unit.conductor import utils as 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.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 from ironic.tests.unit.objects import utils as obj_utils
diff --git a/ironic/tests/unit/drivers/drac/test_power.py b/ironic/tests/unit/drivers/modules/drac/test_power.py
index 26cf2f25f..9b4587ef7 100644
--- a/ironic/tests/unit/drivers/drac/test_power.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_power.py
@@ -27,7 +27,7 @@ from ironic.drivers.modules.drac import resource_uris
 from ironic.tests.unit.conductor import utils as mgr_utils
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils as db_utils
-from ironic.tests.unit.drivers.drac import utils as test_utils
+from ironic.tests.unit.drivers.modules.drac import utils as test_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 
diff --git a/ironic/tests/unit/drivers/drac/utils.py b/ironic/tests/unit/drivers/modules/drac/utils.py
index 6338f7168..6338f7168 100644
--- a/ironic/tests/unit/drivers/drac/utils.py
+++ b/ironic/tests/unit/drivers/modules/drac/utils.py
diff --git a/ironic/tests/unit/drivers/irmc/__init__.py b/ironic/tests/unit/drivers/modules/ilo/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/irmc/__init__.py
+++ b/ironic/tests/unit/drivers/modules/ilo/__init__.py
diff --git a/ironic/tests/unit/drivers/ilo/test_common.py b/ironic/tests/unit/drivers/modules/ilo/test_common.py
index 10b1ad305..10b1ad305 100644
--- a/ironic/tests/unit/drivers/ilo/test_common.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_common.py
diff --git a/ironic/tests/unit/drivers/ilo/test_deploy.py b/ironic/tests/unit/drivers/modules/ilo/test_deploy.py
index 451761bed..451761bed 100644
--- a/ironic/tests/unit/drivers/ilo/test_deploy.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_deploy.py
diff --git a/ironic/tests/unit/drivers/ilo/test_inspect.py b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
index 94ddbdd45..94ddbdd45 100644
--- a/ironic/tests/unit/drivers/ilo/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
diff --git a/ironic/tests/unit/drivers/ilo/test_management.py b/ironic/tests/unit/drivers/modules/ilo/test_management.py
index a3a9b7910..a3a9b7910 100644
--- a/ironic/tests/unit/drivers/ilo/test_management.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_management.py
diff --git a/ironic/tests/unit/drivers/ilo/test_power.py b/ironic/tests/unit/drivers/modules/ilo/test_power.py
index 13fade795..13fade795 100644
--- a/ironic/tests/unit/drivers/ilo/test_power.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_power.py
diff --git a/ironic/tests/unit/drivers/msftocs/__init__.py b/ironic/tests/unit/drivers/modules/irmc/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/msftocs/__init__.py
+++ b/ironic/tests/unit/drivers/modules/irmc/__init__.py
diff --git a/ironic/tests/unit/drivers/irmc/fake_sensors_data_ng.xml b/ironic/tests/unit/drivers/modules/irmc/fake_sensors_data_ng.xml
index c8788427b..c8788427b 100644
--- a/ironic/tests/unit/drivers/irmc/fake_sensors_data_ng.xml
+++ b/ironic/tests/unit/drivers/modules/irmc/fake_sensors_data_ng.xml
diff --git a/ironic/tests/unit/drivers/irmc/fake_sensors_data_ok.xml b/ironic/tests/unit/drivers/modules/irmc/fake_sensors_data_ok.xml
index fb8edba68..fb8edba68 100644
--- a/ironic/tests/unit/drivers/irmc/fake_sensors_data_ok.xml
+++ b/ironic/tests/unit/drivers/modules/irmc/fake_sensors_data_ok.xml
diff --git a/ironic/tests/unit/drivers/irmc/test_common.py b/ironic/tests/unit/drivers/modules/irmc/test_common.py
index 0876e76d0..0876e76d0 100644
--- a/ironic/tests/unit/drivers/irmc/test_common.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_common.py
diff --git a/ironic/tests/unit/drivers/irmc/test_deploy.py b/ironic/tests/unit/drivers/modules/irmc/test_deploy.py
index bba950cbf..bba950cbf 100644
--- a/ironic/tests/unit/drivers/irmc/test_deploy.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_deploy.py
diff --git a/ironic/tests/unit/drivers/irmc/test_management.py b/ironic/tests/unit/drivers/modules/irmc/test_management.py
index be75321ce..be75321ce 100644
--- a/ironic/tests/unit/drivers/irmc/test_management.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_management.py
diff --git a/ironic/tests/unit/drivers/irmc/test_power.py b/ironic/tests/unit/drivers/modules/irmc/test_power.py
index 1b51f9eac..1b51f9eac 100644
--- a/ironic/tests/unit/drivers/irmc/test_power.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_power.py
diff --git a/ironic/tests/unit/drivers/ucs/__init__.py b/ironic/tests/unit/drivers/modules/msftocs/__init__.py
index e69de29bb..e69de29bb 100644
--- a/ironic/tests/unit/drivers/ucs/__init__.py
+++ b/ironic/tests/unit/drivers/modules/msftocs/__init__.py
diff --git a/ironic/tests/unit/drivers/msftocs/test_common.py b/ironic/tests/unit/drivers/modules/msftocs/test_common.py
index c5891a743..c5891a743 100644
--- a/ironic/tests/unit/drivers/msftocs/test_common.py
+++ b/ironic/tests/unit/drivers/modules/msftocs/test_common.py
diff --git a/ironic/tests/unit/drivers/msftocs/test_management.py b/ironic/tests/unit/drivers/modules/msftocs/test_management.py
index a121a778d..a121a778d 100644
--- a/ironic/tests/unit/drivers/msftocs/test_management.py
+++ b/ironic/tests/unit/drivers/modules/msftocs/test_management.py
diff --git a/ironic/tests/unit/drivers/msftocs/test_msftocsclient.py b/ironic/tests/unit/drivers/modules/msftocs/test_msftocsclient.py
index 15be486c5..15be486c5 100644
--- a/ironic/tests/unit/drivers/msftocs/test_msftocsclient.py
+++ b/ironic/tests/unit/drivers/modules/msftocs/test_msftocsclient.py
diff --git a/ironic/tests/unit/drivers/msftocs/test_power.py b/ironic/tests/unit/drivers/modules/msftocs/test_power.py
index aeeabe710..aeeabe710 100644
--- a/ironic/tests/unit/drivers/msftocs/test_power.py
+++ b/ironic/tests/unit/drivers/modules/msftocs/test_power.py
diff --git a/ironic/tests/unit/drivers/test_agent.py b/ironic/tests/unit/drivers/modules/test_agent.py
index 41fe87a77..41fe87a77 100644
--- a/ironic/tests/unit/drivers/test_agent.py
+++ b/ironic/tests/unit/drivers/modules/test_agent.py
diff --git a/ironic/tests/unit/drivers/test_agent_base_vendor.py b/ironic/tests/unit/drivers/modules/test_agent_base_vendor.py
index 2cf23ab3e..2cf23ab3e 100644
--- a/ironic/tests/unit/drivers/test_agent_base_vendor.py
+++ b/ironic/tests/unit/drivers/modules/test_agent_base_vendor.py
diff --git a/ironic/tests/unit/drivers/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py
index 223844882..223844882 100644
--- a/ironic/tests/unit/drivers/test_agent_client.py
+++ b/ironic/tests/unit/drivers/modules/test_agent_client.py
diff --git a/ironic/tests/unit/drivers/test_console_utils.py b/ironic/tests/unit/drivers/modules/test_console_utils.py
index 23762e9f8..23762e9f8 100644
--- a/ironic/tests/unit/drivers/test_console_utils.py
+++ b/ironic/tests/unit/drivers/modules/test_console_utils.py
diff --git a/ironic/tests/unit/drivers/test_deploy_utils.py b/ironic/tests/unit/drivers/modules/test_deploy_utils.py
index d43e7e716..d43e7e716 100644
--- a/ironic/tests/unit/drivers/test_deploy_utils.py
+++ b/ironic/tests/unit/drivers/modules/test_deploy_utils.py
diff --git a/ironic/tests/unit/drivers/test_iboot.py b/ironic/tests/unit/drivers/modules/test_iboot.py
index 2ad9ed09f..2ad9ed09f 100644
--- a/ironic/tests/unit/drivers/test_iboot.py
+++ b/ironic/tests/unit/drivers/modules/test_iboot.py
diff --git a/ironic/tests/unit/drivers/test_image_cache.py b/ironic/tests/unit/drivers/modules/test_image_cache.py
index 447db0a99..447db0a99 100644
--- a/ironic/tests/unit/drivers/test_image_cache.py
+++ b/ironic/tests/unit/drivers/modules/test_image_cache.py
diff --git a/ironic/tests/unit/drivers/test_inspector.py b/ironic/tests/unit/drivers/modules/test_inspector.py
index 349acb4b8..349acb4b8 100644
--- a/ironic/tests/unit/drivers/test_inspector.py
+++ b/ironic/tests/unit/drivers/modules/test_inspector.py
diff --git a/ironic/tests/unit/drivers/test_ipminative.py b/ironic/tests/unit/drivers/modules/test_ipminative.py
index 8cc1ecf87..8cc1ecf87 100644
--- a/ironic/tests/unit/drivers/test_ipminative.py
+++ b/ironic/tests/unit/drivers/modules/test_ipminative.py
diff --git a/ironic/tests/unit/drivers/test_ipmitool.py b/ironic/tests/unit/drivers/modules/test_ipmitool.py
index 6a80b7ea9..6a80b7ea9 100644
--- a/ironic/tests/unit/drivers/test_ipmitool.py
+++ b/ironic/tests/unit/drivers/modules/test_ipmitool.py
diff --git a/ironic/tests/unit/drivers/test_iscsi_deploy.py b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py
index 261f11766..261f11766 100644
--- a/ironic/tests/unit/drivers/test_iscsi_deploy.py
+++ b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py
diff --git a/ironic/tests/unit/drivers/test_seamicro.py b/ironic/tests/unit/drivers/modules/test_seamicro.py
index 63d816112..63d816112 100644
--- a/ironic/tests/unit/drivers/test_seamicro.py
+++ b/ironic/tests/unit/drivers/modules/test_seamicro.py
diff --git a/ironic/tests/unit/drivers/test_snmp.py b/ironic/tests/unit/drivers/modules/test_snmp.py
index 5842739f0..5842739f0 100644
--- a/ironic/tests/unit/drivers/test_snmp.py
+++ b/ironic/tests/unit/drivers/modules/test_snmp.py
diff --git a/ironic/tests/unit/drivers/test_ssh.py b/ironic/tests/unit/drivers/modules/test_ssh.py
index a7c25667c..a7c25667c 100644
--- a/ironic/tests/unit/drivers/test_ssh.py
+++ b/ironic/tests/unit/drivers/modules/test_ssh.py
diff --git a/ironic/tests/unit/drivers/test_virtualbox.py b/ironic/tests/unit/drivers/modules/test_virtualbox.py
index a854cb553..a854cb553 100644
--- a/ironic/tests/unit/drivers/test_virtualbox.py
+++ b/ironic/tests/unit/drivers/modules/test_virtualbox.py
diff --git a/ironic/tests/unit/drivers/test_wol.py b/ironic/tests/unit/drivers/modules/test_wol.py
index f8e02e298..f8e02e298 100644
--- a/ironic/tests/unit/drivers/test_wol.py
+++ b/ironic/tests/unit/drivers/modules/test_wol.py
diff --git a/ironic/tests/unit/drivers/modules/ucs/__init__.py b/ironic/tests/unit/drivers/modules/ucs/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ironic/tests/unit/drivers/modules/ucs/__init__.py
diff --git a/ironic/tests/unit/drivers/ucs/test_helper.py b/ironic/tests/unit/drivers/modules/ucs/test_helper.py
index c83e82d46..c83e82d46 100644
--- a/ironic/tests/unit/drivers/ucs/test_helper.py
+++ b/ironic/tests/unit/drivers/modules/ucs/test_helper.py
diff --git a/ironic/tests/unit/drivers/ucs/test_management.py b/ironic/tests/unit/drivers/modules/ucs/test_management.py
index 17101756b..17101756b 100644
--- a/ironic/tests/unit/drivers/ucs/test_management.py
+++ b/ironic/tests/unit/drivers/modules/ucs/test_management.py
diff --git a/ironic/tests/unit/drivers/ucs/test_power.py b/ironic/tests/unit/drivers/modules/ucs/test_power.py
index a01a96bbd..a01a96bbd 100644
--- a/ironic/tests/unit/drivers/ucs/test_power.py
+++ b/ironic/tests/unit/drivers/modules/ucs/test_power.py