summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/vyos/version.py28
1 files changed, 2 insertions, 26 deletions
diff --git a/python/vyos/version.py b/python/vyos/version.py
index f5eac5a58..871bb0f1b 100644
--- a/python/vyos/version.py
+++ b/python/vyos/version.py
@@ -1,4 +1,4 @@
-# Copyright 2017 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2017-2020 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
@@ -31,8 +31,6 @@ Example of the version data dict::
import os
import json
-import logging
-
import vyos.defaults
from vyos.util import read_file
@@ -43,7 +41,7 @@ from vyos.util import DEVNULL
version_file = os.path.join(vyos.defaults.directories['data'], 'version.json')
-
+
def get_version_data(fname=version_file):
"""
@@ -77,28 +75,6 @@ def get_full_version_data(fname=version_file):
# Get system architecture (well, kernel architecture rather)
version_data['system_arch'], _ = popen('uname -m', stderr=DEVNULL)
- cpu_json,code = popen('lscpu -J',stderr=DEVNULL)
-
- cpu = {}
- 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']
-
- if len(cpu) > 0:
- version_data['cpu'] = cpu
-
-
-
hypervisor,code = popen('hvinfo', stderr=DEVNULL)
if code == 1:
# hvinfo returns 1 if it cannot detect any hypervisor