openstack/ironic
Code Issues Proposed changes

Merge "boot_devices.PXE value should match with pyghmi define"

Browse Source
This commit is contained in:
Jenkins 2014-12-02 09:43:44 +00:00 committed by Gerrit Code Review
commit 6110667212
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: