openstack
/
ironic-python-agent
Code Issues Proposed changes

Merge "Remove nvme-cli warning and delay on nvme-format"

This commit is contained in:
Zuul 2021-03-02 14:36:51 +00:00 committed by Gerrit Code Review
parent 2220aaae57 d2127e7ef4
commit 4354d4f792
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_python_agent/hardware.py
View File

@ -1690,7 +1690,7 @@ class GenericHardwareManager(HardwareManager):
LOG.debug("Attempting to nvme-format %s using secure format mode "
"(ses) %s", block_device.name, format_mode)
utils.execute('nvme', 'format', block_device.name, '-s',
format_mode)
format_mode, '-f')
LOG.info("nvme-cli format for device %s (ses= %s ) completed "
"successfully.", block_device.name, format_mode)
return True

4
ironic_python_agent/tests/unit/test_hardware.py
View File

@ -3886,7 +3886,7 @@ class TestGenericHardwareManager(base.IronicAgentTest):
retval = self.hardware._nvme_erase(block_device)
mocked_execute.assert_has_calls([
mock.call('nvme', 'id-ctrl', '/dev/nvme0n1', '-o', 'json'),
mock.call('nvme', 'format', '/dev/nvme0n1', '-s', 2),
mock.call('nvme', 'format', '/dev/nvme0n1', '-s', 2, '-f'),
])
self.assertTrue(retval)
@ -3910,7 +3910,7 @@ class TestGenericHardwareManager(base.IronicAgentTest):
retval = self.hardware._nvme_erase(block_device)
mocked_execute.assert_has_calls([
mock.call('nvme', 'id-ctrl', '/dev/nvme0n1', '-o', 'json'),
mock.call('nvme', 'format', '/dev/nvme0n1', '-s', 1),
mock.call('nvme', 'format', '/dev/nvme0n1', '-s', 1, '-f'),
])
self.assertTrue(retval)