Branch: HEAD

some minor fixes about sanity-crypto test scripts

diff --git a/lustre/tests/cfg/lmv.sh b/lustre/tests/cfg/lmv.sh
index d1cd232..6f896d8 100644 (file)
--- a/lustre/tests/cfg/lmv.sh
+++ b/lustre/tests/cfg/lmv.sh
@@ -9,7 +9,7 @@ mds3_HOST=$mds1_HOST
 ost_HOST=${ost_HOST:-$OSTNODE}
 ost2_HOST=${ost2_HOST:-$ost_HOST}
 client_HOST=${client_HOST:-$CLIENT}
-gsk_HOST=${gsk_HOST:-$MDSNODE}
+gks_HOST=${gks_HOST:-$MDSNODE}
 
 NETTYPE=${NETTYPE:-tcp}
 

diff --git a/lustre/tests/sanity-crypto.sh b/lustre/tests/sanity-crypto.sh
index 1aaba39..c5ab848 100755 (executable)
--- a/lustre/tests/sanity-crypto.sh
+++ b/lustre/tests/sanity-crypto.sh
@@ -45,8 +45,8 @@ gen_config() {
     fi
     add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
     add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
-    add_gsk gsk     
-    add_client client $MDS --lov lov1 --gss gsk_svc --path $MOUNT
+    add_gks gks     
+    add_client client $MDS --lov lov1 --gks gks_svc --path $MOUNT
 }
 
 build_test_filter
@@ -63,7 +63,7 @@ cleanup() {
     umount $MOUNT || true
     rmmod llite
 
-    stop_gsk gsk 
+    stop_gks gks 
     for mds in `mds_list`; do
        stop $mds ${FORCE} $MDSLCONFARGS
     done
@@ -95,7 +95,7 @@ setup() {
        start $mds --reformat $MDSLCONFARGS
     done
     set -vx 
-    start_gsk gsk || exit 4
+    start_gks gks || exit 4
     set -e
     grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
     grep " $MOUNT2 " /proc/mounts || zconf_mount `hostname` $MOUNT2

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index a720fa3..c3bf14b 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -377,25 +377,25 @@ del_ost() {
     shift
     do_lmc --delete ost --node ${facet}_facet --ost ${facet}_svc $*
 }
-start_gsk() {
+start_gks() {
     facet=$1
     shift
     rm -f ${facet}active
     add_facet $facet
     do_facet $facet $LCONF --node ${facet}_facet  --ptldebug $PTLDEBUG $* $XMLCONFIG 
 }
-stop_gsk() {
+stop_gks() {
     facet=$1
     shift
     do_facet $facet $LCONF --node ${facet}_facet  --cleanup $* $XMLCONFIG 
 }
 
-add_gsk() {
+add_gks() {
     facet=$1
     shift
     rm -f ${facet}active
     add_facet $facet
-    do_lmc --add gss --gss ${facet}_svc --node ${facet}_facet $*
+    do_lmc --add gks --gks ${facet}_svc --node ${facet}_facet $*
 }
 add_cmobd() {
     facet=$1