openstack/ironic
Code Issues Proposed changes

boot_devices.PXE value should match with pyghmi define

Browse Source 
pyghmi ipmicmd.get_bootdev() returns 'network' for pxe boot mode. However
ipminative defines 'net' as the name, so it does not match with pyghmi
return value.

In this patch, we redefine boot_devices.PXE value to 'network' which match
pyghmi.

Change-Id: Ic19597d2e577098a08e5ca2c5c6f0660200fc1cb
Closes-Bug: 1397212
This commit is contained in:
Haomeng, Wang 2014-11-28 08:22:17 +00:00
parent f4b8a285ba
commit 95f17098ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/ipminative.py
View File

@ -71,7 +71,7 @@ CONSOLE_PROPERTIES = {
_BOOT_DEVICES_MAP = {
boot_devices.DISK: 'hd',
boot_devices.PXE: 'net',
boot_devices.PXE: 'network',
boot_devices.CDROM: 'cdrom',
boot_devices.BIOS: 'setup',
}

4
ironic/tests/drivers/test_ipminative.py
View File

@ -298,8 +298,8 @@ class IPMINativeDriverTestCase(db_base.DbTestCase):
with task_manager.acquire(self.context,
self.node.uuid) as task:
self.driver.management.set_boot_device(task, boot_devices.PXE)
# PXE is converted to 'net' internally by ipminative
ipmicmd.set_bootdev.assert_called_once_with('net', persist=False)
# PXE is converted to 'network' internally by ipminative
ipmicmd.set_bootdev.assert_called_once_with('network', persist=False)
def test_set_boot_device_bad_device(self):
with task_manager.acquire(self.context, self.node.uuid) as task: