Shellcheck improvements for genesis-scripts #4923

samveen · 2018-03-12T08:12:25Z

This PR is a partial fix for issue #4610 (the low hanging fruit so to say).

xcatbot · 2018-03-12T08:14:52Z

CI CHECK RESULT : > PR FORMAT CORRECT> BUILD SUCCESSFUL > INSTALL XCAT SUCCESSFUL> CODE SYNTAX CORRECT> FAST REGRESSION TEST Successful: Totalcase 215 Pass 215 failed 0

zet809 · 2018-03-12T10:01:24Z

Hi, @neo954 , will you pls help to review this PR? Thx!

neo954 · 2018-03-13T05:52:09Z

xCAT-genesis-scripts/usr/bin/dodiscovery

 			fi
 			if [ -z "$MTM" -o "$MTM" == ":" ]; then
 				logger -s -t $log_label -p local4.warning "Couldn't find MTM information in FRU, falling back to DMI (MTMS-based discovery may fail)"
-				m=`cat /sys/devices/virtual/dmi/id/sys_vendor`
-				n=`cat /sys/devices/virtual/dmi/id/product_name`
+				read m </sys/devices/virtual/dmi/id/sys_vendor


I suggest use read -r m instead of read m here.

neo954 · 2018-03-13T05:52:22Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-				m=`cat /sys/devices/virtual/dmi/id/sys_vendor`
-				n=`cat /sys/devices/virtual/dmi/id/product_name`
+				read m </sys/devices/virtual/dmi/id/sys_vendor
+				read n </sys/devices/virtual/dmi/id/product_name


I suggest use read -r n instead of read n here.

