diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-20 05:24:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-20 05:24:13 +0000 |
| commit | 5c3113b066e61cbc5d8d4d464f8200d4cb5e8395 (patch) | |
| tree | 7b925f456bd1b5047a2da5504ef7dd1947dd136c /nova/tests | |
| parent | a64532f11381547b3b5ea3bc007df724566a75e1 (diff) | |
| parent | 48bd75998a9e68d7dafdeab47fd6c70adb3113f6 (diff) | |
Merge "baremetal: drop 'prov_mac_address' column"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/baremetal/db/utils.py | 1 | ||||
| -rw-r--r-- | nova/tests/baremetal/test_pxe.py | 1 | ||||
| -rwxr-xr-x | nova/tests/baremetal/test_tilera.py | 1 | ||||
| -rw-r--r-- | nova/tests/baremetal/test_virtual_power_driver.py | 5 | ||||
| -rw-r--r-- | nova/tests/test_migrations.py | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/nova/tests/baremetal/db/utils.py b/nova/tests/baremetal/db/utils.py index f50abd2e6..c3b3cff5f 100644 --- a/nova/tests/baremetal/db/utils.py +++ b/nova/tests/baremetal/db/utils.py @@ -31,7 +31,6 @@ def new_bm_node(**kwargs): h.pm_address = kwargs.pop('pm_address', '192.168.1.1') h.pm_user = kwargs.pop('pm_user', 'ipmi_user') h.pm_password = kwargs.pop('pm_password', 'ipmi_password') - h.prov_mac_address = kwargs.pop('prov_mac_address', '12:34:56:78:90:ab') h.task_state = kwargs.pop('task_state', None) h.terminal_port = kwargs.pop('terminal_port', 8000) if len(kwargs) > 0: diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/baremetal/test_pxe.py index 50fe16715..994a8ee35 100644 --- a/nova/tests/baremetal/test_pxe.py +++ b/nova/tests/baremetal/test_pxe.py @@ -74,7 +74,6 @@ class BareMetalPXETestCase(bm_db_base.BMDBTestCase): service_host='test_host', cpus=4, memory_mb=2048, - prov_mac_address='11:11:11:11:11:11', ) self.nic_info = [ {'address': '22:22:22:22:22:22', 'datapath_id': '0x1', diff --git a/nova/tests/baremetal/test_tilera.py b/nova/tests/baremetal/test_tilera.py index f92e9b270..a30732a3d 100755 --- a/nova/tests/baremetal/test_tilera.py +++ b/nova/tests/baremetal/test_tilera.py @@ -70,7 +70,6 @@ class BareMetalTileraTestCase(bm_db_base.BMDBTestCase): service_host='test_host', cpus=4, memory_mb=2048, - prov_mac_address='11:11:11:11:11:11', ) self.nic_info = [ {'address': '22:22:22:22:22:22', 'datapath_id': '0x1', diff --git a/nova/tests/baremetal/test_virtual_power_driver.py b/nova/tests/baremetal/test_virtual_power_driver.py index d6d615194..5f4b5f0cb 100644 --- a/nova/tests/baremetal/test_virtual_power_driver.py +++ b/nova/tests/baremetal/test_virtual_power_driver.py @@ -71,7 +71,6 @@ class BareMetalVPDTestCase(bm_db_base.BMDBTestCase): service_host='test_host', cpus=2, memory_mb=2048, - prov_mac_address='aa:bb:cc:dd:ee:ff', ) self.nic_info = [ {'address': '11:11:11:11:11:11', 'datapath_id': '0x1', @@ -200,9 +199,7 @@ class VPDClassMethodsTestCase(BareMetalVPDTestCase): self.mox.StubOutWithMock(self.pm, '_run_command') cmd = self.pm._vp_cmd.get_node_macs.replace('{_NodeName_}', 'testNode') - # aa:bb:cc:dd:ee:ff is prov_mac_adress. Check it is not used to - # find the node. - self.pm._run_command(cmd).AndReturn(["aabbccddeeff", "ffeeddccbbaa"]) + self.pm._run_command(cmd).AndReturn(["ffeeddccbbaa"]) self.mox.ReplayAll() name = self.pm._check_for_node() diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index d7ef3da2f..de5eb1b40 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -1425,3 +1425,8 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn): rows = ifs.select().where(ifs.c.bm_node_id == 2).execute().fetchall() self.assertEqual(len(rows), 0) + + def _check_007(self, engine, data): + bm_nodes = db_utils.get_table(engine, 'bm_nodes') + columns = [c.name for c in bm_nodes.columns] + self.assertNotIn(u'prov_mac_address', columns) |