baremetal: Move tests under tests/virt/baremetal

Change-Id: Ie066d5d4f53bc33338e160971af99ef637de7ad1

20 files changed, 21 insertions, 21 deletions

diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index cb2d14289..9b678ddd3 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -52,12 +52,12 @@ from nova.tests.api.openstack.compute.contrib import test_fping
 from nova.tests.api.openstack.compute.contrib import test_networks
 from nova.tests.api.openstack.compute.contrib import test_services
 from nova.tests.api.openstack import fakes
-from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests import fake_instance_actions
 from nova.tests import fake_network
 from nova.tests.image import fake
 from nova.tests.integrated import integrated_helpers
 from nova.tests import utils as test_utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
 from nova import utils
 from nova.volume import cinder
 
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py
index de5eb1b40..688db500d 100644
--- a/nova/tests/test_migrations.py
+++ b/nova/tests/test_migrations.py
@@ -1339,7 +1339,7 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn):
         super(TestBaremetalMigrations, self).__init__(*args, **kwargs)
 
         self.DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__),
-                                       'test_baremetal_migrations.conf')
+                'virt/baremetal/test_baremetal_migrations.conf')
         # Test machines can set the NOVA_TEST_MIGRATIONS_CONF variable
         # to override the location of the config file for migration testing
         self.CONFIG_FILE_PATH = os.environ.get(
diff --git a/nova/tests/baremetal/__init__.py b/nova/tests/virt/baremetal/__init__.py
index f15d84efc..34b09daac 100644
--- a/nova/tests/baremetal/__init__.py
+++ b/nova/tests/virt/baremetal/__init__.py
@@ -12,4 +12,4 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from nova.tests.baremetal import *
+from nova.tests.virt.baremetal import *
diff --git a/nova/tests/baremetal/db/__init__.py b/nova/tests/virt/baremetal/db/__init__.py
index 543dfc1ae..0f1f4e846 100644
--- a/nova/tests/baremetal/db/__init__.py
+++ b/nova/tests/virt/baremetal/db/__init__.py
@@ -12,4 +12,4 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from nova.tests.baremetal.db import *
+from nova.tests.virt.baremetal.db import *
diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/virt/baremetal/db/base.py
index 499eee32a..499eee32a 100644
--- a/nova/tests/baremetal/db/base.py
+++ b/nova/tests/virt/baremetal/db/base.py
diff --git a/nova/tests/baremetal/db/test_bm_interface.py b/nova/tests/virt/baremetal/db/test_bm_interface.py
index e870ec5e0..24b6ae1e1 100644
--- a/nova/tests/baremetal/db/test_bm_interface.py
+++ b/nova/tests/virt/baremetal/db/test_bm_interface.py
@@ -19,7 +19,7 @@ Bare-metal DB testcase for BareMetalInterface
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base
+from nova.tests.virt.baremetal.db import base
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/test_bm_node.py b/nova/tests/virt/baremetal/db/test_bm_node.py
index 204a6bf7b..0acd5a994 100644
--- a/nova/tests/baremetal/db/test_bm_node.py
+++ b/nova/tests/virt/baremetal/db/test_bm_node.py
@@ -18,8 +18,8 @@ Bare-Metal DB testcase for BareMetalNode
 """
 
 from nova import exception
-from nova.tests.baremetal.db import base
-from nova.tests.baremetal.db import utils
+from nova.tests.virt.baremetal.db import base
+from nova.tests.virt.baremetal.db import utils
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/test_bm_pxe_ip.py b/nova/tests/virt/baremetal/db/test_bm_pxe_ip.py
index fe8ba5b3e..85f3e2f4b 100644
--- a/nova/tests/baremetal/db/test_bm_pxe_ip.py
+++ b/nova/tests/virt/baremetal/db/test_bm_pxe_ip.py
@@ -19,8 +19,8 @@ Bare-metal DB testcase for BareMetalPxeIp
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base
-from nova.tests.baremetal.db import utils
+from nova.tests.virt.baremetal.db import base
+from nova.tests.virt.baremetal.db import utils
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/utils.py b/nova/tests/virt/baremetal/db/utils.py
index c3b3cff5f..c3b3cff5f 100644
--- a/nova/tests/baremetal/db/utils.py
+++ b/nova/tests/virt/baremetal/db/utils.py
diff --git a/nova/tests/test_baremetal_migrations.conf b/nova/tests/virt/baremetal/test_baremetal_migrations.conf
index 774f14994..774f14994 100644
--- a/nova/tests/test_baremetal_migrations.conf
+++ b/nova/tests/virt/baremetal/test_baremetal_migrations.conf
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/virt/baremetal/test_driver.py
index 3b0295a92..0564faf1e 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/virt/baremetal/test_driver.py
@@ -25,10 +25,10 @@ from oslo.config import cfg
 from nova.compute import power_state
 from nova import exception
 from nova import test
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import driver as bm_driver
diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/virt/baremetal/test_ipmi.py
index 01bb58d8b..ba7a875cf 100644
--- a/nova/tests/baremetal/test_ipmi.py
+++ b/nova/tests/virt/baremetal/test_ipmi.py
@@ -26,7 +26,7 @@ import tempfile
 from oslo.config import cfg
 
 from nova import test
-from nova.tests.baremetal.db import utils as bm_db_utils
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova import utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import ipmi
diff --git a/nova/tests/baremetal/test_nova_baremetal_deploy_helper.py b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py
index 42ee6c8e4..28f40bcf9 100644
--- a/nova/tests/baremetal/test_nova_baremetal_deploy_helper.py
+++ b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py
@@ -25,7 +25,7 @@ import mox
 from nova.cmd import baremetal_deploy_helper as bmdh
 from nova.openstack.common import log as logging
 from nova import test
-from nova.tests.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import base as bm_db_base
 from nova.virt.baremetal import db as bm_db
 
 bmdh.LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
diff --git a/nova/tests/baremetal/test_nova_baremetal_manage.py b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py
index 6be63aac2..6651e6ad4 100644
--- a/nova/tests/baremetal/test_nova_baremetal_manage.py
+++ b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 from nova.cmd import baremetal_manage as bm_man
-from nova.tests.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import base as bm_db_base
 
 
 class BareMetalDbCommandsTestCase(bm_db_base.BMDBTestCase):
diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/virt/baremetal/test_pxe.py
index 994a8ee35..022f9c692 100644
--- a/nova/tests/baremetal/test_pxe.py
+++ b/nova/tests/virt/baremetal/test_pxe.py
@@ -28,10 +28,10 @@ from testtools import matchers
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import pxe
diff --git a/nova/tests/baremetal/test_tilera.py b/nova/tests/virt/baremetal/test_tilera.py
index a30732a3d..488cba4df 100755
--- a/nova/tests/baremetal/test_tilera.py
+++ b/nova/tests/virt/baremetal/test_tilera.py
@@ -24,10 +24,10 @@ from oslo.config import cfg
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import tilera
diff --git a/nova/tests/baremetal/test_tilera_pdu.py b/nova/tests/virt/baremetal/test_tilera_pdu.py
index fee5bc49e..95d840574 100755
--- a/nova/tests/baremetal/test_tilera_pdu.py
+++ b/nova/tests/virt/baremetal/test_tilera_pdu.py
@@ -21,7 +21,7 @@
 from oslo.config import cfg
 
 from nova import test
-from nova.tests.baremetal.db import utils as bm_db_utils
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova import utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import tilera_pdu
diff --git a/nova/tests/baremetal/test_utils.py b/nova/tests/virt/baremetal/test_utils.py
index df5112deb..df5112deb 100644
--- a/nova/tests/baremetal/test_utils.py
+++ b/nova/tests/virt/baremetal/test_utils.py
diff --git a/nova/tests/baremetal/test_virtual_power_driver.py b/nova/tests/virt/baremetal/test_virtual_power_driver.py
index 5f4b5f0cb..58a1e4f08 100644
--- a/nova/tests/baremetal/test_virtual_power_driver.py
+++ b/nova/tests/virt/baremetal/test_virtual_power_driver.py
@@ -23,10 +23,10 @@ from oslo.config import cfg
 
 from nova import exception
 from nova.openstack.common import processutils
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import db
 from nova.virt.baremetal import virtual_power_driver
 import nova.virt.powervm.common as connection
diff --git a/nova/tests/baremetal/test_volume_driver.py b/nova/tests/virt/baremetal/test_volume_driver.py
index 24dadac94..24dadac94 100644
--- a/nova/tests/baremetal/test_volume_driver.py
+++ b/nova/tests/virt/baremetal/test_volume_driver.py