openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Add mount and parted -l to the collected commands"

Browse Source
This commit is contained in:
Zuul 2022-03-08 12:16:19 +00:00 committed by Gerrit Code Review
commit 63171c7f38
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ironic_python_agent/tests/unit/test_utils.py
View File

@ -431,7 +431,8 @@ class TestUtils(ironic_agent_base.IronicAgentTest):
file_list=[], file_list=[],
io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY,
'df': mock.ANY, 'iptables': mock.ANY, 'lshw': 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, 'gzip_and_b64encode', autospec=True)
@mock.patch.object(utils, 'is_journalctl_present', 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], file_list=[tmp.name],
io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, io_dict={'journal': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY,
'df': mock.ANY, 'iptables': mock.ANY, 'lshw': 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, 'gzip_and_b64encode', autospec=True)
@mock.patch.object(utils, 'is_journalctl_present', 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'], file_list=['/var/log'],
io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY,
'dmesg': mock.ANY, 'df': mock.ANY, 'lshw': 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, 'gzip_and_b64encode', autospec=True)
@mock.patch.object(utils, 'is_journalctl_present', 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], file_list=['/var/log', tmp.name],
io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY, io_dict={'iptables': mock.ANY, 'ip_addr': mock.ANY, 'ps': mock.ANY,
'dmesg': mock.ANY, 'df': mock.ANY, 'lshw': 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): def test_get_ssl_client_options(self):
# defaults # defaults

2
ironic_python_agent/utils.py
View File

@ -69,6 +69,8 @@ COLLECT_LOGS_COMMANDS = {
'lshw': ['lshw', '-quiet', '-json'], 'lshw': ['lshw', '-quiet', '-json'],
'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)], 'lsblk': ['lsblk', '--all', '-o%s' % ','.join(LSBLK_COLUMNS)],
'mdstat': ['cat', '/proc/mdstat'], 'mdstat': ['cat', '/proc/mdstat'],
'mount': ['mount'],
'parted': ['parted', '-l'],
} }