- replace llmount and llmountcleanup with versions that use lconf.

- remove old xml files

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index d29f574..508208c 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+LCONF=../utils/lconf
 
-export DEBUG_WAIT=yes
-. $SRCDIR/llsetup.sh $SRCDIR/net-local.cfg $SRCDIR/mds.cfg $SRCDIR/obdfilter.cfg $SRCDIR/client-mount.cfg $SRCDIR/ldlm.cfg || exit 2
+if [ ! -f local.xml ]; then
+   ./local.sh
+fi
+
+${LCONF} --gdb local.xml
 
-debug_client_on
-#debug_client_off

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 6b861a4..136f507 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+LCONF=../utils/lconf
+
+if [ ! -f local.xml ]; then
+   ./local.sh
+fi
+
+${LCONF} --cleanup local.xml
 
-. $SRCDIR/llcleanup.sh $SRCDIR/net-local.cfg $SRCDIR/mds.cfg $SRCDIR/obdfilter.cfg $SRCDIR/client-mount.cfg $SRCDIR/ldlm.cfg || exit 2
\ No newline at end of file

diff --git a/lustre/tests/mds.xml b/lustre/tests/mds.xml
deleted file mode 100644 (file)
index acb3f01..0000000
--- a/lustre/tests/mds.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE lustre SYSTEM "lustre.dtd">
-
-<lustre>
-  <node id="dev5" uuid="dev5-UUID">
-    <profile_id num="1" id="mds-profile-1" uuid="mds-profile-1-UUID"></profile_id>
-  </node>
-
-  <profile id="mds-profile-1" uuid="mds-profile-1-UUID">
-    <service_id num="1" id="osc-srv-1" uuid="osc-srv-1-UUID"></service_id>
-    <service_id num="2" id="mds-srv-1" uuid="mds-srv-1-UUID"></service_id>
-  </profile>
-
-  <osc id="osc-srv-1" uuid="osc-srv-1-UUID">
-    <network type="ip" address="192.168.0.1"></network>
-  </osc>
-
-  <mds id="mds-srv-1" uuid="mds-srv-1-UUID">
-    <fstype>extN</fstype>
-    <device>/dev/sda1</device>
-    <server_id num="1" id="dev5" uuid="dev5-UUID"></server_id>
-    <failover_id num="1" id="dev5" uuid="dev5-UUID"></failover_id>
-  </mds>
-</lustre>

diff --git a/lustre/tests/net-local.xml b/lustre/tests/net-local.xml
deleted file mode 100644 (file)
index 3e7d15b..0000000
--- a/lustre/tests/net-local.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE lustre SYSTEM "../utils/lustre.dtd">
-
-<lustre>
-  <node name="local" uuid="local-UUID">
-    <network type='tcp' name='net-local' uuid="net-local-UUID" >
-      <server>localhost</server>
-      <port>2432</port>
-    </network>
-    <profile_ref num="1" name="local-profile" uuidref="local-profile-UUID"/>
-  </node>
-
-  <profile name="local-profile" uuid="local-profile-UUID">
-    <service_ref num="0" name="net-local" uuidref="net-local-UUID"/> 
-    <service_ref num="0" name="ldlm-srv" uuidref="ldlm-srv-UUID"/> 
-    <service_ref num="0" name="obd-srv" uuidref="obd-srv-UUID"/>
-    <service_ref num="1" name="ost-srv" uuidref="ost-srv-UUID"/>
-    <service_ref num="4" name="lustre-mnt" uuidref="lustre-mnt-UUID"/>
-    <service_ref num="2" name="osc-srv" uuidref="osc-srv-UUID"/>
-    <service_ref num="3" name="mdc-srv" uuidref="mdc-srv-UUID"/>
-    <service_ref num="0" name="mds-srv" uuidref="mds-srv-UUID"/>
-  </profile>
-
-  <ldlm name="ldlm-srv" uuid="ldlm-srv-UUID"></ldlm>
-
-  <obd name="obd-srv" uuid="obd-srv-UUID" type="obdfilter">
-    <fstype>extN</fstype>
-    <device size="100">/tmp/obd-srv</device>
-    <autoformat>no</autoformat>
-  </obd>
-
-  <mds name="mds-srv" uuid="mds-srv-UUID">
-    <network_ref name='net-local' uuidref="net-local-UUID"/>
-    <fstype>extN</fstype>
-    <device size="100">/tmp/mds-srv</device>
-    <server_ref num="1" name="mds-srv" uuidref="mds-srv-UUID"/>
-    <failover_ref num="1" name="mds-srv" uuidref="mds-srv-UUID"/>
-  </mds>
-
-  <ost name="ost-srv" uuid="ost-srv-UUID">
-    <network_ref name='net-local' uuidref="net-local-UUID"/>
-    <obd_ref num="1" name="$obd-srv" uuidref="obd-srv-UUID"/>
-    <failover_ref num="1" name="$obd-srv" uuidref="obd-srv-UUID"/>
-  </ost>
-
-  <osc name="osc-srv" uuid="osc-srv-UUID">
-    <network_ref name='net-local' uuidref="net-local-UUID"/>
-    <obd_ref num="1" name="obd-srv" uuidref="obd-srv-UUID"/>
-  </osc>
-
-  <mdc name="mdc-srv" uuid="mdc-srv-UUID">
-    <service_ref num="1" name="mds-srv" uuidref="mds-srv-UUID"/>
-  </mdc>
-
-  <mountpoint name="lustre-mnt" uuid="lustre-mnt-UUID">
-    <path>/mnt/lustre</path>
-    <fileset>dev</fileset>
-    <mds_ref num="1" name="mds-srv" uuidref="mds-srv-UUID"/>
-  </mountpoint>
-</lustre>