X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmcrlov.sh;h=0e7981c527e735283136bf981efbe76a7b3fa9f9;hb=339704f578367d865a8c454fc5a5a3f4b47f0499;hp=93f1247251dbe4d920f5c4aeb9974ba905a15cdb;hpb=27b216e427759c60db5d80fbe0896aa60c934d5c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mcrlov.sh b/lustre/tests/mcrlov.sh
index 93f1247..0e7981c 100755
--- a/lustre/tests/mcrlov.sh
+++ b/lustre/tests/mcrlov.sh
@@ -14,7 +14,6 @@ TMP=${TMP:-/tmp}
 CLIENT_LO=dev2
 CLIENT_HI=dev25
 
-PORT=988
 TCPBUF=1048576
  
 
@@ -22,31 +21,32 @@ h2elan () {
     echo $1 | sed 's/[^0-9]*//g'
 }
 
-h2ip () {
+h2tcp () {
     echo "${1}"
 }
 
 [ -f $config ] && rm $config
 
 # Client node
-${LMC} --node client --net '*' elan || exit 1
+${LMC} --add net --node client --nid '*' --nettype elan || exit 1
 # Router node
-${LMC} --router --node $ROUTER --tcpbuf $TCPBUF --net `h2ip $ROUTER`  tcp $PORT || exit 1
-${LMC} --node $ROUTER --net `h2elan $ROUTER` elan|| exit 1
-${LMC} --node $ROUTER --route elan `h2elan $ROUTER` `h2elan $CLIENT_LO` `h2elan $CLIENT_HI` || exit 2
+${LMC} --add net --router --node $ROUTER --tcpbuf $TCPBUF --nid `h2tcp $ROUTER`  --nettype tcp || exit 1
+${LMC} --add net --node $ROUTER --nid `h2elan $ROUTER` --nettype elan|| exit 1
+${LMC} --add route --node $ROUTER --gw `h2elan $ROUTER` --lo `h2elan $CLIENT_LO` --hi `h2elan $CLIENT_HI` --nettype elan || exit 2
 
-${LMC} --node $MDS --net `h2elan $MDS` elan || exit 1
-${LMC} --node $MDS --mds mds1 $TMP/mds1 100000 || exit 1
-${LMC} --lov lov1 mds1 65536 0 0
+${LMC} --add net --node $MDS --nid `h2elan $MDS` --nettype elan || exit 1
+${LMC} --add mds --node $MDS --mds mds1 --dev $TMP/mds1 --size 100000 || exit 1
+${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz 1048576 --stripe_cnt 0 --stripe_pattern 0 || exit 1
 
-${LMC} --node client --mtpt /mnt/lustre mds1 lov1
+${LMC} --add mtpt --node client --path /mnt/lustre --clientoptions async --mds mds1 --lov lov1
 
 for s in $SERVERS
  do
    # server node
-   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp $PORT || exit 1
+   ${LMC} --add net --node $s --tcpbuf $TCPBUF --nid $s --nettype tcp || exit 1
    # route to server
-   ${LMC} --node $ROUTER --route tcp `h2ip $ROUTER` $s || exit 2
+   ${LMC} --add route --node $ROUTER --nettype tcp --gw `h2tcp $ROUTER` --lo $s || exit 2
    # the device on the server
-   ${LMC} --format --lov lov1 --node $s --ost bluearc || exit 3
+   #${LMC} --format --lov lov1 --node $s --ost bluearc || exit 3
+   ${LMC} --add ost  --lov lov1 --node $s --dev bluearc --format || exit 3
 done