Merge pull request #3606 from c-po/utils-cpu-T5195

vyos.utils: T5195: import vyos.cpu to this package

3 files changed, 9 insertions, 9 deletions

diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py
index a969626a9..ded370a7a 100755
--- a/src/conf_mode/container.py
+++ b/src/conf_mode/container.py
@@ -29,7 +29,7 @@ from vyos.configdict import node_changed
 from vyos.configdict import is_node_changed
 from vyos.configverify import verify_vrf
 from vyos.ifconfig import Interface
-from vyos.cpu import get_core_count
+from vyos.utils.cpu import get_core_count
 from vyos.utils.file import write_file
 from vyos.utils.process import call
 from vyos.utils.process import cmd
diff --git a/src/op_mode/cpu.py b/src/op_mode/cpu.py
index d53663c17..1a0f7392f 100755
--- a/src/op_mode/cpu.py
+++ b/src/op_mode/cpu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2016-2022 VyOS maintainers and contributors
+# Copyright (C) 2016-2024 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
@@ -16,8 +16,9 @@
 
 import sys
 
-import vyos.cpu
 import vyos.opmode
+from vyos.utils.cpu import get_cpus
+from vyos.utils.cpu import get_core_count
 
 from jinja2 import Template
 
@@ -37,15 +38,15 @@ CPU model(s): {{models | join(", ")}}
 """)
 
 def _get_raw_data():
-    return vyos.cpu.get_cpus()
+    return 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()
+    count = get_core_count()
+    cpu_data = get_cpus()
     models = [c['model name'] for c in cpu_data]
     env = {'count': count, "models": models}
 
@@ -79,4 +80,3 @@ if __name__ == '__main__':
     except (ValueError, vyos.opmode.Error) as e:
         print(e)
         sys.exit(1)
-
diff --git a/src/op_mode/uptime.py b/src/op_mode/uptime.py
index 059a4c3f6..559eed24c 100755
--- a/src/op_mode/uptime.py
+++ b/src/op_mode/uptime.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021-2023 VyOS maintainers and contributors
+# Copyright (C) 2021-2024 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 as
@@ -29,8 +29,8 @@ def _get_uptime_seconds():
 
 def _get_load_averages():
     from re import search
+    from vyos.utils.cpu import get_core_count
     from vyos.utils.process import cmd
-    from vyos.cpu import get_core_count
 
     data = cmd("uptime")
     matches = search(r"load average:\s*(?P<one>[0-9\.]+)\s*,\s*(?P<five>[0-9\.]+)\s*,\s*(?P<fifteen>[0-9\.]+)\s*", data)