openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Output verbose info from efibootmgr"

Browse Source
This commit is contained in:
Zuul
2021-08-11 11:08:34 +00:00
committed by Gerrit Code Review
parent 71f54b7f98 caf695f70a
commit c616b4dba3
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ironic_python_agent/extensions/image.py
View File

@@ -274,7 +274,7 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
# Before updating let's get information about the bootorder # Before updating let's get information about the bootorder
LOG.debug("Getting information about boot order.") LOG.debug("Getting information about boot order.")
utils.execute('efibootmgr') utils.execute('efibootmgr', '-v')
# NOTE(iurygregory): regex used to identify the Warning in the stderr after # NOTE(iurygregory): regex used to identify the Warning in the stderr after
# we add the new entry. Example: # we add the new entry. Example:
# "efibootmgr: ** Warning ** : Boot0004 has same label ironic" # "efibootmgr: ** Warning ** : Boot0004 has same label ironic"
@@ -303,7 +303,7 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
'dev': device}) 'dev': device})
# Update the nvram using efibootmgr # Update the nvram using efibootmgr
# https://linux.die.net/man/8/efibootmgr # https://linux.die.net/man/8/efibootmgr
cmd = utils.execute('efibootmgr', '-c', '-d', device, cmd = utils.execute('efibootmgr', '-v', '-c', '-d', device,
'-p', efi_partition, '-w', '-L', label, '-p', efi_partition, '-w', '-L', label,
'-l', v_efi_bl_path) '-l', v_efi_bl_path)
for line in cmd[1].split('\n'): for line in cmd[1].split('\n'):

38
ironic_python_agent/tests/unit/extensions/test_image.py
View File

@@ -236,8 +236,8 @@ class TestImageExtension(base.IronicAgentTest):
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -283,8 +283,8 @@ class TestImageExtension(base.IronicAgentTest):
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -335,8 +335,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -387,12 +387,12 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic2', '-l', '-L', 'ironic2', '-l',
'\\WINDOWS\\system32\\winload.efi'), '\\WINDOWS\\system32\\winload.efi'),
@@ -2226,8 +2226,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2270,8 +2270,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'Vendor String', '-l', '-L', 'Vendor String', '-l',
'\\EFI\\vendor\\shimx64.efi'), '\\EFI\\vendor\\shimx64.efi'),
@@ -2310,8 +2310,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', '/dev/fakenvme0p1', mock.call('mount', '/dev/fakenvme0p1',
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', '/dev/fakenvme0', mock.call('efibootmgr', '-v', '-c', '-d', '/dev/fakenvme0',
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2350,8 +2350,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
self.fake_dir + '/boot/efi'), self.fake_dir + '/boot/efi'),
mock.call('efibootmgr'), mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', '1', '-w', '-p', '1', '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI'), '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2457,8 +2457,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
self.fake_dev, self.fake_dev,
self.fake_efi_system_part, self.fake_efi_system_part,
self.fake_dir) self.fake_dir)
expected = [mock.call('efibootmgr'), expected = [mock.call('efibootmgr', '-v'),
mock.call('efibootmgr', '-c', '-d', self.fake_dev, mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
'-p', self.fake_efi_system_part, '-w', '-p', self.fake_efi_system_part, '-w',
'-L', 'ironic1', '-l', '-L', 'ironic1', '-l',
'\\EFI\\BOOT\\BOOTX64.EFI')] '\\EFI\\BOOT\\BOOTX64.EFI')]