saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix xfs.py module that can no longer parse output from mkfs.xfs.

Browse source
This commit is contained in:
snichol 2021-09-08 08:46:53 -04:00 • committed by Megan Wilhite
parent aadaf0bedd
commit 4d595c24c5
2 changed files with 70 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/xfs.py
View file

@ -90,7 +90,7 @@ def _parse_xfs_info(data):
spr = re.compile(r"\s+")
entry = None
for line in [spr.sub(" ", l).strip().replace(", ", " ") for l in data.split("\n")]:
if not line:
if not line or "=" not in line:
continue
nfo = _xfs_info_get_kv(line)
if not line.startswith("="):

69
tests/unit/modules/test_xfs.py
View file

@ -42,3 +42,72 @@ class XFSTestCase(TestCase, LoaderModuleMockMixin):
}
},
)
def test__parse_xfs_info(self):
"""
Test parsing output from mkfs.xfs.
"""
data = textwrap.dedent(
"""
meta-data=/dev/vg00/testvol isize=512 agcount=4, agsize=1310720 blks
= sectsz=4096 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=0
= reflink=1
data = bsize=4096 blocks=5242880, imaxpct=25
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1
log =internal log bsize=4096 blocks=2560, version=2
= sectsz=4096 sunit=1 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0
Discarding blocks...Done.
"""
)
self.assertEqual(
xfs._parse_xfs_info(data),
{
"meta-data": {
"section": "/dev/vg00/testvol",
"isize": "512",
"agcount": "4",
"agsize": "1310720 blks",
"sectsz": "4096",
"attr": "2",
"projid32bit": "1",
"crc": "1",
"finobt": "1",
"sparse": "1",
"rmapbt": "0",
"reflink": "1",
},
"data": {
"section": "data",
"bsize": "4096",
"blocks": "5242880",
"imaxpct": "25",
"sunit": "0",
"swidth": "0 blks",
},
"naming": {
"section": "version 2",
"bsize": "4096",
"ascii-ci": "0",
"ftype": "1",
},
"log": {
"section": "internal log",
"bsize": "4096",
"blocks": "2560",
"version": "2",
"sectsz": "4096",
"sunit": "1 blks",
"lazy-count": "1",
},
"realtime": {
"section": "none",
"extsz": "4096",
"blocks": "0",
"rtextents": "0",
},
},
)