X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmcr.sh;h=47773379b4901f4059ed816e68714dabbf9ccbd5;hb=17b1b04c128e1823345020c969126ec10b4040c2;hp=baee3fad97eec9bdbf1c7821246f0eeea967bcd9;hpb=59ce5263e2274a1fdf74a24c8b2f9c8e5be31cc7;p=fs%2Flustre-release.git diff --git a/lustre/tests/mcr.sh b/lustre/tests/mcr.sh index baee3fa..4777337 100755 --- a/lustre/tests/mcr.sh +++ b/lustre/tests/mcr.sh @@ -6,13 +6,12 @@ LMC="../utils/lmc -m $config" # TCP/IP servers SERVERS="ba-ost-1 ba-ost-2" -ROUTER=mdev3 +ROUTER=dev5 # Elan clients -CLIENT_LO=mdev2 -CLIENT_HI=mdev25 +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 --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 --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 --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 -done \ No newline at end of file + ${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