diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-09 09:29:52 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-10 11:50:33 +0000 |
| commit | 66af3962fa79e86ca2933289f273ccad08748eab (patch) | |
| tree | 614923e96f8eb04bb644f392eea7482e23630409 /python | |
| parent | c55422db607efe7b62c863c31a1e8516d57f8e0f (diff) | |
| download | vyos-1x-66af3962fa79e86ca2933289f273ccad08748eab.tar.gz vyos-1x-66af3962fa79e86ca2933289f273ccad08748eab.zip | |
vyos.utils: T5195: import vyos.cpu to this package
The intention of vyos.utils package is to have a common ground for repeating
actions/helpers. This is also true for number of CPUs and their respective
core count.
Move vyos.cpu to vyos.utils.cpu
(cherry picked from commit e318eb33446de47835480d4b8f1646b39fb5c388)
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configdict.py | 2 | ||||
| -rw-r--r-- | python/vyos/utils/__init__.py | 3 | ||||
| -rw-r--r-- | python/vyos/utils/cpu.py (renamed from python/vyos/cpu.py) | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 870d7cfda..5a353b110 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -631,7 +631,7 @@ def get_accel_dict(config, base, chap_secrets, with_pki=False): Return a dictionary with the necessary interface config keys. """ - from vyos.cpu import get_core_count + from vyos.utils.cpu import get_core_count from vyos.template import is_ipv4 dict = config.get_config_dict(base, key_mangling=('-', '_'), diff --git a/python/vyos/utils/__init__.py b/python/vyos/utils/__init__.py index 12ef2d3b8..1cd062a11 100644 --- a/python/vyos/utils/__init__.py +++ b/python/vyos/utils/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2023 VyOS maintainers and contributors <maintainers@vyos.io> +# Copyright 2024 VyOS maintainers and contributors <maintainers@vyos.io> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,7 @@ from vyos.utils import auth from vyos.utils import boot from vyos.utils import commit from vyos.utils import convert +from vyos.utils import cpu from vyos.utils import dict from vyos.utils import file from vyos.utils import io diff --git a/python/vyos/cpu.py b/python/vyos/utils/cpu.py index 12b6285d0..0f74add0e 100644 --- a/python/vyos/cpu.py +++ b/python/vyos/utils/cpu.py @@ -28,7 +28,6 @@ but nothing is certain. import re - def _read_cpuinfo(): with open('/proc/cpuinfo', 'r') as f: lines = f.read().strip() |