From 32404bcc9aaec5cadf36df050f004f8048060072 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 24 Aug 2017 17:00:07 +0800
Subject: [PATCH] Revise InfiniBand test case

---
 xCAT-test/autotest/testcase/infiniband/cases0 |  4 ++--
 .../rhel-infiniband-diskfull-install.sh       | 21 +++++++++++++++----
 .../rhel-infiniband-diskless-install.sh       | 21 +++++++++++++++----
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/xCAT-test/autotest/testcase/infiniband/cases0 b/xCAT-test/autotest/testcase/infiniband/cases0
index f634bae17..568dfc1b1 100644
--- a/xCAT-test/autotest/testcase/infiniband/cases0
+++ b/xCAT-test/autotest/testcase/infiniband/cases0
@@ -1,10 +1,10 @@
 start:rhel_infiniband_diskless_install
-cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="$$OS" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
+cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="GETNODEATTR($$CN, os)" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
 check:rc==0
 end
 
 start:rhel_infiniband_diskfull_install
-cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="$$OS" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
+cmd:RHEL_ISO="$$ISO" LINUX_DISTRO="GETNODEATTR($$CN, os)" COMPUTE_NODE="$$CN" MLNX_ISO="$$MLNX" DKMS_RPM="$$DKMS" /opt/xcat/share/xcat/tools/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
 check:rc==0
 end
 
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
index ede9f8aa4..3bc6fc7d0 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
 ########
-# Set all the variables below
+#
+# For manually run this script in a standalone test environment without xCAT-test,
+# do the following steps.
+#
+# * Set all the variables in LINE 11, 13, 16, and 17.
+# * Download all the ISO files, RPMs needed, and put them in ${SOURCE_DIR}
+# * If you intend to specify all the packages explicitly, set variable in LINE 61, 62, 63.
+#
 
 [ -n "$LINUX_DISTRO" ] &&
 LINUX_DISTRO="rhels7.4"
@@ -9,8 +16,8 @@ LINUX_DISTRO="rhels7.4"
 LINUX_ARCH="ppc64le"
 
 [ -n "$COMPUTE_NODE" ] &&
-COMPUTE_NODE="c910f03c01p10"
-SOURCE_DIR="/media/xcat"
+COMPUTE_NODE="nonexistent"
+SOURCE_DIR="/path/to/source"
 
 ########
 
@@ -155,7 +162,7 @@ do
 	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
 	[ "$?" -eq "0" ] && break
 	[ "${WAIT}" -le "${INSTALL_TIMEOUT}" ]
-	[ "$?" -ne "0" ] && echo "Operating system installation failed" >&2 && exit 1
+	[ "$?" -ne "0" ] && echo "Operating system installation failed." >&2 && exit 1
 done
 
 # For workaround the GitHub issue #3549
@@ -167,4 +174,10 @@ xdsh "${COMPUTE_NODE}" date
 xdsh "${COMPUTE_NODE}" 'rpm -qa' | grep 'mlnx'
 [ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed." >&2 && exit 1
 
+xdsh "${COMPUTE_NODE}" 'lspci'
+xdsh "${COMPUTE_NODE}" 'lsslot -c pci'
+xdsh "${COMPUTE_NODE}" 'lsslot'
+xdsh "${COMPUTE_NODE}" 'ibv_devinfo'
+xdsh "${COMPUTE_NODE}" 'iblinkinfo'
+
 exit 0
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
index 216ebaa63..014ef8082 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
 ########
-# Set all the variables below
+#
+# For manually run this script in a standalone test environment without xCAT-test,
+# do the following steps.
+#
+# * Set all the variables in LINE 11, 13, 16, and 17.
+# * Download all the ISO files, RPMs needed, and put them in ${SOURCE_DIR}
+# * If you intend to specify all the packages explicitly, set variable in LINE 61, 62, 63
+#
 
 [ -n "$LINUX_DISTRO" ] &&
 LINUX_DISTRO="rhels7.4"
@@ -9,8 +16,8 @@ LINUX_DISTRO="rhels7.4"
 LINUX_ARCH="ppc64le"
 
 [ -n "$COMPUTE_NODE" ] &&
-COMPUTE_NODE="c910f03c01p10"
-SOURCE_DIR="/media/xcat"
+COMPUTE_NODE="nonexistent"
+SOURCE_DIR="/path/to/source"
 
 ########
 
@@ -171,7 +178,7 @@ do
 	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
 	[ "$?" -eq "0" ] && break
 	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
-	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+	[ "$?" -ne "0" ] && echo "Netboot failed." >&2 && exit 1
 done
 
 # For workaround the GitHub issue #3549
@@ -183,4 +190,10 @@ xdsh "${COMPUTE_NODE}" date
 xdsh "${COMPUTE_NODE}" 'rpm -qa' | grep 'mlnx'
 [ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed." >&2 && exit 1
 
+xdsh "${COMPUTE_NODE}" 'lspci'
+xdsh "${COMPUTE_NODE}" 'lsslot -c pci'
+xdsh "${COMPUTE_NODE}" 'lsslot'
+xdsh "${COMPUTE_NODE}" 'ibv_devinfo'
+xdsh "${COMPUTE_NODE}" 'iblinkinfo'
+
 exit 0