land v0.9.1 on HEAD, in preparation for a 1.0.x branch

[fs/lustre-release.git] / lustre / tests / echo.sh

diff --git a/lustre/tests/echo.sh b/lustre/tests/echo.sh
index b4fe5a4..67dd27e 100755 (executable)
--- a/lustre/tests/echo.sh
+++ b/lustre/tests/echo.sh
@@ -16,10 +16,22 @@ TMP=${TMP:-/tmp}
 SERVER=${SERVER:-localhost}
 CLIENT=${CLIENT:-localhost}
 NET=${NET:-tcp}
-SERVERNID=${SERVERNID:-$SERVER}
-CLIENTNID=${CLIENTNID:-$CLIENT}
 
+h2tcp () {
+       case $1 in
+       client) echo '\*' ;;
+       *) echo $1 ;;
+       esac
+}
 
+h2gm () {
+       echo `gmnalnid -n $1`
+}
+
+h2elan () {
+    echo $1 | sed 's/[^0-9]*//g'
+}
+        
 # FIXME: make LMC not require MDS for obdecho LOV
 MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 MDSSIZE=10000
@@ -31,7 +43,7 @@ STRIPES_PER_OBJ=2     # 0 means stripe over all OSTs
 rm -f $config
 # create nodes
 $LMC --add node --node $SERVER  || exit 1
-$LMC --add net --node $SERVER --nid $SERVERNID --nettype $NET || exit 2
+$LMC --add net --node $SERVER --nid `h2$NET $SERVER` --nettype $NET || exit 2
 
 if (($LOV)); then
     $LMC --add mds --node $SERVER --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 10
@@ -46,7 +58,7 @@ fi
 
 if [ "$SERVER" != "$CLIENT" ]; then
    $LMC --add node --node $CLIENT  || exit 1
-   $LMC --add net --node $CLIENT --nid $CLIENTNID --nettype $NET || exit 2
+   $LMC --add net --node $CLIENT --nid `h2$NET $CLIENT` --nettype $NET || exit 2
 fi
 
 $LMC --add echo_client --node $CLIENT --ost ${OBD_NAME} || exit 3