From dc4b80f1aee3c786889d9e34cf6b54a1a5b83b56 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Tue, 5 Jul 2022 10:23:57 -0400
Subject: T2719: convert the 'show system memory' script to the new style

---
 op-mode-definitions/show-system.xml.in |  2 +-
 src/op_mode/memory.py                  | 90 ++++++++++++++++++++++++++++++++++
 src/op_mode/show_ram.py                | 71 ---------------------------
 3 files changed, 91 insertions(+), 72 deletions(-)
 create mode 100755 src/op_mode/memory.py
 delete mode 100755 src/op_mode/show_ram.py

diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 68b473bc1..6f05d0c12 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -104,7 +104,7 @@
             <properties>
               <help>Show system memory usage</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_ram.py</command>
+            <command>${vyos_op_scripts_dir}/memory.py show</command>
             <children>
               <leafNode name="cache">
                 <properties>
diff --git a/src/op_mode/memory.py b/src/op_mode/memory.py
new file mode 100755
index 000000000..a3870e498
--- /dev/null
+++ b/src/op_mode/memory.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021-2022 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+
+import vyos.opmode
+
+
+def _get_system_memory():
+    from re import search as re_search
+
+    def find_value(keyword, mem_data):
+        regex = keyword + ':\s+(\d+)'
+        res = re_search(regex, mem_data).group(1)
+        return int(res)
+
+    with open("/proc/meminfo", "r") as f:
+        mem_data = f.read()
+
+    total     = find_value('MemTotal', mem_data)
+    available = find_value('MemAvailable', mem_data)
+    buffers   = find_value('Buffers', mem_data)
+    cached    = find_value('Cached', mem_data)
+
+    used = total - available
+
+    res = {
+      "total":   total,
+      "free":    available,
+      "used":    used,
+      "buffers": buffers,
+      "cached":  cached
+    }
+
+    return res
+
+def _get_system_memory_human():
+    from vyos.util import bytes_to_human
+
+    mem = _get_system_memory()
+
+    for key in mem:
+        # The Linux kernel exposes memory values in kilobytes,
+        # so we need to normalize them
+        mem[key] = bytes_to_human(mem[key], initial_exponent=10)
+
+    return mem
+
+def _get_raw_data():
+    return _get_system_memory_human()
+
+def _get_formatted_output(mem):
+    out = "Total: {}\n".format(mem["total"])
+    out += "Free:  {}\n".format(mem["free"])
+    out += "Used:  {}".format(mem["used"])
+
+    return out
+
+def show(raw: bool):
+    ram_data = _get_raw_data()
+
+    if raw:
+        return ram_data
+    else:
+        return _get_formatted_output(ram_data)
+
+
+if __name__ == '__main__':
+    try:
+        res = vyos.opmode.run(sys.modules[__name__])
+        if res:
+            print(res)
+    except ValueError as e:
+        print(e)
+        sys.exit(1)
+
diff --git a/src/op_mode/show_ram.py b/src/op_mode/show_ram.py
deleted file mode 100755
index 2b0be3965..000000000
--- a/src/op_mode/show_ram.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2022 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-def get_system_memory():
-    from re import search as re_search
-
-    def find_value(keyword, mem_data):
-        regex = keyword + ':\s+(\d+)'
-        res = re_search(regex, mem_data).group(1)
-        return int(res)
-
-    with open("/proc/meminfo", "r") as f:
-        mem_data = f.read()
-
-    total     = find_value('MemTotal', mem_data)
-    available = find_value('MemAvailable', mem_data)
-    buffers   = find_value('Buffers', mem_data)
-    cached    = find_value('Cached', mem_data)
-
-    used = total - available
-
-    res = {
-      "total":   total,
-      "free":    available,
-      "used":    used,
-      "buffers": buffers,
-      "cached":  cached
-    }
-
-    return res
-
-def get_system_memory_human():
-    from vyos.util import bytes_to_human
-
-    mem = get_system_memory()
-
-    for key in mem:
-        # The Linux kernel exposes memory values in kilobytes,
-        # so we need to normalize them
-        mem[key] = bytes_to_human(mem[key], initial_exponent=10)
-
-    return mem
-
-def get_raw_data():
-    return get_system_memory_human()
-
-def get_formatted_output():
-    mem = get_raw_data()
-
-    out = "Total: {}\n".format(mem["total"])
-    out += "Free:  {}\n".format(mem["free"])
-    out += "Used:  {}".format(mem["used"])
-
-    return out
-
-if __name__ == '__main__':
-    print(get_formatted_output())
-- 
cgit v1.2.3