x/python-ganttclient
Code Issues Proposed changes

Move baremetal options to [BAREMETAL] OptGroup

Browse Source 
Move all the baremetal options into a new [BAREMETAL] OptGroup,
except for 'baremetal_db_backend', which breaks LazyPluggable if moved.

blueprint general-bare-metal-provisioning-framework

Change-Id: I06f53dcf10b9bbd3fd7cc0725cc6076af3d74d19
This commit is contained in:
Devananda van der Veen
2012-12-21 11:09:48 -08:00
parent 1844bf5e87
commit 80eb567d28
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/baremetal/db/base.py
View File

@@ -24,8 +24,9 @@ from nova.virt.baremetal.db.sqlalchemy import session as bm_session
_DB_CACHE = None _DB_CACHE = None
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('baremetal_sql_connection', CONF.import_opt('sql_connection',
'nova.virt.baremetal.db.sqlalchemy.session') 'nova.virt.baremetal.db.sqlalchemy.session',
group='baremetal')
class Database(test.Database): class Database(test.Database):
@@ -38,11 +39,11 @@ class BMDBTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(BMDBTestCase, self).setUp() super(BMDBTestCase, self).setUp()
self.flags(baremetal_sql_connection='sqlite://') self.flags(sql_connection='sqlite://', group='baremetal')
global _DB_CACHE global _DB_CACHE
if not _DB_CACHE: if not _DB_CACHE:
_DB_CACHE = Database(bm_session, bm_migration, _DB_CACHE = Database(bm_session, bm_migration,
sql_connection=CONF.baremetal_sql_connection, sql_connection=CONF.baremetal.sql_connection,
sqlite_db=None, sqlite_db=None,
sqlite_clean_db=None) sqlite_clean_db=None)
self.useFixture(_DB_CACHE) self.useFixture(_DB_CACHE)

19
nova/tests/baremetal/test_driver.py
View File

@@ -64,14 +64,18 @@ def class_path(class_):
COMMON_FLAGS = dict( 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), 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'], 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): def setUp(self):
super(BaremetalDriverSpawnTestCase, self).setUp() super(BaremetalDriverSpawnTestCase, self).setUp()
self.flags(**COMMON_FLAGS) self.flags(**COMMON_FLAGS)
self.flags(**BAREMETAL_FLAGS)
fake_image.stub_out_image_service(self.stubs) fake_image.stub_out_image_service(self.stubs)
self.node = _create_baremetal_stuff() self.node = _create_baremetal_stuff()
@@ -185,5 +190,5 @@ class BaremetalDriverTestCase(test_virt_drivers._VirtDriverTestCase,
self.assertEqual(cap['x'], '123') self.assertEqual(cap['x'], '123')
self.assertEqual(cap['y'], '456') self.assertEqual(cap['y'], '456')
self.assertEqual(cap['hypervisor_type'], 'baremetal') self.assertEqual(cap['hypervisor_type'], 'baremetal')
self.assertEqual(cap['baremetal_driver'], self.assertEqual(cap['driver'],
'nova.virt.baremetal.fake.Fake') 'nova.virt.baremetal.fake.Fake')

2
nova/tests/baremetal/test_volume_driver.py
View File

@@ -161,6 +161,6 @@ class BareMetalVolumeTestCase(test.TestCase):
self.assertTrue(tid is None) self.assertTrue(tid is None)
def test_get_iqn(self): 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') iqn = volume_driver._get_iqn('instname', '/dev/vdx')
self.assertEquals('iqn.2012-12.a.b:instname-dev-vdx', iqn) self.assertEquals('iqn.2012-12.a.b:instname-dev-vdx', iqn)