diff options
| -rw-r--r-- | ironic_python_agent/tests/unit/test_utils.py | 24 | ||||
| -rw-r--r-- | ironic_python_agent/utils.py | 2 |
2 files changed, 22 insertions, 4 deletions
diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py index bb6a6f79..2c08b377 100644 --- a/ironic_python_agent/tests/unit/test_utils.py +++ b/ironic_python_agent/tests/unit/test_utils.py @@ -429,7 +429,11 @@ 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=mock.ANY) + io_dict={'journal': mock.ANY, 'ps': mock.ANY, 'df': mock.ANY, + 'iptables': mock.ANY, 'ip_addr': mock.ANY, + 'lshw': mock.ANY, 'lsblk': mock.ANY, + 'lsblk-full': mock.ANY, 'mdstat': mock.ANY, + 'mount': mock.ANY, 'parted': mock.ANY}) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -454,7 +458,11 @@ 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=mock.ANY) + io_dict={'journal': mock.ANY, 'ps': mock.ANY, 'df': mock.ANY, + 'iptables': mock.ANY, 'ip_addr': mock.ANY, + 'lshw': mock.ANY, 'lsblk': mock.ANY, + 'lsblk-full': mock.ANY, 'mdstat': mock.ANY, + 'mount': mock.ANY, 'parted': mock.ANY}) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -474,7 +482,11 @@ 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=mock.ANY) + io_dict={'dmesg': mock.ANY, 'ps': mock.ANY, 'df': mock.ANY, + 'iptables': mock.ANY, 'ip_addr': mock.ANY, + 'lshw': mock.ANY, 'lsblk': mock.ANY, + 'lsblk-full': mock.ANY, 'mdstat': mock.ANY, + 'mount': mock.ANY, 'parted': mock.ANY}) @mock.patch.object(utils, 'gzip_and_b64encode', autospec=True) @mock.patch.object(utils, 'is_journalctl_present', autospec=True) @@ -498,7 +510,11 @@ 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=mock.ANY) + io_dict={'dmesg': mock.ANY, 'ps': mock.ANY, 'df': mock.ANY, + 'iptables': mock.ANY, 'ip_addr': mock.ANY, + 'lshw': mock.ANY, 'lsblk': mock.ANY, + 'lsblk-full': mock.ANY, 'mdstat': mock.ANY, + 'mount': mock.ANY, 'parted': 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 2d9338a1..a54dc6a1 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -70,6 +70,8 @@ COLLECT_LOGS_COMMANDS = { 'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)], 'lsblk-full': ['lsblk', '--all', '--bytes', '--output-all', '--pairs'], 'mdstat': ['cat', '/proc/mdstat'], + 'mount': ['mount'], + 'parted': ['parted', '-l'], } |