From af1a1cac42b3eb6b0beef1c3331b59184791b44d Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 27 May 2013 07:02:17 +0100 Subject: [PATCH] Rename TestCase.flags() to TestCase.config() The 'flags' thing harks back to when we were using gflags, so rename the method to config() like most other projects call it. I really should change this in Nova someday too. Change-Id: I07bcb6392b47cb78a2b58a5a1d663d544e7a5b63 --- ironic/tests/base.py | 6 ++-- ironic/tests/drivers/test_ipmi.py | 8 ++--- ironic/tests/nova/test_driver.py | 12 ++++---- ironic/tests/nova/test_pxe.py | 22 +++++++------- ironic/tests/nova/test_tilera.py | 12 ++++---- ironic/tests/nova/test_tilera_pdu.py | 4 +-- .../tests/nova/test_virtual_power_driver.py | 30 +++++++++---------- ironic/tests/nova/test_volume_driver.py | 2 +- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ironic/tests/base.py b/ironic/tests/base.py index 6d2a18033b..115cce20aa 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -18,7 +18,7 @@ """Base classes for our unit tests. -Allows overriding of flags for use of fakes, and some black magic for +Allows overriding of config for use of fakes, and some black magic for inline callbacks. """ @@ -196,8 +196,8 @@ class TestCase(testtools.TestCase): for key in [k for k in self.__dict__.keys() if k[0] != '_']: del self.__dict__[key] - def flags(self, **kw): - """Override flag variables for a test.""" + def config(self, **kw): + """Override config options for a test.""" group = kw.pop('group', None) for k, v in kw.iteritems(): CONF.set_override(k, v, group) diff --git a/ironic/tests/drivers/test_ipmi.py b/ironic/tests/drivers/test_ipmi.py index c1a8a5bbda..0c47a90fdd 100644 --- a/ironic/tests/drivers/test_ipmi.py +++ b/ironic/tests/drivers/test_ipmi.py @@ -132,7 +132,7 @@ class BareMetalIPMITestCase(base.TestCase): self.assertEqual(state, states.ERROR) def test__power_on_max_retries(self): - self.flags(ipmi_power_retry=2) + self.config(ipmi_power_retry=2) self.mox.StubOutWithMock(ipmi, '_exec_ipmitool') info = ipmi._parse_control_info(self.node) @@ -176,7 +176,7 @@ class BareMetalIPMITestCase(base.TestCase): self.mox.VerifyAll() def test_set_power_on_ok(self): - self.flags(ipmi_power_retry=0) + self.config(ipmi_power_retry=0) info = ipmi._parse_control_info(self.node) self.mox.StubOutWithMock(ipmi, '_power_on') self.mox.StubOutWithMock(ipmi, '_power_off') @@ -188,7 +188,7 @@ class BareMetalIPMITestCase(base.TestCase): self.mox.VerifyAll() def test_set_power_off_ok(self): - self.flags(ipmi_power_retry=0) + self.config(ipmi_power_retry=0) info = ipmi._parse_control_info(self.node) self.mox.StubOutWithMock(ipmi, '_power_on') self.mox.StubOutWithMock(ipmi, '_power_off') @@ -200,7 +200,7 @@ class BareMetalIPMITestCase(base.TestCase): self.mox.VerifyAll() def test_set_power_on_fail(self): - self.flags(ipmi_power_retry=0) + self.config(ipmi_power_retry=0) info = ipmi._parse_control_info(self.node) self.mox.StubOutWithMock(ipmi, '_power_on') diff --git a/ironic/tests/nova/test_driver.py b/ironic/tests/nova/test_driver.py index f017253704..db3ba1fd06 100644 --- a/ironic/tests/nova/test_driver.py +++ b/ironic/tests/nova/test_driver.py @@ -36,12 +36,12 @@ from nova.virt.baremetal import fake CONF = cfg.CONF -COMMON_FLAGS = dict( +COMMON_CONFIG = dict( firewall_driver='nova.virt.baremetal.fake.FakeFirewallDriver', host='test_host', ) -BAREMETAL_FLAGS = dict( +BAREMETAL_CONFIG = dict( driver='nova.virt.baremetal.fake.FakeDriver', instance_type_extra_specs=['cpu_arch:test', 'test_spec:test_value'], power_manager='nova.virt.baremetal.fake.FakePowerManager', @@ -55,8 +55,8 @@ class BareMetalDriverNoDBTestCase(test.TestCase): def setUp(self): super(BareMetalDriverNoDBTestCase, self).setUp() - self.flags(**COMMON_FLAGS) - self.flags(**BAREMETAL_FLAGS) + self.config(**COMMON_CONFIG) + self.config(**BAREMETAL_CONFIG) self.driver = bm_driver.BareMetalDriver(None) def test_validate_driver_loading(self): @@ -74,8 +74,8 @@ class BareMetalDriverWithDBTestCase(bm_db_base.BMDBTestCase): def setUp(self): super(BareMetalDriverWithDBTestCase, self).setUp() - self.flags(**COMMON_FLAGS) - self.flags(**BAREMETAL_FLAGS) + self.config(**COMMON_CONFIG) + self.config(**BAREMETAL_CONFIG) fake_image.stub_out_image_service(self.stubs) self.context = utils.get_test_admin_context() diff --git a/ironic/tests/nova/test_pxe.py b/ironic/tests/nova/test_pxe.py index 49310a8d62..73deee99a2 100644 --- a/ironic/tests/nova/test_pxe.py +++ b/ironic/tests/nova/test_pxe.py @@ -40,12 +40,12 @@ from ironic.virt import fake as fake_virt CONF = cfg.CONF -COMMON_FLAGS = dict( +COMMON_CONFIG = dict( firewall_driver='ironic.fake.FakeFirewallDriver', host='test_host', ) -BAREMETAL_FLAGS = dict( +BAREMETAL_CONFIG = dict( driver='ironic.pxe.PXE', instance_type_extra_specs=['cpu_arch:test', 'test_spec:test_value'], power_manager='ironic.fake.FakePowerManager', @@ -58,8 +58,8 @@ class BareMetalPXETestCase(db_base.BMDBTestCase): def setUp(self): super(BareMetalPXETestCase, self).setUp() - self.flags(**COMMON_FLAGS) - self.flags(**BAREMETAL_FLAGS) + self.config(**COMMON_CONFIG) + self.config(**BAREMETAL_CONFIG) self.driver = pxe.PXE(fake_virt.FakeVirtAPI()) fake_image.stub_out_image_service(self.stubs) @@ -151,7 +151,7 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase): self.assertIn('eth1', config) def test_build_network_config_dhcp(self): - self.flags( + self.config( net_config_template='$pybasedir/ironic/' 'net-dhcp.ubuntu.template', group='baremetal', @@ -163,7 +163,7 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase): self.assertNotIn('address 1.2.3.4', config) def test_build_network_config_static(self): - self.flags( + self.config( net_config_template='$pybasedir/ironic/' 'net-static.ubuntu.template', group='baremetal', @@ -203,8 +203,8 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase): 'baremetal:deploy_kernel_id': 'aaaa', 'baremetal:deploy_ramdisk_id': 'bbbb', } - self.flags(deploy_kernel="fail", group='baremetal') - self.flags(deploy_ramdisk="fail", group='baremetal') + self.config(deploy_kernel="fail", group='baremetal') + self.config(deploy_ramdisk="fail", group='baremetal') self.assertEqual( pxe.get_deploy_aki_id(self.instance), 'aaaa') @@ -213,8 +213,8 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase): def test_get_default_deploy_ids(self): self.instance['extra_specs'] = {} - self.flags(deploy_kernel="aaaa", group='baremetal') - self.flags(deploy_ramdisk="bbbb", group='baremetal') + self.config(deploy_kernel="aaaa", group='baremetal') + self.config(deploy_ramdisk="bbbb", group='baremetal') self.assertEqual( pxe.get_deploy_aki_id(self.instance), 'aaaa') @@ -555,7 +555,7 @@ class PXEPublicMethodsTestCase(BareMetalPXETestCase): def test_activate_node(self): self._create_node() self.instance['uuid'] = 'fake-uuid' - self.flags(pxe_deploy_timeout=1, group='baremetal') + self.config(pxe_deploy_timeout=1, group='baremetal') db.bm_node_update(self.context, 1, {'task_state': states.DEPLOYING, diff --git a/ironic/tests/nova/test_tilera.py b/ironic/tests/nova/test_tilera.py index 97e858731c..9303486358 100755 --- a/ironic/tests/nova/test_tilera.py +++ b/ironic/tests/nova/test_tilera.py @@ -37,12 +37,12 @@ from nova.virt import fake as fake_virt CONF = cfg.CONF -COMMON_FLAGS = dict( +COMMON_CONFIG = dict( firewall_driver='nova.virt.baremetal.fake.FakeFirewallDriver', host='test_host', ) -BAREMETAL_FLAGS = dict( +BAREMETAL_CONFIG = dict( driver='nova.virt.baremetal.tilera.Tilera', instance_type_extra_specs=['cpu_arch:test', 'test_spec:test_value'], power_manager='nova.virt.baremetal.fake.FakePowerManager', @@ -56,8 +56,8 @@ class BareMetalTileraTestCase(bm_db_base.BMDBTestCase): def setUp(self): super(BareMetalTileraTestCase, self).setUp() - self.flags(**COMMON_FLAGS) - self.flags(**BAREMETAL_FLAGS) + self.config(**COMMON_CONFIG) + self.config(**BAREMETAL_CONFIG) self.driver = tilera.Tilera(fake_virt.FakeVirtAPI()) fake_image.stub_out_image_service(self.stubs) @@ -116,7 +116,7 @@ class TileraClassMethodsTestCase(BareMetalTileraTestCase): self.assertIn('eth1', config) def test_build_network_config_dhcp(self): - self.flags( + self.config( net_config_template='$pybasedir/nova/virt/baremetal/' 'net-dhcp.ubuntu.template', group='baremetal', @@ -128,7 +128,7 @@ class TileraClassMethodsTestCase(BareMetalTileraTestCase): self.assertNotIn('address 1.2.3.4', config) def test_build_network_config_static(self): - self.flags( + self.config( net_config_template='$pybasedir/nova/virt/baremetal/' 'net-static.ubuntu.template', group='baremetal', diff --git a/ironic/tests/nova/test_tilera_pdu.py b/ironic/tests/nova/test_tilera_pdu.py index fee5bc49ea..d1f8181fc4 100755 --- a/ironic/tests/nova/test_tilera_pdu.py +++ b/ironic/tests/nova/test_tilera_pdu.py @@ -51,8 +51,8 @@ class BareMetalPduTestCase(test.TestCase): self.assertEqual(self.tilera_pdu.password, 'fake-password') def test_exec_pdutool(self): - self.flags(tile_pdu_mgr='fake-pdu-mgr', group='baremetal') - self.flags(tile_pdu_ip='fake-address', group='baremetal') + self.config(tile_pdu_mgr='fake-pdu-mgr', group='baremetal') + self.config(tile_pdu_ip='fake-address', group='baremetal') self.mox.StubOutWithMock(utils, 'execute') self.mox.StubOutWithMock(bm_utils, 'unlink_without_raise') args = [ diff --git a/ironic/tests/nova/test_virtual_power_driver.py b/ironic/tests/nova/test_virtual_power_driver.py index b98ef51824..36988385f8 100644 --- a/ironic/tests/nova/test_virtual_power_driver.py +++ b/ironic/tests/nova/test_virtual_power_driver.py @@ -33,12 +33,12 @@ import nova.virt.powervm.common as connection CONF = cfg.CONF -COMMON_FLAGS = dict( +COMMON_CONFIG = dict( firewall_driver='nova.virt.baremetal.fake.FakeFirewallDriver', host='test_host', ) -BAREMETAL_FLAGS = dict( +BAREMETAL_CONFIG = dict( driver='nova.virt.baremetal.pxe.PXE', instance_type_extra_specs=['cpu_arch:test', 'test_spec:test_value'], power_manager= @@ -58,8 +58,8 @@ class BareMetalVPDTestCase(bm_db_base.BMDBTestCase): def setUp(self): super(BareMetalVPDTestCase, self).setUp() - self.flags(**COMMON_FLAGS) - self.flags(**BAREMETAL_FLAGS) + self.config(**COMMON_CONFIG) + self.config(**BAREMETAL_CONFIG) fake_image.stub_out_image_service(self.stubs) self.context = utils.get_test_admin_context() @@ -103,20 +103,20 @@ class BareMetalVPDTestCase(bm_db_base.BMDBTestCase): class VPDMissingOptionsTestCase(BareMetalVPDTestCase): def test_get_conn_missing_options(self): - self.flags(virtual_power_ssh_host=None, group="baremetal") - self.flags(virtual_power_host_user=None, group="baremetal") - self.flags(virtual_power_host_pass=None, group="baremetal") + self.config(virtual_power_ssh_host=None, group="baremetal") + self.config(virtual_power_host_user=None, group="baremetal") + self.config(virtual_power_host_pass=None, group="baremetal") self._create_node() self._create_pm() self._conn = None self.assertRaises(exception.NovaException, self.pm._get_conn) self._conn = None - self.flags(virtual_power_ssh_host='127.0.0.1', group="baremetal") + self.config(virtual_power_ssh_host='127.0.0.1', group="baremetal") self.assertRaises(exception.NovaException, self.pm._get_conn) self._conn = None - self.flags(virtual_power_host_user='user', group="baremetal") + self.config(virtual_power_host_user='user', group="baremetal") self.assertRaises(exception.NovaException, self.pm._get_conn) @@ -125,9 +125,9 @@ class VPDClassMethodsTestCase(BareMetalVPDTestCase): def setUp(self): super(VPDClassMethodsTestCase, self).setUp() - self.flags(virtual_power_ssh_host='127.0.0.1', group="baremetal") - self.flags(virtual_power_host_user='user', group="baremetal") - self.flags(virtual_power_host_pass='password', group="baremetal") + self.config(virtual_power_ssh_host='127.0.0.1', group="baremetal") + self.config(virtual_power_host_user='user', group="baremetal") + self.config(virtual_power_host_pass='password', group="baremetal") def test_get_conn_success_pass(self): self._create_node() @@ -144,9 +144,9 @@ class VPDClassMethodsTestCase(BareMetalVPDTestCase): self.mox.VerifyAll() def test_get_conn_success_key(self): - self.flags(virtual_power_host_pass='', group="baremetal") - self.flags(virtual_power_host_key='/id_rsa_file.txt', - group="baremetal") + self.config(virtual_power_host_pass='', group="baremetal") + self.config(virtual_power_host_key='/id_rsa_file.txt', + group="baremetal") self._create_node() self._create_pm() self._conn = self.pm._get_conn() diff --git a/ironic/tests/nova/test_volume_driver.py b/ironic/tests/nova/test_volume_driver.py index 24dadac948..6a872e6002 100644 --- a/ironic/tests/nova/test_volume_driver.py +++ b/ironic/tests/nova/test_volume_driver.py @@ -156,6 +156,6 @@ class BareMetalVolumeTestCase(test.TestCase): self.assertTrue(tid is None) def test_get_iqn(self): - self.flags(iscsi_iqn_prefix='iqn.2012-12.a.b', group='baremetal') + self.config(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)