6 files changed, 11 insertions, 10 deletions
diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/baremetal/db/base.py
index 37e51fe79..499eee32a 100644
--- a/nova/tests/baremetal/db/base.py
+++ b/nova/tests/baremetal/db/base.py
@@ -15,8 +15,9 @@
 
 """Bare-metal DB test base class."""
 
+from oslo.config import cfg
+
 from nova import context as nova_context
-from nova.openstack.common import cfg
 from nova import test
 from nova.virt.baremetal.db import migration as bm_migration
 from nova.virt.baremetal.db.sqlalchemy import session as bm_session
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py
index 37ef71881..a4bcc8128 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/baremetal/test_driver.py
@@ -20,8 +20,9 @@
 
 """Tests for the base baremetal driver class."""
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 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
diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/baremetal/test_ipmi.py
index 87800cb47..faf800a46 100644
--- a/nova/tests/baremetal/test_ipmi.py
+++ b/nova/tests/baremetal/test_ipmi.py
@@ -23,7 +23,8 @@ import os
 import stat
 import tempfile
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova import test
 from nova.tests.baremetal.db import utils as bm_db_utils
 from nova import utils
diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/baremetal/test_pxe.py
index 9703feb40..2f3ac5158 100644
--- a/nova/tests/baremetal/test_pxe.py
+++ b/nova/tests/baremetal/test_pxe.py
@@ -21,10 +21,10 @@
 
 import os
 
+from oslo.config import cfg
 from testtools import matchers
 
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests.baremetal.db import utils as bm_db_utils
diff --git a/nova/tests/baremetal/test_virtual_power_driver.py b/nova/tests/baremetal/test_virtual_power_driver.py
index 689677698..5a38ed87b 100644
--- a/nova/tests/baremetal/test_virtual_power_driver.py
+++ b/nova/tests/baremetal/test_virtual_power_driver.py
@@ -19,16 +19,14 @@
 """Tests for baremetal virtual power driver."""
 
 import mox
+from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import cfg
-from nova import utils as nutils
-
 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 import utils as nutils
 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/baremetal/test_volume_driver.py
index c83277516..24dadac94 100644
--- a/nova/tests/baremetal/test_volume_driver.py
+++ b/nova/tests/baremetal/test_volume_driver.py
@@ -15,9 +15,9 @@
 
 """Tests for baremetal volume driver."""
 
-from nova.openstack.common import cfg
-from nova import test
+from oslo.config import cfg
 
+from nova import test
 from nova.virt.baremetal import volume_driver
 
 CONF = cfg.CONF