b=2322

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

diff --git a/lustre/tests/ba-echo.sh b/lustre/tests/ba-echo.sh
index e0187fd..b28c5f4 100644 (file)
--- a/lustre/tests/ba-echo.sh
+++ b/lustre/tests/ba-echo.sh
@@ -2,17 +2,16 @@
 
 config=${1:-ba-echo.xml}
 
+LMC_REAL="${LMC:-../utils/lmc} -m $config"
 LMC="save_cmd"
-LMC_REAL="../../lustre/utils/lmc -m $config"
 
-PORT=2432
 TCPBUF=1048576
-OST=ba-ost-1
-CLIENT=client
- 
+OST=${OST:-ba-ost-1}
+CLIENT=${CLIENT:-`hostname`}
+
 UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
 
-h2ip () {
+h2tcp () {
     echo "${1}"
 }
 BATCH=/tmp/lmc-batch.$$
@@ -23,17 +22,17 @@ save_cmd() {
 [ -f $config ] && rm $config
 
 # Client node
-${LMC} --node $CLIENT --tcpbuf $TCPBUF --net '*' tcp $PORT
+${LMC} --add net --node $CLIENT --tcpbuf $TCPBUF --nid '*' --nettype tcp
 
-OBD_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
-[ "$OBD_UUID" ] && OBD_UUID="--obduuid=$OBD_UUID" || echo "$OST: no UUID"
+OST_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
+[ "$OST_UUID" ] && OST_UUID="--ostuuid=$OST_UUID" || echo "$OST: no UUID"
 
 # server node
-${LMC} --node $OST --tcpbuf $TCPBUF --net $OST tcp $PORT
-${LMC} --node $OST --obdtype=obdecho $OBD_UUID --ost
+${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp
+${LMC} --add ost --node $OST --ost ost1 --osdtype=obdecho $OST_UUID 
 
 # osc on client
-${LMC} --node $CLIENT --osc OSC_$OST
+${LMC} --add echo_client --node $CLIENT --ost ost1
 
 $LMC_REAL --batch $BATCH
 rm -f $BATCH