diff --git a/jc/parsers/systeminfo.py b/jc/parsers/systeminfo.py index cf5081bf..2fa08e84 100644 --- a/jc/parsers/systeminfo.py +++ b/jc/parsers/systeminfo.py @@ -42,11 +42,11 @@ Examples: "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC-08:00) Pacific Time (US & Canada)", - "total_physical_memory": "2,047 MB", - "available_physical_memory": "1,417 MB", - "virtual_memory_max_size": "2,687 MB", - "virtual_memory_available": "1,482 MB", - "virtual_memory_in_use": "1,205 MB", + "total_physical_memory_mb": "2,047 MB", + "available_physical_memory_mb": "1,417 MB", + "virtual_memory_max_size_mb": "2,687 MB", + "virtual_memory_available_mb": "1,482 MB", + "virtual_memory_in_use_mb": "1,205 MB", "page_file_locations": "C:\\pagefile.sys", "domain": "TEST.local", "logon_server": "\\\\WIN-AA1A1A11AAA", @@ -103,11 +103,11 @@ Examples: "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC-08:00) Pacific Time (US & Canada)", - "total_physical_memory": 2047, - "available_physical_memory": 1417, - "virtual_memory_max_size": 2687, - "virtual_memory_available": 1482, - "virtual_memory_in_use": 1205", + "total_physical_memory_mb": 2047, + "available_physical_memory_mb": 1417, + "virtual_memory_max_size_mb": 2687, + "virtual_memory_available_mb": 1482, + "virtual_memory_in_use_mb": 1205", "page_file_locations": "C:\\pagefile.sys", "domain": "TEST.local", "logon_server": "\\\\WIN-AA1A1A11AAA", @@ -195,11 +195,11 @@ def process(proc_data): "system_locale": "string", "input_locale": "string", "time_zone": "string", - "total_physical_memory": "string", - "available_physical_memory": integer, - "virtual_memory_max_size": integer, - "virtual_memory_available": integer, - "virtual_memory_in_use": integer, + "total_physical_memory_mb": "string", + "available_physical_memory_mb": integer, + "virtual_memory_max_size_mb": integer, + "virtual_memory_available_mb": integer, + "virtual_memory_in_use_mb": integer, "page_file_locations": "string", "domain": "string", "logon_server": "string", @@ -230,11 +230,11 @@ def process(proc_data): ) int_list = [ - "total_physical_memory", - "available_physical_memory", - "virtual_memory_max_size", - "virtual_memory_available", - "virtual_memory_in_use", + "total_physical_memory_mb", + "available_physical_memory_mb", + "virtual_memory_max_size_mb", + "virtual_memory_available_mb", + "virtual_memory_in_use_mb", ] for key in int_list: proc_data[key] = convert_to_int(proc_data.get(key)) @@ -326,6 +326,14 @@ def parse(data, raw=False, quiet=False): raw_output[k] = parse_network_cards(v) elif k in ["hyperv_requirements"]: raw_output[k] = parse_hyperv_requirements(v) + elif k in [ + "total_physical_memory", + "available_physical_memory", + "virtual_memory_max_size", + "virtual_memory_available", + "virtual_memory_in_use" + ]: + raw_output[k + "_mb"] = v.strip() else: raw_output[k] = v.strip() diff --git a/tests/fixtures/windows/windows-10/systeminfo-hyperv.json b/tests/fixtures/windows/windows-10/systeminfo-hyperv.json index 7047941a..020e9c71 100644 --- a/tests/fixtures/windows/windows-10/systeminfo-hyperv.json +++ b/tests/fixtures/windows/windows-10/systeminfo-hyperv.json @@ -8,8 +8,8 @@ "registered_owner": "Test, Inc.", "registered_organization": "Test, Inc.", "product_id": "11111-11111-11111-AA111", - "original_install_date": 1553633490, - "system_boot_time": 1617102839, + "original_install_date": 1553640690, + "system_boot_time": 1617110039, "system_manufacturer": "Dell Inc.", "system_model": "Precision 5530", "system_type": "x64-based PC", @@ -23,11 +23,11 @@ "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC-06:00) Central Time (US & Canada)", - "total_physical_memory": 32503, - "available_physical_memory": 19743, - "virtual_memory_max_size": 37367, - "virtual_memory_available": 22266, - "virtual_memory_in_use": 15101, + "total_physical_memory_mb": 32503, + "available_physical_memory_mb": 19743, + "virtual_memory_max_size_mb": 37367, + "virtual_memory_available_mb": 22266, + "virtual_memory_in_use_mb": 15101, "page_file_locations": "C:\\pagefile.sys", "domain": "test.com", "logon_server": "\\\\TESTDC01", diff --git a/tests/fixtures/windows/windows-10/systeminfo.json b/tests/fixtures/windows/windows-10/systeminfo.json index e311914b..4abab0b2 100644 --- a/tests/fixtures/windows/windows-10/systeminfo.json +++ b/tests/fixtures/windows/windows-10/systeminfo.json @@ -8,8 +8,8 @@ "registered_owner": "User", "registered_organization": "", "product_id": "00111-12345-00001-AA111", - "original_install_date": 1613496027, - "system_boot_time": 1616163903, + "original_install_date": 1613503227, + "system_boot_time": 1616171103, "system_manufacturer": "VMware, Inc.", "system_model": "VMware7,1", "system_type": "x64-based PC", @@ -23,11 +23,11 @@ "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC-08:00) Pacific Time (US & Canada)", - "total_physical_memory": 2047, - "available_physical_memory": 1417, - "virtual_memory_max_size": 2687, - "virtual_memory_available": 1482, - "virtual_memory_in_use": 1205, + "total_physical_memory_mb": 2047, + "available_physical_memory_mb": 1417, + "virtual_memory_max_size_mb": 2687, + "virtual_memory_available_mb": 1482, + "virtual_memory_in_use_mb": 1205, "page_file_locations": "C:\\pagefile.sys", "domain": "TEST.local", "logon_server": "\\\\WIN-AA1A1A11AAA", diff --git a/tests/fixtures/windows/windows-2012r2/systeminfo.json b/tests/fixtures/windows/windows-2012r2/systeminfo.json index 5532a8f5..6977f53f 100644 --- a/tests/fixtures/windows/windows-2012r2/systeminfo.json +++ b/tests/fixtures/windows/windows-2012r2/systeminfo.json @@ -8,8 +8,8 @@ "registered_owner": "Windows User", "registered_organization": "", "product_id": "11111-11111-11111-AA111", - "original_install_date": 1544685348, - "system_boot_time": 1616960084, + "original_install_date": 1544692548, + "system_boot_time": 1616967284, "system_manufacturer": "Microsoft Corporation", "system_model": "Virtual Machine", "system_type": "x64-based PC", @@ -23,11 +23,11 @@ "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC+03:00) Kuwait, Riyadh", - "total_physical_memory": 3555, - "available_physical_memory": 771, - "virtual_memory_max_size": 5731, - "virtual_memory_available": 2751, - "virtual_memory_in_use": 2980, + "total_physical_memory_mb": 3555, + "available_physical_memory_mb": 771, + "virtual_memory_max_size_mb": 5731, + "virtual_memory_available_mb": 2751, + "virtual_memory_in_use_mb": 2980, "page_file_locations": "C:\\pagefile.sys", "domain": "WORKGROUP", "logon_server": "\\\\WIN-1A1A1AA11AA", diff --git a/tests/fixtures/windows/windows-7/systeminfo.json b/tests/fixtures/windows/windows-7/systeminfo.json index 917339c2..8945f6fd 100644 --- a/tests/fixtures/windows/windows-7/systeminfo.json +++ b/tests/fixtures/windows/windows-7/systeminfo.json @@ -8,8 +8,8 @@ "registered_owner": "jdoe", "registered_organization": "", "product_id": "00000-111-1111111-11111", - "original_install_date": 1420135200, - "system_boot_time": 1616436951, + "original_install_date": 1420142400, + "system_boot_time": 1616444151, "system_manufacturer": "LENOVO", "system_model": "11111AA", "system_type": "x64-based PC", @@ -23,11 +23,11 @@ "system_locale": "en-us;English (United States)", "input_locale": "en-us;English (United States)", "time_zone": "(UTC-06:00) Central Time (US & Canada)", - "total_physical_memory": 8075, - "available_physical_memory": 1620, - "virtual_memory_max_size": 16149, - "virtual_memory_available": 6468, - "virtual_memory_in_use": 9681, + "total_physical_memory_mb": 8075, + "available_physical_memory_mb": 1620, + "virtual_memory_max_size_mb": 16149, + "virtual_memory_available_mb": 6468, + "virtual_memory_in_use_mb": 9681, "page_file_locations": "C:\\pagefile.sys", "domain": "WORKGROUP", "logon_server": "\\\\TEST",