X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmcr-mds-failover-config.sh;h=29ec21580fd290cb26aa0ff1a049b60c295fc1ef;hb=960c1ec8c030cc48b3208e892849dcf5722f28aa;hp=ca539be81ebf3bf902a9fffbbca9943765fb3f7d;hpb=371478daf91a8442249007e977d87bb92a763d8f;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mcr-mds-failover-config.sh b/lustre/tests/mcr-mds-failover-config.sh
index ca539be..29ec215 100755
--- a/lustre/tests/mcr-mds-failover-config.sh
+++ b/lustre/tests/mcr-mds-failover-config.sh
@@ -6,12 +6,13 @@ CONFIG=mcr-mds-failover.xml
 LUSTRE_QUERY=/usr/local/cfs/lustre-failover/lustre-query
 GW_NODE=mcr21
 CLIENT_ELAN=`hostname | sed s/[^0-9]*//;`
-OST_BA=ba50
-OST_UUID=10400010-5dec-11c2-0b5f-00301700041a
+OST=${OST:-ba50}
+UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
+OST_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
+[ "$OST_UUID" ] && OST_UUID="--ostuuid=$OST_UUID" || echo "$OST: no UUID"
 MDS_DEVICE=/dev/sda3
 MDS_SIZE=500000
 TCPBUF=1048576
-TCPPORT=988
 
 MDSNODES=`$LUSTRE_QUERY -h emcri -s id=mds -f`
 ACTIVEMDS=`$LUSTRE_QUERY -h emcri -s id=mds -a`
@@ -22,28 +23,28 @@ h2elan () {
     echo $1 | sed 's/[^0-9]*//g'
 }
 
-h2ip () {
+h2tcp () {
     echo "${1}"
 }
 
 
 # create client node
-$LMC -o $CONFIG --node client --net '*' elan
-$LMC -m $CONFIG --router --node mcr21 --tcpbuf $TCPBUF --net `h2ip $GW_NODE` tcp
-$LMC -m $CONFIG --router --node mcr21 --net `h2elan $GW_NODE` elan
-$LMC -m $CONFIG --node $GW_NODE --route elan `h2elan $GW_NODE` $CLIENT_ELAN 
+$LMC -o $CONFIG --add net --node client --nid '*' --nettype elan
+$LMC -m $CONFIG --add net --router --node mcr21 --tcpbuf $TCPBUF --nid `h2tcp $GW_NODE` --nettype tcp
+$LMC -m $CONFIG --add net --router --node mcr21 --nid `h2elan $GW_NODE` --nettype elan
+$LMC -m $CONFIG --add route --node $GW_NODE --nettype elan --gw `h2elan $GW_NODE` --lo $CLIENT_ELAN 
 
 # create MDS node entries
 for mds in $MDSNODES; do
   elanaddr=`$LUSTRE_QUERY -h emcri -s id=$mds -e`
-  $LMC -m $CONFIG --node $mds --net $elanaddr elan
-  $LMC -m $CONFIG --node $mds --mds mds_$mds $MDS_DEVICE $MDS_SIZE
+  $LMC -m $CONFIG --add net --node $mds --nid $elanaddr --nettype elan
+  $LMC -m $CONFIG --add mds --node $mds --mds mds_$mds --dev $MDS_DEVICE --size $MDS_SIZE
 done
 
 # create OST node entry
-$LMC -m $CONFIG --node $OST_BA --tcpbuf $TCPBUF --net $OST_BA tcp $TCPPORT
-$LMC -m $CONFIG --node $OST_BA --obduuid $OST_UUID --ost bluearc
-$LMC -m $CONFIG --node $GW_NODE --route tcp `h2ip $GW_NODE` $OST_BA
+$LMC -m $CONFIG --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp
+$LMC -m $CONFIG --add ost --node $OST --ost ost_$OST $OST_UUID --dev bluearc
+$LMC -m $CONFIG --add route --node $GW_NODE --nettype tcp --gw `h2tcp $GW_NODE` --lo $OST
 
 # mount
-$LMC -m $CONFIG --node client --mtpt /mnt/lustre mds_$ACTIVEMDS OSC_$OST_BA
+$LMC -m $CONFIG --add mtpt --node client --path /mnt/lustre --mds mds_$ACTIVEMDS --lov ost_$OST