Add `mount` and `parted -l` to the collected commands

Conflicts:
      ironic_python_agent/tests/unit/test_utils.py

Change-Id: I1c759552220291890704d0002a62ea3f51701691
(cherry picked from commit f1ee454a0ee9a8f18fbfd504d081ce3aeeb0ffa3)
(cherry picked from commit 54cbfa1f3fe0b8935e39044baee8c4996b2a3ced)

2 files changed, 12 insertions, 2 deletions

diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py
index 48892c07..06eaa37c 100644
--- a/ironic_python_agent/tests/unit/test_utils.py
+++ b/ironic_python_agent/tests/unit/test_utils.py
@@ -442,7 +442,11 @@ class TestUtils(testtools.TestCase):
         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)
@@ -462,7 +466,11 @@ class TestUtils(testtools.TestCase):
         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})
 
     def test_get_ssl_client_options(self):
         # defaults
diff --git a/ironic_python_agent/utils.py b/ironic_python_agent/utils.py
index d43de29b..c42fc9e7 100644
--- a/ironic_python_agent/utils.py
+++ b/ironic_python_agent/utils.py
@@ -71,6 +71,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'],
 }