From c6d1528a2ed302ea82828b733a98db415be83708 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Wed, 11 Dec 2019 16:37:13 -0800 Subject: [PATCH] use _ instead of - --- jc/parsers/df.py | 21 ++++++++++++++++----- jc/parsers/universal.py | 2 +- tests/fixtures/centos-7.7/df.json | 2 +- tests/fixtures/ubuntu-18.04/df.json | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/jc/parsers/df.py b/jc/parsers/df.py index a4683786..aeeb80dc 100644 --- a/jc/parsers/df.py +++ b/jc/parsers/df.py @@ -97,12 +97,23 @@ def process(proc_data): ] """ - # TODO change 'avail' to 'available' - # TODO change 'use%' to 'use_percent' - # TODO change 'capacity' to 'capacity_percent' - # TODO change '%iused' to 'iused_percent' - for entry in proc_data: + # change 'avail' to 'available' + if 'avail' in entry: + entry['available'] = entry.pop('avail') + + # change 'use%' to 'use_percent' + if 'use%' in entry: + entry['use_percent'] = entry.pop('use%') + + # change 'capacity' to 'capacity_percent' + if 'capacity' in entry: + entry['capacity_percent'] = entry.pop('capacity') + + # change '%iused' to 'iused_percent' + if '%iused' in entry: + entry['iused_percent'] = entry.pop('%iused') + # change any entry for key with '_blocks' in the name to int for k in entry: if str(k).find('_blocks') != -1: diff --git a/jc/parsers/universal.py b/jc/parsers/universal.py index 2e52c944..7f7877fe 100644 --- a/jc/parsers/universal.py +++ b/jc/parsers/universal.py @@ -10,7 +10,7 @@ def sparse_table_parse(data, delim='\u2063'): Parameters: - data: (list) Text data to parse that has been split into lines via .splitlines(). + data: (list) Text data to parse that has been split into lines via .splitlines(). Item 0 must be the header row. Any spaces in header names should be changed to underscore '_'. You should also ensure headers are lowercase by using .lower(). Do not change the position of header diff --git a/tests/fixtures/centos-7.7/df.json b/tests/fixtures/centos-7.7/df.json index be833af2..b75171b6 100644 --- a/tests/fixtures/centos-7.7/df.json +++ b/tests/fixtures/centos-7.7/df.json @@ -1 +1 @@ -[{"filesystem": "devtmpfs", "1k-blocks": 1918816, "used": 0, "available": 1918816, "use_percent": 0, "mounted_on": "/dev"}, {"filesystem": "tmpfs", "1k-blocks": 1930664, "used": 0, "available": 1930664, "use_percent": 0, "mounted_on": "/dev/shm"}, {"filesystem": "tmpfs", "1k-blocks": 1930664, "used": 11832, "available": 1918832, "use_percent": 1, "mounted_on": "/run"}, {"filesystem": "tmpfs", "1k-blocks": 1930664, "used": 0, "available": 1930664, "use_percent": 0, "mounted_on": "/sys/fs/cgroup"}, {"filesystem": "/dev/mapper/centos-root", "1k-blocks": 17811456, "used": 1805580, "available": 16005876, "use_percent": 11, "mounted_on": "/"}, {"filesystem": "/dev/sda1", "1k-blocks": 1038336, "used": 237600, "available": 800736, "use_percent": 23, "mounted_on": "/boot"}, {"filesystem": "tmpfs", "1k-blocks": 386136, "used": 0, "available": 386136, "use_percent": 0, "mounted_on": "/run/user/1000"}] +[{"filesystem": "devtmpfs", "1k_blocks": 1918816, "used": 0, "available": 1918816, "use_percent": 0, "mounted_on": "/dev"}, {"filesystem": "tmpfs", "1k_blocks": 1930664, "used": 0, "available": 1930664, "use_percent": 0, "mounted_on": "/dev/shm"}, {"filesystem": "tmpfs", "1k_blocks": 1930664, "used": 11832, "available": 1918832, "use_percent": 1, "mounted_on": "/run"}, {"filesystem": "tmpfs", "1k_blocks": 1930664, "used": 0, "available": 1930664, "use_percent": 0, "mounted_on": "/sys/fs/cgroup"}, {"filesystem": "/dev/mapper/centos-root", "1k_blocks": 17811456, "used": 1805580, "available": 16005876, "use_percent": 11, "mounted_on": "/"}, {"filesystem": "/dev/sda1", "1k_blocks": 1038336, "used": 237600, "available": 800736, "use_percent": 23, "mounted_on": "/boot"}, {"filesystem": "tmpfs", "1k_blocks": 386136, "used": 0, "available": 386136, "use_percent": 0, "mounted_on": "/run/user/1000"}] diff --git a/tests/fixtures/ubuntu-18.04/df.json b/tests/fixtures/ubuntu-18.04/df.json index 1910ea07..780fb595 100644 --- a/tests/fixtures/ubuntu-18.04/df.json +++ b/tests/fixtures/ubuntu-18.04/df.json @@ -1 +1 @@ -[{"filesystem": "udev", "1k-blocks": 977500, "used": 0, "available": 977500, "use_percent": 0, "mounted_on": "/dev"}, {"filesystem": "tmpfs", "1k-blocks": 201732, "used": 1204, "available": 200528, "use_percent": 1, "mounted_on": "/run"}, {"filesystem": "/dev/sda2", "1k-blocks": 20508240, "used": 5748028, "available": 13695408, "use_percent": 30, "mounted_on": "/"}, {"filesystem": "tmpfs", "1k-blocks": 1008648, "used": 0, "available": 1008648, "use_percent": 0, "mounted_on": "/dev/shm"}, {"filesystem": "tmpfs", "1k-blocks": 5120, "used": 0, "available": 5120, "use_percent": 0, "mounted_on": "/run/lock"}, {"filesystem": "tmpfs", "1k-blocks": 1008648, "used": 0, "available": 1008648, "use_percent": 0, "mounted_on": "/sys/fs/cgroup"}, {"filesystem": "/dev/loop0", "1k-blocks": 55936, "used": 55936, "available": 0, "use_percent": 100, "mounted_on": "/snap/core18/1223"}, {"filesystem": "/dev/loop1", "1k-blocks": 11264, "used": 11264, "available": 0, "use_percent": 100, "mounted_on": "/snap/slcli/383"}, {"filesystem": "/dev/loop2", "1k-blocks": 90880, "used": 90880, "available": 0, "use_percent": 100, "mounted_on": "/snap/core/7396"}, {"filesystem": "/dev/loop3", "1k-blocks": 68096, "used": 68096, "available": 0, "use_percent": 100, "mounted_on": "/snap/google-cloud-sdk/103"}, {"filesystem": "/dev/loop5", "1k-blocks": 55808, "used": 55808, "available": 0, "use_percent": 100, "mounted_on": "/snap/core18/1074"}, {"filesystem": "/dev/loop7", "1k-blocks": 8832, "used": 8832, "available": 0, "use_percent": 100, "mounted_on": "/snap/doctl/187"}, {"filesystem": "/dev/loop8", "1k-blocks": 3200, "used": 3200, "available": 0, "use_percent": 100, "mounted_on": "/snap/stress-ng/847"}, {"filesystem": "/dev/loop10", "1k-blocks": 91264, "used": 91264, "available": 0, "use_percent": 100, "mounted_on": "/snap/core/7917"}, {"filesystem": "/dev/loop11", "1k-blocks": 3328, "used": 3328, "available": 0, "use_percent": 100, "mounted_on": "/snap/stress-ng/924"}, {"filesystem": "tmpfs", "1k-blocks": 201728, "used": 0, "available": 201728, "use_percent": 0, "mounted_on": "/run/user/1000"}, {"filesystem": "/dev/loop9", "1k-blocks": 8832, "used": 8832, "available": 0, "use_percent": 100, "mounted_on": "/snap/doctl/215"}, {"filesystem": "/dev/loop4", "1k-blocks": 68224, "used": 68224, "available": 0, "use_percent": 100, "mounted_on": "/snap/google-cloud-sdk/104"}] +[{"filesystem": "udev", "1k_blocks": 977500, "used": 0, "available": 977500, "use_percent": 0, "mounted_on": "/dev"}, {"filesystem": "tmpfs", "1k_blocks": 201732, "used": 1204, "available": 200528, "use_percent": 1, "mounted_on": "/run"}, {"filesystem": "/dev/sda2", "1k_blocks": 20508240, "used": 5748028, "available": 13695408, "use_percent": 30, "mounted_on": "/"}, {"filesystem": "tmpfs", "1k_blocks": 1008648, "used": 0, "available": 1008648, "use_percent": 0, "mounted_on": "/dev/shm"}, {"filesystem": "tmpfs", "1k_blocks": 5120, "used": 0, "available": 5120, "use_percent": 0, "mounted_on": "/run/lock"}, {"filesystem": "tmpfs", "1k_blocks": 1008648, "used": 0, "available": 1008648, "use_percent": 0, "mounted_on": "/sys/fs/cgroup"}, {"filesystem": "/dev/loop0", "1k_blocks": 55936, "used": 55936, "available": 0, "use_percent": 100, "mounted_on": "/snap/core18/1223"}, {"filesystem": "/dev/loop1", "1k_blocks": 11264, "used": 11264, "available": 0, "use_percent": 100, "mounted_on": "/snap/slcli/383"}, {"filesystem": "/dev/loop2", "1k_blocks": 90880, "used": 90880, "available": 0, "use_percent": 100, "mounted_on": "/snap/core/7396"}, {"filesystem": "/dev/loop3", "1k_blocks": 68096, "used": 68096, "available": 0, "use_percent": 100, "mounted_on": "/snap/google-cloud-sdk/103"}, {"filesystem": "/dev/loop5", "1k_blocks": 55808, "used": 55808, "available": 0, "use_percent": 100, "mounted_on": "/snap/core18/1074"}, {"filesystem": "/dev/loop7", "1k_blocks": 8832, "used": 8832, "available": 0, "use_percent": 100, "mounted_on": "/snap/doctl/187"}, {"filesystem": "/dev/loop8", "1k_blocks": 3200, "used": 3200, "available": 0, "use_percent": 100, "mounted_on": "/snap/stress-ng/847"}, {"filesystem": "/dev/loop10", "1k_blocks": 91264, "used": 91264, "available": 0, "use_percent": 100, "mounted_on": "/snap/core/7917"}, {"filesystem": "/dev/loop11", "1k_blocks": 3328, "used": 3328, "available": 0, "use_percent": 100, "mounted_on": "/snap/stress-ng/924"}, {"filesystem": "tmpfs", "1k_blocks": 201728, "used": 0, "available": 201728, "use_percent": 0, "mounted_on": "/run/user/1000"}, {"filesystem": "/dev/loop9", "1k_blocks": 8832, "used": 8832, "available": 0, "use_percent": 100, "mounted_on": "/snap/doctl/215"}, {"filesystem": "/dev/loop4", "1k_blocks": 68224, "used": 68224, "available": 0, "use_percent": 100, "mounted_on": "/snap/google-cloud-sdk/104"}]