diff options
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/irmc/management.py | 4 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/irmc/test_management.py | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ironic/drivers/modules/irmc/management.py b/ironic/drivers/modules/irmc/management.py index 079ae9e44..7f480fd4b 100644 --- a/ironic/drivers/modules/irmc/management.py +++ b/ironic/drivers/modules/irmc/management.py @@ -27,9 +27,9 @@ from ironic.conductor import task_manager from ironic.conductor import utils as manager_utils from ironic import conf from ironic.drivers import base +from ironic.drivers.modules import boot_mode_utils from ironic.drivers.modules import ipmitool from ironic.drivers.modules.irmc import common as irmc_common -from ironic.drivers import utils as driver_utils irmc = importutils.try_import('scciclient.irmc') @@ -252,7 +252,7 @@ class IRMCManagement(ipmitool.IPMIManagement): "Invalid boot device %s specified.") % device) uefi_mode = ( - driver_utils.get_node_capability(task.node, 'boot_mode') == 'uefi') + boot_mode_utils.get_boot_mode(task.node) == 'uefi') # disable 60 secs timer timeout_disable = "0x00 0x08 0x03 0x08" diff --git a/ironic/tests/unit/drivers/modules/irmc/test_management.py b/ironic/tests/unit/drivers/modules/irmc/test_management.py index c4b152ae9..b2ab5afce 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_management.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_management.py @@ -202,7 +202,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0x80 0x04 0x00 0x00 0x00") + "0x00 0x08 0x05 0xa0 0x04 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -216,7 +216,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0xc0 0x04 0x00 0x00 0x00") + "0x00 0x08 0x05 0xe0 0x04 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -231,7 +231,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0x80 0x08 0x00 0x00 0x00") + "0x00 0x08 0x05 0xa0 0x08 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -245,7 +245,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0xc0 0x08 0x00 0x00 0x00") + "0x00 0x08 0x05 0xe0 0x08 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -260,7 +260,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0x80 0x20 0x00 0x00 0x00") + "0x00 0x08 0x05 0xa0 0x20 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -274,7 +274,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0xc0 0x20 0x00 0x00 0x00") + "0x00 0x08 0x05 0xe0 0x20 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -289,7 +289,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0x80 0x18 0x00 0x00 0x00") + "0x00 0x08 0x05 0xa0 0x18 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -303,7 +303,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0xc0 0x18 0x00 0x00 0x00") + "0x00 0x08 0x05 0xe0 0x18 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -318,7 +318,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0x80 0x0c 0x00 0x00 0x00") + "0x00 0x08 0x05 0xa0 0x0c 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, @@ -332,7 +332,7 @@ class IRMCManagementTestCase(test_common.BaseIRMCTest): self._test_management_interface_set_boot_device_ok( None, params, - "0x00 0x08 0x05 0xc0 0x0c 0x00 0x00 0x00") + "0x00 0x08 0x05 0xe0 0x0c 0x00 0x00 0x00") self._test_management_interface_set_boot_device_ok( 'bios', params, |