Add some variables to the config scripts so they are easier to customize.

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 6d1f74e..3fce810 100755 (executable)
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -5,14 +5,20 @@ config=${1:-local.xml}
 LMC=${LMC:-../utils/lmc}
 TMP=${TMP:-/tmp}
 
+MDSDEV=$TMP/mds1
+MDSSIZE=50000
+
+OSTDEV=$TMP/ost1
+OSTSIZE=100000
+
 # create nodes
 ${LMC} -o $config --node localhost --net localhost tcp || exit 1
 
 # configure mds server
-${LMC} -m $config --format  --node localhost --mds mds1 $TMP/mds1 50000 || exit 2
+${LMC} -m $config --format  --node localhost --mds mds1 $OSTDEV $OSTSIZE || exit 2
 
 # configure ost
-${LMC} -m $config --format --node localhost --ost $TMP/ost1 100000 || exit 3
+${LMC} -m $config --format --node localhost --ost $OSTDEV $OSTSIZE || exit 3
 
 # create client config
 ${LMC} -m $config --node localhost --mtpt /mnt/lustre mds1 OSC_localhost || exit 4

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index 5443b1f..6419d9b 100755 (executable)
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -5,16 +5,23 @@ config=${1:-lov.xml}
 LMC=../utils/lmc
 TMP=${TMP:-/tmp}
 
+MDSDEV=$TMP/mds1
+MDSSIZE=50000
+
+OSTDEV1=$TMP/ost1
+OSTDEV2=$TMP/ost2
+OSTSIZE=100000
+
 # create nodes
-${LMC} -o $config --node localhost --net localhost tcp 
+${LMC} -o $config --node localhost --net localhost tcp || exit 1
 
 # configure mds server
-${LMC} -m $config --format --node localhost --mds mds1 $TMP/mds1 50000
+${LMC} -m $config --format --node localhost --mds mds1 $MDSDEV $MDSSIZE || exit 10
 
 # configure ost
-${LMC} -m $config --lov lov1 mds1 65536 0 0
-${LMC} -m $config --node localhost --lov lov1 --ost $TMP/ost1 100000
-${LMC} -m $config --node localhost --lov lov1 --ost $TMP/ost2 100000
+${LMC} -m $config --lov lov1 mds1 65536 0 0 || exit 20
+${LMC} -m $config --node localhost --lov lov1 --ost $OSTDEV1 $OSTSIZE || exit 21
+${LMC} -m $config --node localhost --lov lov1 --ost $OSTDEV2 $OSTSIZE || exit 22
 
 # create client config
-${LMC} -m $config  --node localhost --mtpt /mnt/lustre mds1 lov1
+${LMC} -m $config  --node localhost --mtpt /mnt/lustre mds1 lov1 || exit 30

diff --git a/lustre/tests/uml.sh b/lustre/tests/uml.sh
index ca100ab..6070723 100644 (file)
--- a/lustre/tests/uml.sh
+++ b/lustre/tests/uml.sh
@@ -4,21 +4,30 @@ config=${1-uml.xml}
 LMC=${LMC-../utils/lmc}
 TMP=${TMP:-/tmp}
 
+MDSDEV=$TMP/mds1
+MDSSIZE=50000
+
+OSTDEV1=$TMP/ost1
+OSTDEV2=$TMP/ost2
+OSTSIZE=100000
+
+MDSNODE=uml1
+OSTNODE=uml2
+CLIENT=uml3
+
 # create nodes
-${LMC} -o $config --node uml1 --net uml1 tcp 
-${LMC} -m $config --node uml2 --net uml2 tcp 
-${LMC} -m $config --node uml3 --net uml3 tcp 
+${LMC} -o $config --node $MDSNODE --net $MDSNODE tcp || exit 1
+${LMC} -m $config --node $OSTNODE --net $OSTNODE tcp || exit 2
+${LMC} -m $config --node $CLIENT --net $CLIENT tcp || exit 3
 
 # configure mds server
-${LMC} -m $config  --node uml1 --mds mds1 $TMP/mds1 50000
+${LMC} -m $config --format --node $MDSNODE --mds mds1 $MDSDEV $MDSSIZE ||exit 10
 
 # configure ost
-${LMC} -m $config  --lov lov1 mds1 65536 0 0
-${LMC} -m $config  --node uml2 --lov lov1 --ost $TMP/ost1 100000
-${LMC} -m $config  --node uml2 --lov lov1 --ost $TMP/ost2 100000
-# is this needed?
-# ${LMC} -m $config  --node uml2 --mdc MDC_mds1
+${LMC} -m $config  --lov lov1 mds1 65536 0 0 || exit 20
+${LMC} -m $config --node $OSTNODE --lov lov1 --ost $OSTDEV1 $OSTSIZE || exit 21
+${LMC} -m $config --node $OSTNODE --lov lov1 --ost $OSTDEV2 $OSTSIZE || exit 22
 
 # create client config
-${LMC} -m $config  --node uml3 --mtpt /mnt/lustre mds1 lov1
+${LMC} -m $config  --node $CLIENT --mtpt /mnt/lustre mds1 lov1 || exit 30