merge HEAD into b_md

diff --git a/lustre/tests/mcr-individual-ost-nogw-config.sh b/lustre/tests/mcr-individual-ost-nogw-config.sh
index 0aae281..cd569b6 100755 (executable)
--- a/lustre/tests/mcr-individual-ost-nogw-config.sh
+++ b/lustre/tests/mcr-individual-ost-nogw-config.sh
@@ -22,7 +22,7 @@ save_cmd() {
 [ -f $config ] && rm $config
 
 # Client node
-${LMC} --node client --tcpbuf $TCPBUF --net '*' tcp || exit 1
+${LMC} --add net --node client --tcpbuf $TCPBUF --nid '*' --nettype tcp || exit 1
 
 # this is crude, but effective
 let server_per_gw=($SERVER_CNT / $GW_CNT )
@@ -34,11 +34,11 @@ do
       echo "server: $server"
       OST=ba$server
       # server node
-      ${LMC} --node $OST --tcpbuf $TCPBUF --net $OST tcp || exit 1
+      ${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp || exit 1
       # the device on the server
-      ${LMC} --node $OST --obdtype=obdecho --ost || exit 3
+      ${LMC} --add ost --node $OST --obd obd_$OST --obdtype=obdecho || exit 3
       # osc on client
-      ${LMC} --node client --osc OSC_$OST
+      ${LMC} --add oscref --node client --osc OSC_obd_$OST
       let server=$server+1 
 done
 

diff --git a/lustre/tests/mcrlov.sh b/lustre/tests/mcrlov.sh
index 35ba323..7350343 100755 (executable)
--- a/lustre/tests/mcrlov.sh
+++ b/lustre/tests/mcrlov.sh
@@ -28,24 +28,25 @@ h2ip () {
 [ -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 || 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 `h2ip $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 65536 --stripe_cnt 0 --stripe_pattern 0 || exit 1
 
-${LMC} --node client --mtpt /mnt/lustre mds1 lov1
+${LMC} --add mtpt --node client --path /mnt/lustre --mds mds1 --lov lov1
 
 for s in $SERVERS
  do
    # server node
-   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp || 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 `h2ip $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