Merge "Output verbose info from efibootmgr" into stable/wallaby

2 files changed, 22 insertions, 22 deletions

diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py
index 500f2ba4..580d06eb 100644
--- a/ironic_python_agent/extensions/image.py
+++ b/ironic_python_agent/extensions/image.py
@@ -274,8 +274,8 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
     """
 
     # Before updating let's get information about the bootorder
-    LOG.debug("Getting information about boot order")
-    utils.execute('efibootmgr')
+    LOG.debug("Getting information about boot order.")
+    utils.execute('efibootmgr', '-v')
     # NOTE(iurygregory): regex used to identify the Warning in the stderr after
     # we add the new entry. Example:
     # "efibootmgr: ** Warning ** : Boot0004 has same label ironic"
@@ -302,7 +302,7 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
                                'dev': device})
         # Update the nvram using 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,
                             '-l', v_efi_bl_path)
         for line in cmd[1].split('\n'):
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py
index ddc416d4..5dc46ae6 100644
--- a/ironic_python_agent/tests/unit/extensions/test_image.py
+++ b/ironic_python_agent/tests/unit/extensions/test_image.py
@@ -259,8 +259,8 @@ class TestImageExtension(base.IronicAgentTest):
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -307,8 +307,8 @@ class TestImageExtension(base.IronicAgentTest):
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -360,8 +360,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -413,12 +413,12 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic2', '-l',
                               '\\WINDOWS\\system32\\winload.efi'),
@@ -2142,8 +2142,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2186,8 +2186,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'Vendor String', '-l',
                               '\\EFI\\vendor\\shimx64.efi'),
@@ -2226,8 +2226,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', '/dev/fakenvme0p1',
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', '/dev/fakenvme0',
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', '/dev/fakenvme0',
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2266,8 +2266,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                     mock.call('udevadm', 'settle'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+                    mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', '1', '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2373,8 +2373,8 @@ efibootmgr: ** Warning ** : Boot0005 has same label ironic1\n
                                        self.fake_dev,
                                        self.fake_efi_system_part,
                                        self.fake_dir)
-        expected = [mock.call('efibootmgr'),
-                    mock.call('efibootmgr', '-c', '-d', self.fake_dev,
+        expected = [mock.call('efibootmgr', '-v'),
+                    mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
                               '-p', self.fake_efi_system_part, '-w',
                               '-L', 'ironic1', '-l',
                               '\\EFI\\BOOT\\BOOTX64.EFI')]