summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2022-10-28 09:00:23 -0400
committerDaniil Baturin <daniil@vyos.io>2022-10-28 09:00:23 -0400
commitf35195945daba0a81a93b74b280591dd955c193a (patch)
treef2cc5ae407c2941f26855965c31d912be846c894 /src
parentea8d4ae325059681460f6c74751cfe8ebb2931bc (diff)
downloadvyos-1x-f35195945daba0a81a93b74b280591dd955c193a.tar.gz
vyos-1x-f35195945daba0a81a93b74b280591dd955c193a.zip
T4779: use bytes in the raw output of "show system memory"
Diffstat (limited to 'src')
-rwxr-xr-xsrc/op_mode/memory.py27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/op_mode/memory.py b/src/op_mode/memory.py
index 178544be4..7666de646 100755
--- a/src/op_mode/memory.py
+++ b/src/op_mode/memory.py
@@ -20,7 +20,7 @@ import sys
import vyos.opmode
-def _get_system_memory():
+def _get_raw_data():
from re import search as re_search
def find_value(keyword, mem_data):
@@ -38,7 +38,7 @@ def _get_system_memory():
used = total - available
- res = {
+ mem_data = {
"total": total,
"free": available,
"used": used,
@@ -46,24 +46,21 @@ def _get_system_memory():
"cached": cached
}
- return res
-
-def _get_system_memory_human():
- from vyos.util import bytes_to_human
-
- mem = _get_system_memory()
-
- for key in mem:
+ for key in mem_data:
# The Linux kernel exposes memory values in kilobytes,
# so we need to normalize them
- mem[key] = bytes_to_human(mem[key], initial_exponent=10)
+ mem_data[key] = mem_data[key] * 1024
- return mem
-
-def _get_raw_data():
- return _get_system_memory_human()
+ return mem_data
def _get_formatted_output(mem):
+ from vyos.util import bytes_to_human
+
+ # For human-readable outputs, we convert bytes to more convenient units
+ # (100M, 1.3G...)
+ for key in mem:
+ mem[key] = bytes_to_human(mem[key])
+
out = "Total: {}\n".format(mem["total"])
out += "Free: {}\n".format(mem["free"])
out += "Used: {}".format(mem["used"])