Merge "Move baremetal options to [BAREMETAL] OptGroup"

3 files changed, 18 insertions, 12 deletions

diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/baremetal/db/base.py
index f2b905895..37e51fe79 100644
--- a/nova/tests/baremetal/db/base.py
+++ b/nova/tests/baremetal/db/base.py
@@ -24,8 +24,9 @@ from nova.virt.baremetal.db.sqlalchemy import session as bm_session
 _DB_CACHE = None
 
 CONF = cfg.CONF
-CONF.import_opt('baremetal_sql_connection',
-                'nova.virt.baremetal.db.sqlalchemy.session')
+CONF.import_opt('sql_connection',
+                'nova.virt.baremetal.db.sqlalchemy.session',
+                group='baremetal')
 
 
 class Database(test.Database):
@@ -38,11 +39,11 @@ class BMDBTestCase(test.TestCase):
 
     def setUp(self):
         super(BMDBTestCase, self).setUp()
-        self.flags(baremetal_sql_connection='sqlite://')
+        self.flags(sql_connection='sqlite://', group='baremetal')
         global _DB_CACHE
         if not _DB_CACHE:
             _DB_CACHE = Database(bm_session, bm_migration,
-                                 sql_connection=CONF.baremetal_sql_connection,
+                                 sql_connection=CONF.baremetal.sql_connection,
                                  sqlite_db=None,
                                  sqlite_clean_db=None)
         self.useFixture(_DB_CACHE)
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py
index c62c01aac..b12336da0 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/baremetal/test_driver.py
@@ -64,14 +64,18 @@ def class_path(class_):
 
 
 COMMON_FLAGS = dict(
-    baremetal_sql_connection='sqlite:///:memory:',
-    baremetal_driver='nova.virt.baremetal.fake.Fake',
-    power_manager='nova.virt.baremetal.fake.FakePowerManager',
-    baremetal_vif_driver=class_path(FakeVifDriver),
     firewall_driver=class_path(FakeFirewallDriver),
-    baremetal_volume_driver=class_path(FakeVolumeDriver),
-    instance_type_extra_specs=['cpu_arch:test'],
+)
+
+BAREMETAL_FLAGS = dict(
+    driver='nova.virt.baremetal.fake.Fake',
     host=NODE['service_host'],
+    instance_type_extra_specs=['cpu_arch:test'],
+    power_manager='nova.virt.baremetal.fake.FakePowerManager',
+    sql_connection='sqlite:///:memory:',
+    vif_driver=class_path(FakeVifDriver),
+    volume_driver=class_path(FakeVolumeDriver),
+    group='baremetal',
 )
 
 
@@ -92,6 +96,7 @@ class BaremetalDriverSpawnTestCase(base.Database):
     def setUp(self):
         super(BaremetalDriverSpawnTestCase, self).setUp()
         self.flags(**COMMON_FLAGS)
+        self.flags(**BAREMETAL_FLAGS)
         fake_image.stub_out_image_service(self.stubs)
 
         self.node = _create_baremetal_stuff()
@@ -185,5 +190,5 @@ class BaremetalDriverTestCase(test_virt_drivers._VirtDriverTestCase,
         self.assertEqual(cap['x'], '123')
         self.assertEqual(cap['y'], '456')
         self.assertEqual(cap['hypervisor_type'], 'baremetal')
-        self.assertEqual(cap['baremetal_driver'],
+        self.assertEqual(cap['driver'],
                          'nova.virt.baremetal.fake.Fake')
diff --git a/nova/tests/baremetal/test_volume_driver.py b/nova/tests/baremetal/test_volume_driver.py
index dacca6e53..e1b81d0b1 100644
--- a/nova/tests/baremetal/test_volume_driver.py
+++ b/nova/tests/baremetal/test_volume_driver.py
@@ -161,6 +161,6 @@ class BareMetalVolumeTestCase(test.TestCase):
         self.assertTrue(tid is None)
 
     def test_get_iqn(self):
-        self.flags(baremetal_iscsi_iqn_prefix='iqn.2012-12.a.b')
+        self.flags(iscsi_iqn_prefix='iqn.2012-12.a.b', group='baremetal')
         iqn = volume_driver._get_iqn('instname', '/dev/vdx')
         self.assertEquals('iqn.2012-12.a.b:instname-dev-vdx', iqn)