Move portals setup into a helper function "setup_portals" that uses the

enviroment variables "NETWORK={elan,tcp}", LOCALHOST, SERVER, and PORT.

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 35b9a0a..fcfe368 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -1,4 +1,3 @@
-
 export PATH=$PATH:/sbin:/usr/sbin
 
 if [ -d /r ]; then
@@ -58,7 +57,7 @@ setup() {
     insmod $SRCDIR/../../portals/linux/qswnal/kqswnal.o
     insmod $SRCDIR/../../portals/linux/socknal/ksocknal.o || exit -1
 
-    $ACCEPTOR 1234 &
+    [ "$NETWORK" = "tcp" ] && $ACCEPTOR $PORT &
 
     [ -c /dev/obd ] || mknod /dev/obd c 10 241
 
@@ -77,6 +76,38 @@ setup() {
     [ -d /mnt/obd ] || mkdir /mnt/obd
 }
 
+setup_portals() {
+       if [ "$NETWORK" -a "$LOCALHOST" -a "$SERVER" ]; then
+               echo "$0: NETWORK or LOCALHOST or SERVER is not set"
+               exit -1
+       fi
+
+       case $NETWORK in
+       elan)   if [ "$PORT" ]; then
+                       echo "$0: NETWORK is elan but PORT is set"
+                       exit -1
+               fi
+               ;;
+       tcp)    if [ -z "$PORT" ]; then
+                       echo "$0: NETWORK is tcp but PORT is not set"
+                       exit -1
+               fi
+               ;;
+       *)      echo "$0: unknown NETWORK \'$NETWORK\'"
+               exit -1
+               ;;
+       esac
+
+       $PTLCTL <<- EOF
+       setup $NETWORK
+       mynid $LOCALHOST
+       connect $SERVER $PORT
+       add_uuid self
+       add_uuid mds
+       add_uuid ost
+       EOF
+}
+
 setup_ldlm() {
     [ -c /dev/portals ] || mknod /dev/portals c 10 240
 

diff --git a/lustre/tests/llext3.sh b/lustre/tests/llext3.sh
index 211cfdf..530ddce 100755 (executable)
--- a/lustre/tests/llext3.sh
+++ b/lustre/tests/llext3.sh
@@ -3,21 +3,16 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-setup
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-$PTLCTL <<EOF
-mynid localhost
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+setup
+setup_portals
 
 new_fs ext2 /tmp/ost 10000
 OST=$LOOPDEV
-
 MDSFS=ext3
 new_fs ${MDSFS} /tmp/mds 10000
 MDS=$LOOPDEV

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index ad2a87f..3fb8c9d 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -4,18 +4,12 @@ SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
 NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
 setup
-
-$PTLCTL <<EOF
-setup $NETWORK
-mynid localhost
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+setup_portals
 
 new_fs ext2 /tmp/ost 10000
 OST=$LOOPDEV

diff --git a/lustre/tests/llrext3.sh b/lustre/tests/llrext3.sh
index d653804..4d55ef2 100755 (executable)
--- a/lustre/tests/llrext3.sh
+++ b/lustre/tests/llrext3.sh
@@ -3,24 +3,19 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-setup
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-$PTLCTL <<EOF
-mynid localhost
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+setup
+setup_portals
 
 old_fs ext2 /tmp/ost 10000
-OST=${LOOPDEV}
-
+OST=$LOOPDEV
 MDSFS=ext3
 old_fs ${MDSFS} /tmp/mds 10000
-MDS=${LOOPDEV}
+MDS=$LOOPDEV
 
 echo 0xffffffff > /proc/sys/portals/debug
 

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index ca1ed31..2a79f38 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -3,17 +3,13 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-setup
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-$PTLCTL <<EOF
-mynid localhost
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+setup
+setup_portals
 
 old_fs ext2 /tmp/ost 80000
 OST=$LOOPDEV