neo954 · 2018-03-13T05:53:09Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-	    echo $line > /tmp/cpumod
-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        read CPUCOUNT CPUTYPE < <(awk -F: 'BEGIN{c=0; n=""} /model name/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo)


The same as above. I suggest use read -r instead of read.

neo954 · 2018-03-13T05:53:39Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        PLATFORM=$(awk '/^platform\s*:/{print \$3}' /proc/cpuinfo)
+        read CPUCOUNT CPUTYPE < <(awk -F':' 'BEGIN{c=0; n=""} /^cpu\s*:/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo)


This is not going to work. Please see my test results below.

On ppc64le RHEL 7.4

# awk -F':' 'BEGIN{c=0; n=""} /^cpu\s*:/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo 8 POWER8 (architected), altivec supported

On ppc64 RHEL 7.4

# awk -F':' 'BEGIN{c=0; n=""} /^cpu\s*:/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo 16 POWER7 (architected), altivec supported

On x86-64 RHEL 7.4

# awk -F':' 'BEGIN{c=0; n=""} /^cpu\s*:/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo 0

It does not work on x86-64

On ppc64le or ppc64, CPUTYPE will be assigned to something like POWER8 (architected), altivec supported. But for the original code, it will be assigned to POWER8.

@neo954 Can you give me the output of cat /proc/cpuinfo for ppc64 and ppc64le machines? I have no access to a sample for them.

neo954 · 2018-03-13T05:57:36Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-	    echo $line > /tmp/cpumod
-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        PLATFORM=$(awk '/^platform\s*:/{print \$3}' /proc/cpuinfo)


Since you are using single quote, no need to add backslash for '$'. And double quotes are needed outside the parentheses.

PLATFORM="$(awk '/^platform\s*:/{print $3}' /proc/cpuinfo)"

neo954 · 2018-03-13T06:24:42Z

xCAT-genesis-scripts/usr/bin/getadapter

+<pcilocation>$pci</pcilocation>
+<model>${tmp##*: }</model>
+</nic>
+__ENDL


Use a multiple-line echo or use curly brackets is better.

neo954 · 2018-03-13T06:30:09Z

xCAT-genesis-scripts/usr/bin/getcert

+if grep -q 'BEGIN CERTIFICATE' /tmp/certresp.xml ; then
+    awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' < /tmp/certresp.xml > /etc/xcat/cert.pem
+    #stop transmitting sysDesc, allowing the public key to age out of validity
+    while read iface ; do


I suggest use read -r instead of read.

neo954 · 2018-03-13T06:34:43Z

xCAT-genesis-scripts/usr/bin/getdestiny

 done
 rm /tmp/destreq.xml
-DESTINY=`grep '<destiny>' /tmp/destiny.xml | awk -F'>' '{print $2}'|awk -F'<' '{print $1}'`
+DESTINY="$(awk -F'>' '/<destiny>/{print $2}' /tmp/destiny.xml|awk -F'<' '{print $1}')"


Is there only one line in file /tmp/destiny.xml? Otherwise this line will not work.

In this case, I am replacing grep PAT | awk '{AWK_SCRIPT}' with awk '/PAT/{AWK_SCRIPT}'. No change in the logic of this line.

neo954 · 2018-03-13T06:35:16Z

xCAT-genesis-scripts/usr/bin/getipmi

-			XCATDEST=`echo $parm |awk -F= '{print $2}'`
-		fi
-	done
+    read XCATDEST < <(grep xcatd= /proc/cmdline| sed 's/.*xcatd=\([^ ]*\).*/\1/')


Suggest read -r instead of read.

What if there is something like some_prefix_xcatd=something in /proc/cpuinfo. Maybe, need \s before xcatd=.

sed -e 's/.*\sxcatd=$[^ ]*$.*/\1/'

What if the kcmdline starts with xcatd=? It doesn't matter either way as I am replacing everything before xcatd anyway, whether it contains spaces or not.

Can you give an example of a kcmline element name that may contain xcatd as a substring

That is fine. Just leave it as is.

neo954 · 2018-03-13T06:45:11Z

xCAT-genesis-scripts/usr/bin/remoteimmsetup

-			XCATDEST=`echo $parm |awk -F= '{print $2}'`
-		fi
-	done
+    read XCATDEST < <(grep xcatd= /proc/cmdline| sed 's/.*xcatd=\([^ ]*\).*/\1/')


Suggest read -r instead of read.

Need \s before xcatd=.

sed -e 's/.*\sxcatd=$[^ ]*$.*/\1/'

samveen · 2018-03-14T04:07:03Z

@neo954 please review again. fixes done as per your review.

neo954 · 2018-03-14T07:39:24Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-	    echo $line > /tmp/cpumod
-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        read -r CPUCOUNT CPUTYPE < <(awk -F: 'BEGIN{c=0; n=""} /model name/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo)


FYI, the file, /proc/cpuinfo from a Power 8 test machine.

# cat /proc/cpuinfo processor : 0 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 1 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 2 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 3 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 4 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 5 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 6 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 7 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 8 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 9 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 10 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 11 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 12 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 13 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 14 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 15 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 16 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 17 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 18 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 19 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 20 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 21 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 22 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 23 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 24 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 25 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 26 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 27 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 28 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 29 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 30 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 31 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 32 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 33 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 34 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 35 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 36 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 37 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 38 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 39 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 40 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 41 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 42 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 43 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 44 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 45 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 46 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 47 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 48 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 49 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 50 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 51 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 52 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 53 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 54 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 55 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 56 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 57 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 58 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 59 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 60 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 61 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 62 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 63 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 64 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 65 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 66 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 67 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 68 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 69 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 70 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 71 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 72 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 73 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 74 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 75 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 76 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 77 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 78 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 79 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 80 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 81 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 82 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 83 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 84 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 85 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 86 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 87 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 88 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 89 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 90 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 91 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 92 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 93 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 94 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 95 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 96 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 97 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 98 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 99 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 100 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 101 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 102 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 103 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 104 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 105 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 106 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 107 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 108 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 109 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 110 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 111 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 112 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 113 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 114 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 115 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 116 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 117 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 118 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 119 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 120 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 121 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 122 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 123 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 124 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 125 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 126 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) processor : 127 cpu : POWER8 (raw), altivec supported clock : 3857.000000MHz revision : 2.0 (pvr 004d 0200) timebase : 512000000 platform : PowerNV model : 8001-22C machine : PowerNV 8001-22C firmware : OPAL

@neo954 Can you confirm the value of CPUTYPE with the old code against the above? I get the same value with old code as with new code for the cpuinfo contents for P8 as above:

[samveen@development bin]$ grep -e "^cpu\s*:" /tmp/cpuinfo.P8 | while read line; do echo $line > /tmp/cpumod ; done [samveen@development bin]$ cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //' POWER8 (raw), altivec supported

neo954 · 2018-03-14T07:40:47Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-	    echo $line > /tmp/cpumod
-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        PLATFORM="$(awk '/^platform\s*:/{print $3}' /proc/cpuinfo)"


FYI, the file, /proc/cpuinfo from a Power 7 Logical Partition.

# cat /proc/cpuinfo processor : 0 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 1 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 2 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 3 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 4 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 5 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 6 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 7 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 8 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 9 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 10 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 11 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 12 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 13 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 14 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) processor : 15 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) timebase : 512000000 platform : pSeries model : IBM,8233-E8B machine : CHRP IBM,8233-E8B

@neo954 Can you confirm the output expected from the old code. I get CPUTYPE value POWER7 (architected), altivec supported from the old code too.

[samveen@dev bin]$ grep -e "^cpu\s*:" /tmp/cpuinfo.P7LP | while read line; do > echo $line > /tmp/cpumod > done [samveen@dev bin]$ cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //' POWER7 (architected), altivec supported

neo954 · 2018-03-14T07:42:11Z

xCAT-genesis-scripts/usr/bin/dodiscovery

-        done
-        CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
+        PLATFORM="$(awk '/^platform\s*:/{print $3}' /proc/cpuinfo)"
+        read CPUCOUNT CPUTYPE < <(awk -F':' 'BEGIN{c=0; n=""} /^cpu\s*:/{c=c+1; n=$2} END{printf "%d %s",c,n}' /proc/cpuinfo)


FYI, the file, /proc/cpuinfo from a Power 8 KVM guest.

# cat /proc/cpuinfo processor : 0 cpu : POWER8E (raw), altivec supported clock : 3425.000000MHz revision : 2.1 (pvr 004b 0201) processor : 1 cpu : POWER8E (raw), altivec supported clock : 3425.000000MHz revision : 2.1 (pvr 004b 0201) processor : 2 cpu : POWER8E (raw), altivec supported clock : 3425.000000MHz revision : 2.1 (pvr 004b 0201) processor : 3 cpu : POWER8E (raw), altivec supported clock : 3425.000000MHz revision : 2.1 (pvr 004b 0201) timebase : 512000000 platform : pSeries model : IBM pSeries (emulated by qemu) machine : CHRP IBM pSeries (emulated by qemu)

@neo954 Can you confirm the value of CPUTYPE with the old code against the above? I get the same value with old code as with new code for P8 KVM guest:

[samveen@development bin]$ grep -e "^cpu\s*:" /tmp/cpuinfo.P8KVMG | while read line; do echo $line > /tmp/cpumod ; done [samveen@development bin]$ cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //' POWER8E (raw), altivec supported

samveen · 2018-04-13T05:07:44Z

@neo954 Can you please check my comments and review again?

neo954 · 2018-04-13T08:54:02Z

@samveen, It is great if you can paste your unit test result in this pull request.

robin2008 · 2018-05-30T01:59:40Z

@neo954 Do you have any further comments on this PR after @samveen updated?

samveen · 2018-06-12T06:43:32Z

@neo954 please give me an example set of results you expect. My testing shows no difference between the output of the old code and the new code as shown above.

neo954 · 2018-06-12T06:51:07Z

@samveen, It is great if you can paste your unit test result in this pull request.

zet809 · 2018-07-11T02:52:22Z

hi, @samveen , there are so many files changed and hard to verify files one by one, it will be greatly helpful if you can paste your UT result in this PR. Thx a lot!

whowutwut · 2018-07-14T12:45:53Z

@zet809 @hu-weihua Can we build this PR branch and run it through our daily regression? Or target next weekend for a run of this branch? Would that help resolve some uncertainty?

hu-weihua · 2018-07-16T08:08:53Z

@whowutwut, we can build this PR branch, but I do not think that daily regression can help to verify this PR. Due to the all change of this PR is against genesis, there are only 3 test cases in daily regression will touch this part, but they just test very few code branch of genesis, such as enter shell, cmdline and runimg. Normally, FVT test discovery process manually. So, if we need to verify all the change of this PR, we need to plan a detailed test which needs big effort.

samveen · 2018-07-23T04:26:14Z

@whowutwut @zet809 Due to the acquisition of my company by a larger company, xCAT as a provisioning and control system has been deprecated with the expectation that we're to move all operations to the systems of the acquiring company, so I haven't been able to concentrate much on xCAT related work, as it is no longer a management sanctioned use of my time. So, please give me a little time to try and rebase all changes on master, and see what I can do about unit test results.

zet809 · 2018-07-23T08:08:03Z

Thx, @samveen
BTW, what tool you are using to do system management in the acquiring company?

samveen · 2018-07-27T08:14:17Z

@zet809 It's a homebrewed system that they've developed over the years, amazing but pretty customized to their requirements.

samveen · 2018-09-17T10:08:21Z

@zet809 @neo954 I will close this MR, rebase on master and break it into 2 MRs:

One MR with the changes that don't affect Power hosts
a second MR with the changes that affect Power hosts

gurevichmark · 2019-06-24T19:23:35Z

Due to limited resources can no resolve conflicts or verify code changes.

whowutwut · 2019-06-25T13:53:24Z

@gurevichmark Like we had discussed, if we want to create more robust testing framework where we can catch issues that @neo954 pointed out about cross architecture issues automatically by running the PR through a test bucket, this would be a perfect candidate for adding a corner case...

But maybe we would never get around to it, so i'm OK to close this also 😄

samveen · 2019-07-04T06:14:30Z

@whowutwut I've finally got around to splitting this MR into 2 portions: simple improvements vs architecturally dependent improvements. The first of these is up for review and merge. Once that is done, I'll check in the 2nd portion and create an MR for it.

samveen force-pushed the gen_shellcheck branch from ea6bc38 to 9feae90 Compare March 12, 2018 08:19

zet809 requested a review from neo954 March 12, 2018 10:00

zet809 added the component:discovery label Mar 12, 2018

zet809 added this to the 2.14 milestone Mar 12, 2018

zet809 closed this Mar 12, 2018

zet809 reopened this Mar 12, 2018

samveen force-pushed the gen_shellcheck branch 2 times, most recently from 9e6b9de to bf7ef8c Compare March 12, 2018 12:59

neo954 suggested changes Mar 13, 2018

View reviewed changes

samveen force-pushed the gen_shellcheck branch from 49f9a9a to 6c86e1f Compare March 13, 2018 08:53

neo954 suggested changes Mar 14, 2018

View reviewed changes

neo954 modified the milestones: 2.14, 2.14.1 Apr 13, 2018

samveen added 2 commits April 16, 2018 03:01

Shellcheck improvements for genesis-scripts

6780cb2

Fixes as reviewed by @neo954

e440119

samveen force-pushed the gen_shellcheck branch from 6c86e1f to e440119 Compare April 16, 2018 03:01

neo954 removed this from the 2.14.1 milestone May 29, 2018

robin2008 added this to the 2.14.2 milestone May 30, 2018

zet809 modified the milestones: 2.14.2, 2.14.3 Jul 11, 2018

zet809 assigned neo954 Jul 11, 2018

xcat2 deleted a comment from chuckbrazie Jul 14, 2018

zet809 removed this from the 2.14.3 milestone Aug 17, 2018

neo954 force-pushed the master branch from 442614e to 7ca4958 Compare March 12, 2019 09:28

gurevichmark closed this Jun 24, 2019

gurevichmark unassigned neo954 Jun 24, 2019

samveen mentioned this pull request Jul 4, 2019

[genesis-scripts]Minor logic and piping improvements #6366

Open

Shellcheck improvements for genesis-scripts #4923

Shellcheck improvements for genesis-scripts #4923

Conversation

samveen commented Mar 12, 2018

xcatbot commented Mar 12, 2018 • edited Loading

zet809 commented Mar 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samveen Mar 13, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samveen commented Mar 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samveen Mar 20, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samveen commented Apr 13, 2018

neo954 commented Apr 13, 2018

robin2008 commented May 30, 2018

samveen commented Jun 12, 2018

neo954 commented Jun 12, 2018

zet809 commented Jul 11, 2018

whowutwut commented Jul 14, 2018

hu-weihua commented Jul 16, 2018

samveen commented Jul 23, 2018

zet809 commented Jul 23, 2018

samveen commented Jul 27, 2018 • edited Loading

samveen commented Sep 17, 2018

gurevichmark commented Jun 24, 2019

whowutwut commented Jun 25, 2019

samveen commented Jul 4, 2019

xcatbot commented Mar 12, 2018 •

edited

Loading

samveen Mar 13, 2018 •

edited

Loading

samveen Mar 20, 2018 •

edited

Loading

samveen commented Jul 27, 2018 •

edited

Loading