Merged branch 'peter' with the tip. Pre-merge tag is 't_20020302_networking'.

[fs/lustre-release.git] / lustre / tests / ostreq.sh

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index bebc73a..ab26b7c 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -1,39 +1,53 @@
 #!/bin/sh
 
-R=/r
+SRCDIR="`dirname $0`"
+. $SRCDIR/common.sh
 
-# insmod /lib/modules/2.4.17/kernel/drivers/block/loop.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
+SERVER=localhost
+
+mknod /dev/portals c 10 240
+
+insmod $R/usr/src/portals/linux/oslib/portals.o || exit -1
+insmod $R/usr/src/portals/linux/socknal/ksocknal.o || exit -1
+
+$R/usr/src/portals/linux/utils/acceptor 1234 &
+
+insmod $R/usr/src/obd/class/obdclass.o || exit -1
+insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
+insmod $R/usr/src/obd/ext2obd/obdext2.o || exit -1
+insmod $R/usr/src/obd/ost/ost.o || exit -1
+insmod $R/usr/src/obd/osc/osc.o || exit -1
+
+$R/usr/src/portals/linux/utils/ptlctl <<EOF
+mynid localhost
+setup tcp
+connect $SERVER 1234
+add_uuid self
+add_uuid ost
+quit
+EOF
 
 
 dd if=/dev/zero of=/tmp/fs bs=1024 count=10000
 mke2fs -F /tmp/fs
-losetup /dev/loop/0 /tmp/fs
+losetup ${LOOP}0 /tmp/fs || exit -1
 
 echo 4095 > /proc/sys/obd/debug
 echo 4095 > /proc/sys/obd/trace
 
 mknod /dev/obd c 10 241
 
+$R/usr/src/obd/utils/obdctl modules > $R/tmp/ogdb
+
 $R/usr/src/obd/utils/obdctl <<EOF
 device 0
 attach obdext2
-setup /dev/loop/0
+setup ${LOOP}0
 device 1
 attach ost
 setup 0
 device 2
 attach osc
-setup 1
+setup -1
 quit
 EOF
-
-
-
-