Update uml.xml as generated by a more recent lmc.

diff --git a/lustre/tests/uml.xml b/lustre/tests/uml.xml
index 7ba634a..c769f71 100644 (file)
--- a/lustre/tests/uml.xml
+++ b/lustre/tests/uml.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE lustre>
 <lustre>
   <ldlm name='ldlm' uuid='ldlm_UUID'/>
   <node name='uml1' uuid='uml1_UUID'>
@@ -6,32 +7,13 @@
       <ldlm_ref uuidref='ldlm_UUID'/>
       <network_ref uuidref='NET_uml1_tcp_UUID'/>
       <mds_ref uuidref='mds1_UUID'/>
-      <lov_ref uuidref='lov1_UUID'/>
+      <lovconfig_ref uuidref='LVCFG_lov1_UUID'/>
     </profile>
     <network name='NET_uml1_tcp' uuid='NET_uml1_tcp_UUID' type='tcp'>
       <server>uml1</server>
       <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'/>
@@ -51,7 +33,6 @@
       <ldlm_ref uuidref='ldlm_UUID'/>
       <network_ref uuidref='NET_uml3_tcp_UUID'/>
       <mountpoint_ref uuidref='MNT_uml3_UUID'/>
-      <mdc_ref uuidref='MDC_mds1_UUID'/>
     </profile>
     <network name='NET_uml3_tcp' uuid='NET_uml3_tcp_UUID' type='tcp'>
       <server>uml3</server>
@@ -61,24 +42,24 @@
   <mds name='mds1' uuid='mds1_UUID'>
     <fstype>extN</fstype>
     <device size='50000'>/tmp/mds1</device>
-    <autoformat>yes</autoformat>
+    <autoformat>no</autoformat>
     <network_ref uuidref='NET_uml1_tcp_UUID'/>
     <node_ref uuidref='uml1_UUID'/>
   </mds>
-  <mdc name='MDC_mds1' uuid='MDC_mds1_UUID'>
-    <mds_ref uuidref='mds1_UUID'/>
-  </mdc>
   <lov name='lov1' uuid='lov1_UUID'>
     <mds_ref uuidref='mds1_UUID'/>
-    <devices stripeoffset='0' stripesize='65536' pattern='0'>
+    <devices stripecount='0' stripesize='65536' pattern='0'>
       <osc_ref uuidref='OSC_uml2_UUID'/>
       <osc_ref uuidref='OSC_uml2_2_UUID'/>
     </devices>
   </lov>
+  <lovconfig name='LVCFG_lov1' uuid='LVCFG_lov1_UUID'>
+    <lov_ref uuidref='lov1_UUID'/>
+  </lovconfig>
   <obd uuid='OBD_uml2_UUID' name='OBD_uml2' type='obdfilter'>
     <fstype>extN</fstype>
     <device size='100000'>/tmp/ost1</device>
-    <autoformat>yes</autoformat>
+    <autoformat>no</autoformat>
   </obd>
   <osc name='OSC_uml2' uuid='OSC_uml2_UUID'>
     <ost_ref uuidref='OST_uml2_UUID'/>
@@ -91,7 +72,7 @@
   <obd name='OBD_uml2_2' uuid='OBD_uml2_2_UUID' type='obdfilter'>
     <fstype>extN</fstype>
     <device size='100000'>/tmp/ost2</device>
-    <autoformat>yes</autoformat>
+    <autoformat>no</autoformat>
   </obd>
   <osc name='OSC_uml2_2' uuid='OSC_uml2_2_UUID'>
     <ost_ref uuidref='OST_uml2_2_UUID'/>
@@ -102,7 +83,7 @@
     <obd_ref uuidref='OBD_uml2_2_UUID'/>
   </ost>
   <mountpoint name='MNT_uml3' uuid='MNT_uml3_UUID'>
-    <mdc_ref uuidref='MDC_mds1_UUID'/>
+    <mds_ref uuidref='mds1_UUID'/>
     <osc_ref uuidref='lov1_UUID'/>
     <path>/mnt/lustre</path>
   </mountpoint>