diff options
| -rw-r--r-- | ironic_python_agent/tests/unit/test_utils.py | 16 | ||||
| -rw-r--r-- | ironic_python_agent/utils.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/lsblk-all-956c1df808a169bf.yaml | 5 |
3 files changed, 10 insertions, 12 deletions
diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py index 2cf2a20b..6acd256a 100644 --- a/ironic_python_agent/tests/unit/test_utils.py +++ b/ironic_python_agent/tests/unit/test_utils.py @@ -442,9 +442,7 @@ class TestUtils(ironic_agent_base.IronicAgentTest): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=[], - io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'df': mock.ANY, 'iptables': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -469,9 +467,7 @@ class TestUtils(ironic_agent_base.IronicAgentTest): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=[tmp.name], - io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'df': mock.ANY, 'iptables': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -491,9 +487,7 @@ class TestUtils(ironic_agent_base.IronicAgentTest): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=['/var/log'], - io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'dmesg': mock.ANY, 'df': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -517,9 +511,7 @@ class TestUtils(ironic_agent_base.IronicAgentTest): mock_outputs.assert_has_calls(calls, any_order=True) mock_gzip_b64.assert_called_once_with( file_list=['/var/log', tmp.name], - io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, - 'dmesg': mock.ANY, 'df': mock.ANY, 'lshw': mock.ANY, - 'lsblk': mock.ANY, 'mdstat': mock.ANY}) + io_dict=mock.ANY) def test_get_ssl_client_options(self): # defaults diff --git a/ironic_python_agent/utils.py b/ironic_python_agent/utils.py index e34aa9b1..c13a5576 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -69,6 +69,7 @@ COLLECT_LOGS_COMMANDS = { 'ip_addr': ['ip', 'addr'], 'lshw': ['lshw', '-quiet', '-json'], 'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)], + 'lsblk-full': ['lsblk', '--all', '--bytes', '--output-all', '--pairs'], 'mdstat': ['cat', '/proc/mdstat'], } diff --git a/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml b/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml new file mode 100644 index 00000000..d237f834 --- /dev/null +++ b/releasenotes/notes/lsblk-all-956c1df808a169bf.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + The ramdisk logs now contain an ``lsblk`` output with all pairs in the new + ``lsblk-full`` file. |