T2719: rework 'show hardware cpu *' commands in the new style

4 files changed, 90 insertions, 125 deletions

diff --git a/op-mode-definitions/show-hardware.xml.in b/op-mode-definitions/show-hardware.xml.in
index 20fdd753d..ebd806ba5 100644
--- a/op-mode-definitions/show-hardware.xml.in
+++ b/op-mode-definitions/show-hardware.xml.in
@@ -9,21 +9,21 @@
         <children>
           <node name="cpu">
             <properties>
-              <help>Show CPU info</help>
+              <help>Show CPU informaion</help>
             </properties>
-            <command>lscpu</command>
+            <command>${vyos_op_scripts_dir}/cpu.py show</command>
             <children>
               <node name="detail">
                 <properties>
-                  <help> Show system CPU details</help>
+                  <help>Show system CPU details</help>
                 </properties>
                 <command>cat /proc/cpuinfo</command>
               </node>
               <node name="summary">
                 <properties>
-                  <help>Show system CPUs</help>
+                  <help>Show system CPUs summary</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/cpu_summary.py</command>
+                <command>${vyos_op_scripts_dir}/cpu.py show_summary</command>
               </node>
             </children>
           </node>
diff --git a/src/op_mode/cpu.py b/src/op_mode/cpu.py
new file mode 100755
index 000000000..cb55ce407
--- /dev/null
+++ b/src/op_mode/cpu.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2016-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 json
+import sys
+import typing
+
+import vyos.cpu
+import vyos.opmode
+
+from jinja2 import Template
+from vyos.util import popen, DEVNULL
+
+cpu_template = Template("""
+{% for cpu in cpus %}
+{% if 'physical id' in cpu %}CPU socket: {{cpu['physical id']}}{% endif %}
+{% if 'vendor_id' in cpu %}CPU Vendor:       {{cpu['vendor_id']}}{% endif %}
+{% if 'model name' in cpu %}Model:            {{cpu['model name']}}{% endif %}
+{% if 'cpu cores' in cpu %}Cores:            {{cpu['cpu cores']}}{% endif %}
+{% if 'cpu MHz' in cpu %}Current MHz:      {{cpu['cpu MHz']}}{% endif %}
+{% endfor %}
+""")
+
+cpu_summary_template = Template("""
+Physical CPU cores: {{count}}
+CPU model(s): {{models | join(", ")}}
+""")
+
+def _get_raw_data():
+    return vyos.cpu.get_cpus()
+
+def _format_cpus(cpu_data):
+    env = {'cpus': cpu_data}
+    return cpu_template.render(env).strip()
+
+def _get_summary_data():
+    count = vyos.cpu.get_core_count()
+    cpu_data = vyos.cpu.get_cpus()
+    models = [c['model name'] for c in cpu_data]
+    env = {'count': count, "models": models}
+
+    return env
+
+def _format_cpu_summary(summary_data):
+    return cpu_summary_template.render(summary_data).strip()
+
+def show(raw: bool):
+    cpu_data = _get_raw_data()
+
+    if raw:
+        return cpu_data
+    else:
+        return _format_cpus(cpu_data)
+
+def show_summary(raw: bool):
+    cpu_summary_data = _get_summary_data()
+
+    if raw:
+        return cpu_summary_data
+    else:
+        return _format_cpu_summary(cpu_summary_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/cpu_summary.py b/src/op_mode/cpu_summary.py
deleted file mode 100755
index 3bdf5a718..000000000
--- a/src/op_mode/cpu_summary.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2018-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 re
-from vyos.util import colon_separated_to_dict
-
-FILE_NAME = '/proc/cpuinfo'
-
-def get_raw_data():
-    with open(FILE_NAME, 'r') as f:
-        data_raw = f.read()
-
-    data = colon_separated_to_dict(data_raw)
-
-    # Accumulate all data in a dict for future support for machine-readable output
-    cpu_data = {}
-    cpu_data['cpu_number'] = len(data['processor'])
-    cpu_data['models'] = list(set(data['model name']))
-
-    # Strip extra whitespace from CPU model names, /proc/cpuinfo is prone to that
-    cpu_data['models'] = list(map(lambda s: re.sub(r'\s+', ' ', s), cpu_data['models']))
-
-    return cpu_data
-
-def get_formatted_output():
-    cpu_data = get_raw_data()
-
-    out = "CPU(s): {0}\n".format(cpu_data['cpu_number'])
-    out += "CPU model(s): {0}".format(",".join(cpu_data['models']))
-
-    return out
-
-if __name__ == '__main__':
-    print(get_formatted_output())
-
diff --git a/src/op_mode/show_cpu.py b/src/op_mode/show_cpu.py
deleted file mode 100755
index 9973d9789..000000000
--- a/src/op_mode/show_cpu.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2016-2020 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 json
-
-from jinja2 import Template
-from sys import exit
-from vyos.util import popen, DEVNULL
-
-OUT_TMPL_SRC = """
-{%- if cpu -%}
-{% if 'vendor' in cpu %}CPU Vendor:       {{cpu.vendor}}{% endif %}
-{% if 'model' in cpu %}Model:            {{cpu.model}}{% endif %}
-{% if 'cpus' in cpu %}Total CPUs:       {{cpu.cpus}}{% endif %}
-{% if 'sockets' in cpu %}Sockets:          {{cpu.sockets}}{% endif %}
-{% if 'cores' in cpu %}Cores:            {{cpu.cores}}{% endif %}
-{% if 'threads' in cpu %}Threads:          {{cpu.threads}}{% endif %}
-{% if 'mhz' in cpu %}Current MHz:      {{cpu.mhz}}{% endif %}
-{% if 'mhz_min' in cpu %}Minimum MHz:      {{cpu.mhz_min}}{% endif %}
-{% if 'mhz_max' in cpu %}Maximum MHz:      {{cpu.mhz_max}}{% endif %}
-{%- endif -%}
-"""
-
-def get_raw_data():
-    cpu = {}
-    cpu_json, code = popen('lscpu -J', stderr=DEVNULL)
-
-    if code == 0:
-        cpu_info = json.loads(cpu_json)
-        if len(cpu_info) > 0 and 'lscpu' in cpu_info:
-            for prop in cpu_info['lscpu']:
-                if (prop['field'].find('Thread(s)') > -1): cpu['threads'] = prop['data']
-                if (prop['field'].find('Core(s)')) > -1: cpu['cores'] = prop['data']
-                if (prop['field'].find('Socket(s)')) > -1: cpu['sockets'] = prop['data']
-                if (prop['field'].find('CPU(s):')) > -1: cpu['cpus'] = prop['data']
-                if (prop['field'].find('CPU MHz')) > -1: cpu['mhz'] = prop['data']
-                if (prop['field'].find('CPU min MHz')) > -1: cpu['mhz_min'] = prop['data']
-                if (prop['field'].find('CPU max MHz')) > -1: cpu['mhz_max'] = prop['data']
-                if (prop['field'].find('Vendor ID')) > -1: cpu['vendor'] = prop['data']
-                if (prop['field'].find('Model name')) > -1: cpu['model'] = prop['data']
-
-    return cpu
-
-def get_formatted_output():
-    cpu = get_raw_data()
-
-    tmp = {'cpu':cpu}
-    tmpl = Template(OUT_TMPL_SRC)
-    return tmpl.render(tmp)
-
-if __name__ == '__main__':
-    cpu = get_raw_data()
-
-    if len(cpu) > 0:
-        print(get_formatted_output())
-    else:
-        print('CPU information could not be determined\n')
-        exit(1)
-