b=8007

allow override of MGSNID

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index c2b70af..6773dfb 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = $(LLCFLAGS)
 # LDADD := -lreadline -ltermcap # -lefence
 
 noinst_DATA =
-noinst_SCRIPTS = leak_finder.pl llecho.sh llmount.sh llmountcleanup.sh
+noinst_SCRIPTS = leak_finder.pl llecho.sh llmount.sh llmountcleanup.sh test-framework.sh
 noinst_SCRIPTS += runfailure-mds runvmstat runfailure-net
 noinst_SCRIPTS += runfailure-ost runiozone runregression-net.sh runtests
 noinst_SCRIPTS += sanity.sh rundbench

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index fddbf0f..b04647d 100644 (file)
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -19,7 +19,7 @@ OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
 OSTSIZE=${OSTSIZE:-200000}
 
 NETTYPE=${NETTYPE:-tcp}
-MGSNID=`h2$NETTYPE $mgs_HOST`
+MGSNID=${MGSNID:-`h2$NETTYPE $mgs_HOST`}
 FSTYPE=${FSTYPE:-ldiskfs}
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 3d129f6..60502c7 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -23,7 +23,7 @@ OSTOPT=""
 # ost1_HOST="uml2"
 
 NETTYPE=${NETTYPE:-tcp}
-MGSNID=`h2$NETTYPE $mgs_HOST`
+MGSNID=${MGSNID:-`h2$NETTYPE $mgs_HOST`}
 FSTYPE=${FSTYPE:-ldiskfs}
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}

diff --git a/lustre/tests/cfg/lov.sh b/lustre/tests/cfg/lov.sh
index 76a6464..94b768f 100644 (file)
--- a/lustre/tests/cfg/lov.sh
+++ b/lustre/tests/cfg/lov.sh
@@ -17,7 +17,7 @@ OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
 OSTSIZE=${OSTSIZE:-150000}
 
 NETTYPE=${NETTYPE:-tcp}
-MGSNID=`h2$NETTYPE $mgs_HOST`
+MGSNID=${MGSNID:-`h2$NETTYPE $mgs_HOST`}
 FSTYPE=${FSTYPE:-ldiskfs}
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-$((OSTCOUNT -1))}

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index a23acf1..e903dbe 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -263,7 +263,7 @@ test_5c() {
        start_mds
        [ -d $MOUNT ] || mkdir -p $MOUNT
        grep " $MOUNT " /etc/mtab && echo "test 5c: mtab before mount" && return 10
-       mount -t lustre `facet_nid mgs`:/wrong.$FSNAME $MOUNT || :
+       mount -t lustre $MGSNID:/wrong.$FSNAME $MOUNT || :
        grep " $MOUNT " /etc/mtab && echo "test 5c: mtab after failed mount" && return 11
        umount_client $MOUNT
        cleanup_nocli  || return $?
@@ -631,7 +631,7 @@ test_15() {
        # load llite module on the client if it isn't in /lib/modules
        do_facet client "$LCONF --nosetup --node client_facet $XMLCONFIG"
        do_facet client "mount -t lustre -o $MOUNTOPT \
-               `facet_nid mds`:/mds_svc/client_facet $MOUNT" ||return $?
+               $MGSNID:/$FSNAME $MOUNT" ||return $?
        echo "mount lustre on $MOUNT with $MOUNTLUSTRE: success"
        [ -d /r ] && $LCTL modules > /r/tmp/ogdb-`hostname`
        check_mount || return 41
@@ -640,7 +640,7 @@ test_15() {
        [ -f "$MOUNTLUSTRE" ] && rm -f $MOUNTLUSTRE
        echo "mount lustre on ${MOUNT} without $MOUNTLUSTRE....."
        do_node `hostname` mount -t lustre -o nettype=$NETTYPE,$MOUNTOPT \
-               `facet_nid mds`:/mds_svc/client_facet $MOUNT &&return $?
+               $MGSNID:/$FSNAME $MOUNT &&return $?
        echo "mount lustre on $MOUNT without $MOUNTLUSTRE failed as expected"
        cleanup || return $?
        cleanup_15

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 90a9783..cb79de0 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -189,7 +189,7 @@ zconf_mount() {
     if [ -n "$MOUNTOPT" ]; then
         OPTIONS="-o $MOUNTOPT"
     fi
-    local device=`facet_nid mgs`:/$FSNAME
+    local device=$MGSNID:/$FSNAME
     if [ -z "$mnt" -o -z "$FSNAME" ]; then
         echo Bad zconf mount command: opt=$OPTIONS dev=$device mnt=$mnt
         exit 1
@@ -416,20 +416,6 @@ facet_host() {
     echo -n ${!varname}
 }
 
-facet_nid() {
-    facet=$1
-    HOST=`facet_host $facet`
-    if [ -z "$HOST" ]; then
-    echo "The env variable ${facet}_HOST must be set."
-        exit 1
-    fi
-    if [ -z "$NETTYPE" ]; then
-        echo "The env variable NETTYPE must be set."
-        exit 1
-    fi
-    echo `h2$NETTYPE $HOST`
-}
-
 facet_active() {
     local facet=$1
     local activevar=${facet}active