X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmcr.sh;h=47773379b4901f4059ed816e68714dabbf9ccbd5;hb=e52a140eb7f65a63f07dbb7e2aaff7f9e22974f2;hp=dc9b643d9adc987906019a4beb8bc0ffa5ead172;hpb=154b306fcdd5b21872195c2bd8862e17e6f2be1c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mcr.sh b/lustre/tests/mcr.sh
index dc9b643..4777337 100755
--- a/lustre/tests/mcr.sh
+++ b/lustre/tests/mcr.sh
@@ -12,7 +12,6 @@ ROUTER=dev5
 CLIENT_LO=dev2
 CLIENT_HI=dev25
 
-PORT=2432
 TCPBUF=1048576
  
 
@@ -20,27 +19,27 @@ 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} -m $config --add route --node $ROUTER --nettype elan --gw `h2elan $ROUTER` --lo `h2elan $CLIENT_LO` --hi `h2elan $CLIENT_HI` || exit 2
 
 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} --node $s --obdtype=obdecho --ost || exit 3
-   # attach to the device on the client (this would normally be a moun)
-   ${LMC} --node client --osc  OSC_$s || exit 4
+   ${LMC} --add ost --node $s --obd obd_$s --obdtype=obdecho || exit 3
+   # attach to the device on the client (this would normally be a mount)
+   ${LMC} --add oscref --node client --osc  OSC_obd_$s || exit 4
 done