Skip to content

GitLab

"googlemock/git@developer.sourcefind.cn:yangql/googletest.git" did not exist on "ecd530865cefdfa7dea58e84f6aa1b548950363d"
Unverified Commit 2d85781b authored by Yuting Jiang's avatar Yuting Jiang Committed by GitHub
Browse files

Tool: Fix bug - Fix function naming issue in system info (#200) 

**Description**
Fix function naming issue in system info.

**Major Revision**
- fix function naming issue in system info 
- save to json file
- add timeout for subprocess.run
- revise error handling to print exception message
parent 9106dcf4
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 118 deletions
superbench/tools/system_info.py
View file @ 2d85781b
...@@ -4,15 +4,19 @@ ...@@ -4,15 +4,19 @@
"""Generate system config.""" """Generate system config."""
import json import json
import os
import subprocess import subprocess
import xmltodict
from pathlib import Path from pathlib import Path
import xmltodict
from superbench.common.utils import logger
class SystemInfo(): # pragma: no cover class SystemInfo(): # pragma: no cover
"""Systsem info class.""" """Systsem info class."""
def run_cmd(self, command): def _run_cmd(self, command):
"""Run the command as root or non-root user and return the stdout string.. """Run the command and return the stdout string.
Args: Args:
command (string): the command to run in terminal. command (string): the command to run in terminal.
...@@ -21,11 +25,17 @@ def run_cmd(self, command): ...@@ -21,11 +25,17 @@ def run_cmd(self, command):
string: the stdout string of the command. string: the stdout string of the command.
""" """
output = subprocess.run( output = subprocess.run(
command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, check=False, universal_newlines=True command,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
shell=True,
check=False,
universal_newlines=True,
timeout=300
) )
return output.stdout return output.stdout
def count_prefix_indent(self, content, symbol='\t'): def __count_prefix_indent(self, content, symbol='\t'):
r"""Count the number of a specific symbol in the content. r"""Count the number of a specific symbol in the content.
Args: Args:
...@@ -43,7 +53,7 @@ def count_prefix_indent(self, content, symbol='\t'): ...@@ -43,7 +53,7 @@ def count_prefix_indent(self, content, symbol='\t'):
break break
return count return count
def parse_key_value_lines(self, lines, required_keywords=None, omitted_values=None, symbol=':'): # noqa: C901 def _parse_key_value_lines(self, lines, required_keywords=None, omitted_values=None, symbol=':'): # noqa: C901
"""Parse the lines like "key:value" and convert them to dict. """Parse the lines like "key:value" and convert them to dict.
if required_keywords is None, include all line. Otherwise, if required_keywords is None, include all line. Otherwise,
...@@ -83,7 +93,7 @@ def parse_key_value_lines(self, lines, required_keywords=None, omitted_values=No ...@@ -83,7 +93,7 @@ def parse_key_value_lines(self, lines, required_keywords=None, omitted_values=No
while next_indent_index < length and self.__count_prefix_indent(lines[next_indent_index]) > indent: while next_indent_index < length and self.__count_prefix_indent(lines[next_indent_index]) > indent:
next_indent_index += 1 next_indent_index += 1
value = self.__parse_key_value_lines(lines[i + 1:next_indent_index]) value = self._parse_key_value_lines(lines[i + 1:next_indent_index])
i = next_indent_index - 1 i = next_indent_index - 1
# split line by symbol # split line by symbol
elif symbol in line: elif symbol in line:
...@@ -112,7 +122,7 @@ def parse_key_value_lines(self, lines, required_keywords=None, omitted_values=No ...@@ -112,7 +122,7 @@ def parse_key_value_lines(self, lines, required_keywords=None, omitted_values=No
i += 1 i += 1
return dict return dict
def parse_table_lines(self, lines, key): def _parse_table_lines(self, lines, key):
"""Parse lines like a table and extract the colomns whose table index are the same as key to list of dict. """Parse lines like a table and extract the colomns whose table index are the same as key to list of dict.
Args: Args:
...@@ -125,22 +135,19 @@ def parse_table_lines(self, lines, key): ...@@ -125,22 +135,19 @@ def parse_table_lines(self, lines, key):
index = [] index = []
list = [] list = []
valid = False valid = False
try: for line in lines:
for line in lines: line = line.split()
line = line.split() if key[0] in line:
if key[0] in line: for i in range(len(key)):
for i in range(len(key)): index.append(line.index(key[i]))
index.append(line.index(key[i])) valid = True
valid = True continue
continue if valid:
if valid: dict = {}
dict = {} for i in range(len(key)):
for i in range(len(key)): if index[i] < len(line):
if index[i] < len(line): dict[key[i]] = line[index[i]]
dict[key[i]] = line[index[i]] list.append(dict)
list.append(dict)
except Exception:
print('Error: key error in __parse_table_lines')
return list return list
def get_cpu(self): def get_cpu(self):
...@@ -152,13 +159,13 @@ def get_cpu(self): ...@@ -152,13 +159,13 @@ def get_cpu(self):
lscpu_dict = {} lscpu_dict = {}
try: try:
# get general cpu information from lscpu # get general cpu information from lscpu
lscpu = self.__run_cmd('lscpu').splitlines() lscpu = self._run_cmd('lscpu').splitlines()
# get distinct max_speed and current_speed of cpus from dmidecode # get distinct max_speed and current_speed of cpus from dmidecode
speed = self.__run_cmd(r'dmidecode -t processor | grep "Speed"').splitlines() speed = self._run_cmd(r'dmidecode -t processor | grep "Speed"').splitlines()
lscpu_dict = self.__parse_key_value_lines(lscpu) lscpu_dict = self._parse_key_value_lines(lscpu)
lscpu_dict.update(self.__parse_key_value_lines(speed)) lscpu_dict.update(self._parse_key_value_lines(speed))
except Exception: except Exception:
print('Error: get CPU info failed') logger.exception('Error: get CPU info failed')
return lscpu_dict return lscpu_dict
def get_system(self): def get_system(self):
...@@ -169,27 +176,27 @@ def get_system(self): ...@@ -169,27 +176,27 @@ def get_system(self):
""" """
system_dict = {} system_dict = {}
try: try:
lsmod = self.__run_cmd('lsmod').splitlines() lsmod = self._run_cmd('lsmod').splitlines()
lsmod = self.__parse_table_lines(lsmod, key=['Module', 'Size', 'Used', 'by']) lsmod = self._parse_table_lines(lsmod, key=['Module', 'Size', 'Used', 'by'])
sysctl = self.__run_cmd('sysctl -a').splitlines() sysctl = self._run_cmd('sysctl -a').splitlines()
sysctl = self.__parse_key_value_lines(sysctl, None, None, '=') sysctl = self._parse_key_value_lines(sysctl, None, None, '=')
system_dict['system_manufacturer'] = self.__run_cmd('dmidecode -s system-manufacturer').strip() system_dict['system_manufacturer'] = self._run_cmd('dmidecode -s system-manufacturer').strip()
system_dict['system_product'] = self.__run_cmd('dmidecode -s system-product-name').strip() system_dict['system_product'] = self._run_cmd('dmidecode -s system-product-name').strip()
system_dict['os'] = self.__run_cmd('cat /proc/version').strip() system_dict['os'] = self._run_cmd('cat /proc/version').strip()
system_dict['uname'] = self.__run_cmd('uname -a').strip() system_dict['uname'] = self._run_cmd('uname -a').strip()
system_dict['docker'] = self.__get_docker_version() system_dict['docker'] = self.get_docker_version()
system_dict['kernel_parameters'] = sysctl system_dict['kernel_parameters'] = sysctl
system_dict['kernel_modules'] = lsmod system_dict['kernel_modules'] = lsmod
system_dict['dmidecode'] = self.__run_cmd('dmidecode').strip() system_dict['dmidecode'] = self._run_cmd('dmidecode').strip()
if system_dict['system_product'] == 'Virtual Machine': if system_dict['system_product'] == 'Virtual Machine':
lsvmbus = self.__run_cmd('lsvmbus').splitlines() lsvmbus = self._run_cmd('lsvmbus').splitlines()
lsvmbus = self.__parse_key_value_lines(lsvmbus) lsvmbus = self._parse_key_value_lines(lsvmbus)
system_dict['vmbus'] = lsvmbus system_dict['vmbus'] = lsvmbus
except Exception: except Exception:
print('Error: get system info failed') logger.exception('Error: get system info failed')
return system_dict return system_dict
def __get_docker_version(self): def get_docker_version(self):
"""Get docker version info. """Get docker version info.
Returns: Returns:
...@@ -197,7 +204,7 @@ def __get_docker_version(self): ...@@ -197,7 +204,7 @@ def __get_docker_version(self):
""" """
docker_version_dict = {} docker_version_dict = {}
try: try:
docker_version = self.__run_cmd('docker version') docker_version = self._run_cmd('docker version')
lines = docker_version.splitlines() lines = docker_version.splitlines()
key = '' key = ''
...@@ -209,7 +216,7 @@ def __get_docker_version(self): ...@@ -209,7 +216,7 @@ def __get_docker_version(self):
elif 'Version' in line and key not in docker_version_dict: elif 'Version' in line and key not in docker_version_dict:
docker_version_dict[key] = line.split(':')[1].strip().strip('\t') docker_version_dict[key] = line.split(':')[1].strip().strip('\t')
except Exception: except Exception:
print('Error: get docker info failed') logger.exception('Error: get docker info failed')
return docker_version_dict return docker_version_dict
def get_memory(self): def get_memory(self):
...@@ -220,14 +227,14 @@ def get_memory(self): ...@@ -220,14 +227,14 @@ def get_memory(self):
""" """
memory_dict = {} memory_dict = {}
try: try:
lsmem = self.__run_cmd('lsmem') lsmem = self._run_cmd('lsmem')
lsmem = lsmem.splitlines() lsmem = lsmem.splitlines()
lsmem = self.__parse_key_value_lines(lsmem) lsmem = self._parse_key_value_lines(lsmem)
memory_dict['block_size'] = lsmem.get('Memory block size', '') memory_dict['block_size'] = lsmem.get('Memory block size', '')
memory_dict['total_capacity'] = lsmem.get('Total online memory', '') memory_dict['total_capacity'] = lsmem.get('Total online memory', '')
dmidecode_memory = self.__run_cmd('dmidecode --type memory') dmidecode_memory = self._run_cmd('dmidecode --type memory')
dmidecode_memory = dmidecode_memory.splitlines() dmidecode_memory = dmidecode_memory.splitlines()
model = self.__parse_key_value_lines( model = self._parse_key_value_lines(
dmidecode_memory, ['Manufacturer', 'Part Number', 'Type', 'Speed', 'Number Of Devices'], dmidecode_memory, ['Manufacturer', 'Part Number', 'Type', 'Speed', 'Number Of Devices'],
omitted_values=['other', 'unknown'] omitted_values=['other', 'unknown']
) )
...@@ -236,52 +243,47 @@ def get_memory(self): ...@@ -236,52 +243,47 @@ def get_memory(self):
memory_dict['clock_frequency'] = model.get('Speed', '') memory_dict['clock_frequency'] = model.get('Speed', '')
memory_dict['model'] = model.get('Manufacturer', [''])[0] + ' ' + model.get('Part Number', [''])[0] memory_dict['model'] = model.get('Manufacturer', [''])[0] + ' ' + model.get('Part Number', [''])[0]
except Exception: except Exception:
print('Error: get memory info failed') logger.exception('Error: get memory info failed')
return memory_dict return memory_dict
def __get_gpu_nvidia(self): def get_gpu_nvidia(self):
"""Get nvidia gpu info. """Get nvidia gpu info.
Returns: Returns:
dict: nvidia gpu info dict. dict: nvidia gpu info dict.
""" """
gpu_dict = {} gpu_dict = {}
try: gpu_query = self._run_cmd('nvidia-smi -q -x')
gpu_query = self.__run_cmd('nvidia-smi -q -x') gpu_query = xmltodict.parse(gpu_query).get('nvidia_smi_log', '')
gpu_query = xmltodict.parse(gpu_query).get('nvidia_smi_log', '') gpu_dict['gpu_count'] = gpu_query.get('attached_gpus', '')
gpu_dict['gpu_count'] = gpu_query.get('attached_gpus', '') gpu_dict['nvidia_info'] = gpu_query
gpu_dict['nvidia_info'] = gpu_query gpu_dict['topo'] = self._run_cmd('nvidia-smi topo -m')
gpu_dict['topo'] = self.__run_cmd('nvidia-smi topo -m') gpu_dict['nvidia-container-runtime_version'] = self._run_cmd('nvidia-container-runtime -v').strip()
gpu_dict['nvidia-container-runtime_version'] = self.__run_cmd('nvidia-container-runtime -v').strip() gpu_dict['nvidia-fabricmanager_version'] = self._run_cmd('nv-fabricmanager --version').strip()
gpu_dict['nvidia-fabricmanager_version'] = self.__run_cmd('nv-fabricmanager --version').strip() gpu_dict['nv_peer_mem_version'] = self._run_cmd(
gpu_dict['nv_peer_mem_version'] = self.__run_cmd( 'dpkg -l | grep \'nvidia-peer-memory \' | awk \'$2=="nvidia-peer-memory" {print $3}\''
'dpkg -l | grep \'nvidia-peer-memory \' | awk \'$2=="nvidia-peer-memory" {print $3}\'' ).strip()
).strip()
except Exception:
print('Error: get nvidia gpu info failed')
return gpu_dict return gpu_dict
def __get_gpu_amd(self): def get_gpu_amd(self):
"""Get amd gpu info. """Get amd gpu info.
Returns: Returns:
dict: amd gpu info dict. dict: amd gpu info dict.
""" """
gpu_dict = {} gpu_dict = {}
try: gpu_query = self._run_cmd('rocm-smi -a --json')
gpu_query = self.__run_cmd('rocm-smi -a --json') gpu_query = json.loads(gpu_query)
gpu_query = json.loads(gpu_query) gpu_per_node = list(filter(lambda x: 'card' in x, gpu_query.keys()))
gpu_per_node = list(filter(lambda x: 'card' in x, gpu_query.keys())) gpu_dict['gpu_count'] = len(gpu_per_node)
gpu_dict['gpu_count'] = len(gpu_per_node) gpu_mem_info = self._run_cmd('rocm-smi --showmeminfo vram --json')
gpu_mem_info = self.__run_cmd('rocm-smi --showmeminfo vram --json') gpu_mem_info = json.loads(gpu_mem_info)
gpu_mem_info = json.loads(gpu_mem_info) for card in gpu_per_node:
for card in gpu_per_node: gpu_query[card].update(gpu_mem_info.get(card))
gpu_query[card].update(gpu_mem_info.get(card)) gpu_dict['rocm_info'] = gpu_query
gpu_dict['rocm_info'] = gpu_query gpu_dict['topo'] = self._run_cmd('rocm-smi --showtopo')
gpu_dict['topo'] = self.__run_cmd('rocm-smi --showtopo')
except Exception:
print('Error: get amd gpu info failed')
return gpu_dict return gpu_dict
def get_gpu(self): def get_gpu(self):
...@@ -290,10 +292,13 @@ def get_gpu(self): ...@@ -290,10 +292,13 @@ def get_gpu(self):
Returns: Returns:
dict: gpu info dict. dict: gpu info dict.
""" """
if Path('/dev/nvidiactl').is_char_device() and Path('/dev/nvidia-uvm').is_char_device(): try:
return self.__get_gpu_nvidia() if Path('/dev/nvidiactl').is_char_device() and Path('/dev/nvidia-uvm').is_char_device():
if Path('/dev/kfd').is_char_device() and Path('/dev/dri').is_dir(): return self.get_gpu_nvidia()
return self.__get_gpu_amd() if Path('/dev/kfd').is_char_device() and Path('/dev/dri').is_dir():
return self.get_gpu_amd()
except Exception:
logger.exception('Error: get gpu info failed')
print('Warning: no gpu detected') print('Warning: no gpu detected')
return {} return {}
...@@ -305,10 +310,10 @@ def get_pcie(self): ...@@ -305,10 +310,10 @@ def get_pcie(self):
""" """
pcie_dict = {} pcie_dict = {}
try: try:
pcie_dict['pcie_topo'] = self.__run_cmd('lspci -t -vvv') pcie_dict['pcie_topo'] = self._run_cmd('lspci -t -vvv')
pcie_dict['pcie_info'] = self.__run_cmd('lspci -vvv') pcie_dict['pcie_info'] = self._run_cmd('lspci -vvv')
except Exception: except Exception:
print('Error: get pcie gpu info failed') logger.exception('Error: get pcie info failed')
return pcie_dict return pcie_dict
def get_storage(self): # noqa: C901 def get_storage(self): # noqa: C901
...@@ -319,44 +324,45 @@ def get_storage(self): # noqa: C901 ...@@ -319,44 +324,45 @@ def get_storage(self): # noqa: C901
""" """
storage_dict = {} storage_dict = {}
try: try:
fs_info = self.__run_cmd("df -Th | grep -v \'^/dev/loop\'").splitlines() fs_info = self._run_cmd("df -Th | grep -v \'^/dev/loop\'").splitlines()
fs_list = self.__parse_table_lines(fs_info, key=['Filesystem', 'Type', 'Size', 'Avail', 'Mounted']) fs_list = self._parse_table_lines(fs_info, key=['Filesystem', 'Type', 'Size', 'Avail', 'Mounted'])
for fs in fs_list: for fs in fs_list:
fs_device = fs.get('Filesystem', 'UNKNOWN') fs_device = fs.get('Filesystem', 'UNKNOWN')
if fs_device.startswith('/dev'): if fs_device.startswith('/dev'):
fs['Block_size'] = self.__run_cmd('blockdev --getbsz {}'.format(fs_device)).strip() fs['Block_size'] = self._run_cmd('blockdev --getbsz {}'.format(fs_device)).strip()
fs['4k_alignment'] = '' fs['4k_alignment'] = ''
partition_ids = self.__run_cmd( partition_ids = self._run_cmd(
'parted {} print | grep -oE "^[[:blank:]]*[0-9]+"'.format(fs_device) 'yes Cancel | parted {} print | grep -oE "^[[:blank:]]*[0-9]+"'.format(fs_device)
).splitlines() ).splitlines()
for id in partition_ids: for id in partition_ids:
fs['4k_alignment'] += self.__run_cmd('parted {} align-check opt {}'.format(fs_device, fs['4k_alignment'] += self._run_cmd(
id)).strip() 'yes Cancel | parted {} align-check opt {}'.format(fs_device, id)
).strip()
storage_dict['file_system'] = fs_list storage_dict['file_system'] = fs_list
except Exception: except Exception:
print('Error: get file system info failed') logger.exception('Error: get file system info failed')
try: try:
disk_info = self.__run_cmd("lsblk -e 7 -o NAME,ROTA,SIZE,MODEL | grep -v \'^/dev/loop\'").splitlines() disk_info = self._run_cmd("lsblk -e 7 -o NAME,ROTA,SIZE,MODEL | grep -v \'^/dev/loop\'").splitlines()
disk_list = self.__parse_table_lines(disk_info, key=['NAME', 'ROTA', 'SIZE', 'MODEL']) disk_list = self._parse_table_lines(disk_info, key=['NAME', 'ROTA', 'SIZE', 'MODEL'])
for disk in disk_list: for disk in disk_list:
block_device = disk.get('NAME', 'UNKNOWN').strip('\u251c\u2500').strip('\u2514\u2500') block_device = disk.get('NAME', 'UNKNOWN').strip('\u251c\u2500').strip('\u2514\u2500')
disk['NAME'] = block_device disk['NAME'] = block_device
disk['Rotational'] = disk.pop('ROTA') disk['Rotational'] = disk.pop('ROTA')
disk['Block_size'] = self.__run_cmd('fdisk -l -u /dev/{} | grep "Sector size"'.format(block_device) disk['Block_size'] = self._run_cmd('fdisk -l -u /dev/{} | grep "Sector size"'.format(block_device)
).strip() ).strip()
if 'nvme' in block_device: if 'nvme' in block_device:
nvme_info = self.__run_cmd('nvme list | grep {}'.format(block_device)).strip().split() nvme_info = self._run_cmd('nvme list | grep {}'.format(block_device)).strip().split()
if len(nvme_info) >= 15: if len(nvme_info) >= 15:
disk['Nvme_usage'] = nvme_info[-11] + nvme_info[-10] disk['Nvme_usage'] = nvme_info[-11] + nvme_info[-10]
storage_dict['block_device'] = disk_list storage_dict['block_device'] = disk_list
storage_dict['mapping_bwtween_filesystem_and_blockdevice'] = self.__run_cmd('mount') storage_dict['mapping_bwtween_filesystem_and_blockdevice'] = self._run_cmd('mount')
except Exception: except Exception:
print('Error: get block device info failed') logger.exception('Error: get block device info failed')
return storage_dict return storage_dict
def __get_ib(self): def get_ib(self):
"""Get available IB devices info. """Get available IB devices info.
Return: Return:
...@@ -364,19 +370,19 @@ def __get_ib(self): ...@@ -364,19 +370,19 @@ def __get_ib(self):
""" """
ib_dict = {} ib_dict = {}
try: try:
ibstat = self.__run_cmd('ibstat').splitlines() ibstat = self._run_cmd('ibstat').splitlines()
ib_dict['ib_device_status'] = self.__parse_key_value_lines(ibstat) ib_dict['ib_device_status'] = self._parse_key_value_lines(ibstat)
ibv_devinfo = self.__run_cmd('ibv_devinfo -v').splitlines() ibv_devinfo = self._run_cmd('ibv_devinfo -v').splitlines()
for i in range(len(ibv_devinfo) - 1, -1, -1): for i in range(len(ibv_devinfo) - 1, -1, -1):
if ':' not in ibv_devinfo[i]: if ':' not in ibv_devinfo[i]:
ibv_devinfo[i - 1] = ibv_devinfo[i - 1] + ',' + ibv_devinfo[i].strip('\t') ibv_devinfo[i - 1] = ibv_devinfo[i - 1] + ',' + ibv_devinfo[i].strip('\t')
ibv_devinfo.remove(ibv_devinfo[i]) ibv_devinfo.remove(ibv_devinfo[i])
ib_dict['ib_device_info'] = self.__parse_key_value_lines(ibv_devinfo) ib_dict['ib_device_info'] = self._parse_key_value_lines(ibv_devinfo)
except Exception as e: except Exception:
print('Error: get ib info failed. message: {}.'.format(str(e))) logger.exception('Error: get ib info failed')
return ib_dict return ib_dict
def __get_nic(self): def get_nic(self):
"""Get nic info. """Get nic info.
Returns: Returns:
...@@ -384,8 +390,10 @@ def __get_nic(self): ...@@ -384,8 +390,10 @@ def __get_nic(self):
""" """
nic_list = [] nic_list = []
try: try:
lsnic_xml = self.__run_cmd('lshw -c network -xml') lsnic_xml = self._run_cmd('lshw -c network -xml')
lsnic_list = xmltodict.parse(lsnic_xml).get('list', {}).get('node', []) lsnic_list = xmltodict.parse(lsnic_xml).get('list', {}).get('node', [])
if not isinstance(lsnic_list, list):
lsnic_list = [lsnic_list]
lsnic_list = list(filter(lambda x: 'logicalname' in x, lsnic_list)) lsnic_list = list(filter(lambda x: 'logicalname' in x, lsnic_list))
for nic in lsnic_list: for nic in lsnic_list:
...@@ -404,15 +412,15 @@ def __get_nic(self): ...@@ -404,15 +412,15 @@ def __get_nic(self):
'driverversion', '' 'driverversion', ''
) )
nic_info['firmware'] = configuration_dict.get('firmware', '') nic_info['firmware'] = configuration_dict.get('firmware', '')
speed = self.__run_cmd('cat /sys/class/net/{}/speed'.format(nic_info['logical_name'])).strip() speed = self._run_cmd('cat /sys/class/net/{}/speed'.format(nic_info['logical_name'])).strip()
if speed.isdigit(): if speed.isdigit():
nic_info['speed'] = str(int(speed) / 1000) + ' Gbit/s' nic_info['speed'] = str(int(speed) / 1000) + ' Gbit/s'
except Exception: except Exception:
print('Error: get nic device {} info failed'.format(nic_info['logical_name'])) logger.exception('Error: get nic device {} info failed')
nic_list.append(nic_info) nic_list.append(nic_info)
except Exception: except Exception:
print('Error: get nic info failed') logger.exception('Error: get nic info failed')
return nic_list
def get_network(self): def get_network(self):
"""Get network info, including nic info, ib info and ofed version. """Get network info, including nic info, ib info and ofed version.
...@@ -421,15 +429,21 @@ def get_network(self): ...@@ -421,15 +429,21 @@ def get_network(self):
dict: dict of network info. dict: dict of network info.
""" """
network_dict = {} network_dict = {}
network_dict['nic'] = self.__get_nic() try:
network_dict['ib'] = self.__get_ib() network_dict['nic'] = self.get_nic()
ofed_version = self.__run_cmd('ofed_info -s').strip() network_dict['ib'] = self.get_ib()
network_dict['ofed_version'] = ofed_version ofed_version = self._run_cmd('ofed_info -s').strip()
network_dict['ofed_version'] = ofed_version
except Exception:
logger.exception('Error: get network info failed')
return network_dict return network_dict
def get_all(self): def get_all(self):
"""Get all system info and save them to file in json format.""" """Get all system info and save them to file in json format."""
sum_dict = {} sum_dict = {}
if os.geteuid() != 0:
logger.error('You need to be as a root user to run this tool.')
return sum_dict
sum_dict['System'] = self.get_system() sum_dict['System'] = self.get_system()
sum_dict['CPU'] = self.get_cpu() sum_dict['CPU'] = self.get_cpu()
sum_dict['Memory'] = self.get_memory() sum_dict['Memory'] = self.get_memory()
......
tests/cli/test_sb.py
View file @ 2d85781b
...@@ -84,4 +84,4 @@ def test_sb_run_nonexist_host_file(self): ...@@ -84,4 +84,4 @@ def test_sb_run_nonexist_host_file(self):
def test_sb_node_info(self): def test_sb_node_info(self):
"""Test sb node info, should fail.""" """Test sb node info, should fail."""
self.cmd('sb node info', expect_failure=True) self.cmd('sb node info', expect_failure=False)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment