parted: fix the ordering of list command

The command `parted -m -s {} print` do not print the "Type" column, but after the "File System" column print the name of the partition. This point that the type of the partition cannot be extracted using parted with machine parseable output.
aplanas · Oct 1, 2018 · f23d618 · f23d618
1 parent 3dc57a6
commit f23d618
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/salt/modules/parted.py b/salt/modules/parted.py
@@ -183,8 +183,8 @@ def list_(device, unit=None):
                     'start': cols[1],
                     'end': cols[2],
                     'size': cols[3],
-                    'type': cols[4],
-                    'file system': cols[5],
+                    'file system': cols[4],
+                    'name': cols[5],
                     'flags': cols[6]}
             else:
                 raise CommandExecutionError(

diff --git a/tests/unit/modules/test_parted.py b/tests/unit/modules/test_parted.py
@@ -207,17 +207,17 @@ def test_list__valid_cmd_output(self):
                         'end': '150MB',
                         'number': '1',
                         'start': '17.4kB',
-                        'file system': '',
+                        'file system': 'ext3',
                         'flags': 'boot',
-                        'type': 'ext3',
+                        'name': '',
                         'size': '150MB'},
                     '2': {
                         'end': '4000GB',
                         'number': '2',
                         'start': '3921GB',
-                        'file system': '',
+                        'file system': 'linux-swap(v1)',
                         'flags': '',
-                        'type': 'linux-swap(v1)',
+                        'name': '',
                         'size': '79.3GB'
                     }
                 }
@@ -245,17 +245,17 @@ def test_list__valid_unit_valid_cmd_output(self):
                         'end': '150MB',
                         'number': '1',
                         'start': '17.4kB',
-                        'file system': '',
+                        'file system': 'ext3',
                         'flags': 'boot',
-                        'type': 'ext3',
+                        'name': '',
                         'size': '150MB'},
                     '2': {
                         'end': '4000GB',
                         'number': '2',
                         'start': '3921GB',
-                        'file system': '',
+                        'file system': 'linux-swap(v1)',
                         'flags': '',
-                        'type': 'linux-swap(v1)',
+                        'name': '',
                         'size': '79.3GB'
                     }
                 }
@@ -282,17 +282,17 @@ def test_list__valid_legacy_cmd_output(self):
                         'end': '150MB',
                         'number': '1',
                         'start': '17.4kB',
-                        'file system': '',
+                        'file system': 'ext3',
                         'flags': 'boot',
-                        'type': 'ext3',
+                        'name': '',
                         'size': '150MB'},
                     '2': {
                         'end': '4000GB',
                         'number': '2',
                         'start': '3921GB',
-                        'file system': '',
+                        'file system': 'linux-swap(v1)',
                         'flags': '',
-                        'type': 'linux-swap(v1)',
+                        'name': '',
                         'size': '79.3GB'
                     }
                 }
@@ -319,17 +319,17 @@ def test_list__valid_unit_valid_legacy_cmd_output(self):
                         'end': '150MB',
                         'number': '1',
                         'start': '17.4kB',
-                        'file system': '',
+                        'file system': 'ext3',
                         'flags': 'boot',
-                        'type': 'ext3',
+                        'name': '',
                         'size': '150MB'},
                     '2': {
                         'end': '4000GB',
                         'number': '2',
                         'start': '3921GB',
-                        'file system': '',
+                        'file system': 'linux-swap(v1)',
                         'flags': '',
-                        'type': 'linux-swap(v1)',
+                        'name': '',
                         'size': '79.3GB'
                     }
                 }