From: Alexey Lyashkov <alexey.lyashkov@seagate.com>
Date: Fri, 10 Apr 2015 05:57:11 +0000 (+0300)
Subject: LU-6448 tests: fix network config
X-Git-Tag: 2.7.53~25
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F14433%2F3;p=fs%2Flustre-release.git

LU-6448 tests: fix network config

Correct LND load during startup time, send a network parameters
to target node.

Signed-off-by: Alexey Lyashkov <alexey.lyashkov@seagate.com>
Change-Id: Ib37b90b480e5c74e7f2d55932b3d849254bad097
Reviewed-on: http://review.whamcloud.com/14433
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 381bacf..a04e20e 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -492,6 +492,13 @@ load_modules_local() {
     [ "$PTLDEBUG" ] && lctl set_param debug="$PTLDEBUG"
     [ "$SUBSYSTEM" ] && lctl set_param subsystem_debug="${SUBSYSTEM# }"
     load_module ../lnet/lnet/lnet
+	case $NETTYPE in
+	o2ib)
+		LNETLND="o2iblnd/ko2iblnd"
+		;;
+	*)
+		;;
+	esac
     LNETLND=${LNETLND:-"socklnd/ksocklnd"}
     load_module ../lnet/klnds/$LNETLND
     load_module obdclass/obdclass
@@ -2891,6 +2898,12 @@ get_env_vars() {
 	if [ -n "$FSTYPE" ]; then
 		echo -n " FSTYPE=$FSTYPE"
 	fi
+
+	for var in LNETLND NETTYPE; do
+		if [ -n "${!var}" ]; then
+			echo -n " $var=${!var}"
+		fi
+	done
 }
 
 do_nodes() {