- obsolete

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index ea6b380..8b15f8f 100755 (executable)
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-config=lov.xml
+if [ -z "$1" ]; then
+   config=lov.xml
+else
+   config=$1
+fi
+
 LMC=../utils/lmc
 
 echo "FIXME: autoformat is no by default, edit $config to change"

diff --git a/lustre/tests/lov.xml b/lustre/tests/lov.xml
index 60c183f..fc09a73 100644 (file)
--- a/lustre/tests/lov.xml
+++ b/lustre/tests/lov.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE lustre>
 <lustre>
   <ldlm name='ldlm' uuid='ldlm_UUID'/>
   <node name='localhost' uuid='localhost_UUID'>
@@ -32,7 +31,7 @@
   </mdc>
   <lov name='lov1' uuid='lov1_UUID'>
     <mds_ref uuidref='mds1_UUID'/>
-    <devices stripesize='4096' stripeoffset='0' pattern='0'>
+    <devices stripeoffset='0' stripesize='4096' pattern='0'>
       <osc_ref uuidref='OSC_localhost_UUID'/>
       <osc_ref uuidref='OSC_localhost_2_UUID'/>
     </devices>

diff --git a/lustre/tests/mds-failover.xml b/lustre/tests/mds-failover.xml
deleted file mode 100644 (file)
index 1c8c91d..0000000
--- a/lustre/tests/mds-failover.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE lustre SYSTEM "../utils/lustre.dtd">
-
-<lustre>
-  <node name="uml1" uuid="uml1-UUID">
-    <network type='tcp' name='uml1' uuid="uml1-net-UUID" >
-      <server>uml1</server>
-      <port>988</port>
-    </network>
-    <profile_ref uuidref="uml1-prof-UUID"/>
-  </node>
-
-  <profile name="uml1-prof" uuid="uml1-prof-UUID">
-    <service_ref uuidref="uml1-net-UUID"/>
-    <service_ref uuidref="ldlm-srv-UUID"/>
-    <service_ref uuidref="mds1-UUID"/>
-  </profile>
-
-  <node name="uml2" uuid="uml2-UUID">
-    <network type='tcp' name='uml2' uuid="uml2-net-UUID" >
-      <server>uml2</server>
-      <port>988</port>
-    </network>
-    <profile_ref uuidref="uml2-prof-UUID"/>
-  </node>
-
-  <profile name="uml2-prof" uuid="uml2-prof-UUID">
-    <service_ref uuidref="uml2-net-UUID"/>
-    <service_ref uuidref="ldlm-srv-UUID"/>
-    <service_ref uuidref="mds2-UUID"/>
-    <service_ref uuidref="mdc1-UUID"/>
-    <service_ref uuidref="obd1-UUID"/>
-    <service_ref uuidref="ost1-UUID"/>
-    <service_ref uuidref="osc1-UUID"/>
-    <service_ref uuidref="mtpt1-UUID"/>
-  </profile>
-
-
-  <ldlm name="ldlm-srv" uuid="ldlm-srv-UUID"/>
-
-  <mdc name="mdc1" uuid="mdc1-UUID">
-    <network_ref uuidref='uml1-net-UUID'/> <!-- is this extra net needed ?? -->
-    <mds_ref uuidref="mds1-UUID"/>
-  </mdc>
-
-  <mds name="mds1" uuid="mds1-UUID">
-    <network_ref uuidref="uml1-UUID"/>
-    <fstype>extN</fstype>
-    <device size="50000">/tmp/mds</device>
-    <autoformat>yes</autoformat>
-    <failover_ref uuidref="mds2-UUID"/>
-  </mds>
-
-  <mds name="mds2" uuid="mds2-UUID">
-    <network_ref uuidref="uml2-UUID"/>
-    <fstype>extN</fstype>
-    <device size="50000">/tmp/mds</device>
-    <autoformat>yes</autoformat>
-  </mds>
-
-  <osc name="osc1" uuid="osc1-UUID">
-    <network_ref uuidref='uml2-net-UUID'/>
-    <obd_ref uuidref="obd1-UUID"/>
-  </osc>
-
-  <ost name="ost1" uuid="ost1-UUID">
-    <network_ref uuidref='uml2-net-UUID'/>
-    <obd_ref uuidref='obd1-UUID'/>
-  </ost>
-
-  <obd name="obd1" uuid="obd1-UUID" type="obdfilter">
-    <fstype>extN</fstype>
-    <device size="100000">/tmp/obd1</device>
-    <autoformat>yes</autoformat>
-  </obd>
-
-  <obd name="obd2" uuid="obd2-UUID" type="obdfilter">
-    <fstype>extN</fstype>
-    <device size="100000">/tmp/obd2</device>
-    <autoformat>yes</autoformat>
-  </obd>
-
-  <mountpoint name="mtpt1" uuid="mtpt1-UUID">
-    <path>/mnt/lustre</path>
-    <mdc_ref uuidref="mdc1-UUID"/>
-    <osc_ref uuidref="osc1-UUID"/>
-  </mountpoint>
-
-</lustre>
-

diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index b724548..44a98ed 100644 (file)
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -57,3 +57,5 @@ done
 
 cleanup_lustre
 cleanup_portals
+
+

diff --git a/lustre/tests/uml.xml b/lustre/tests/uml.xml
index 6320c43..7ba634a 100644 (file)
--- a/lustre/tests/uml.xml
+++ b/lustre/tests/uml.xml
@@ -13,6 +13,25 @@
       <port>988</port>
     </network>
   </node>
+  <node router name='gw1' uuid='r1uuid' >
+    <profile>
+      <network_ref/>
+      <network_ref/>
+      <route_tbl_ref/>
+    </profile>
+    <network type='tcp'/>
+    <network type='elan'/>
+  </node>
+
+  <route_tbl name='' uuid=''>
+    <route nettype='elan' gw='1' lo='2' hi='100'>
+    <route nettype='tcp' gw='gw1' lo='ba1'>
+    <route nettype='tcp' gw='gw1' lo='ba2'>
+    <route nettype='tcp' gw='gw1' lo='ba3'>
+    <route nettype='elan' gw='2' lo='2' hi='100'>
+    <route nettype='tcp' gw='gw2' lo='ba3'>
+  </route_tbl>
+
   <node name='uml2' uuid='uml2_UUID'>
     <profile>
       <ldlm_ref uuidref='ldlm_UUID'/>