On Tue, Oct 27, 2020 at 06:51:15PM +0800, Zhang Yu wrote:

[why] Obtain more host information from 'lscpu'

Signed-off-by: Zhang Yu <2134782174@qq.com> --- tests/host-info | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/host-info b/tests/host-info index 46f43f93..4d935944 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,20 +1,24 @@ #!/bin/bash

-get_node() +get_memory() { - echo "nr_node: $(grep -Eo 'Node [0-9]+,' /proc/zoneinfo | uniq | wc -l)" - echo "nr_cpu: $(nproc)" memory_total=$(cat /proc/meminfo |grep MemTotal | awk '{print $2}') memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024/16}') memory=$(echo `expr $(echo $memory_new | awk '{print int($0)+1}') \* 16`)G echo "memory: $memory" }

-get_model_name() +get_cpu() { - echo "model_name: $(lscpu |grep "Model name" | awk '{print $3}')" + echo $1: $(lscpu | awk -F': *' '/'$2':/{print $2}') }

+cpu_info=("arch Architecture" "nr_node NUMA\snode\(s\)" "nr_cpu ^CPU\(s\)" "model_name Model\sname") +for info in "${cpu_info[@]}" +do + get_cpu $info +done +

This code block has no a function wrapped. Should the main call it? Thanks, Xueliang

get_nr_disk() { nr_hdd_disks=$(lsblk -d -o name,ROTA | grep -v loop | awk '{print $2}' | grep 1 | wc -l) @@ -101,11 +105,10 @@ get_ipmi_ip()

main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name get_ipmi_ip }

-- 2.23.0