diff options
author | Zuul <zuul@review.opendev.org> | 2022-03-08 12:16:19 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2022-03-08 12:16:19 +0000 |
commit | 63171c7f3821316f9e303ebd94174779601a96cb (patch) | |
tree | ec62ab70f38fb320d6778a57cc9ab0558958a78b | |
parent | bcd5d11d9ade3b0b79f708ec13b4529a0981e969 (diff) | |
parent | f1ee454a0ee9a8f18fbfd504d081ce3aeeb0ffa3 (diff) | |
download | ironic-python-agent-63171c7f3821316f9e303ebd94174779601a96cb.tar.gz |
Merge "Add `mount` and `parted -l` to the collected commands"
-rw-r--r-- | ironic_python_agent/tests/unit/test_utils.py | 12 | ||||
-rw-r--r-- | ironic_python_agent/utils.py | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py index 96d31688..1bb7c1fe 100644 --- a/ironic_python_agent/tests/unit/test_utils.py +++ b/ironic_python_agent/tests/unit/test_utils.py @@ -431,7 +431,8 @@ class TestUtils(ironic_agent_base.IronicAgentTest): 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}) + 'lsblk': 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) @@ -458,7 +459,8 @@ class TestUtils(ironic_agent_base.IronicAgentTest): 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}) + 'lsblk': 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) @@ -480,7 +482,8 @@ class TestUtils(ironic_agent_base.IronicAgentTest): 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}) + 'lsblk': 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) @@ -506,7 +509,8 @@ class TestUtils(ironic_agent_base.IronicAgentTest): 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}) + 'lsblk': 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 71e29d16..4cfe0ac9 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -69,6 +69,8 @@ COLLECT_LOGS_COMMANDS = { 'lshw': ['lshw', '-quiet', '-json'], 'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)], 'mdstat': ['cat', '/proc/mdstat'], + 'mount': ['mount'], + 'parted': ['parted', '-l'], } |