From 1b0b797921c058d7cd18bb95711b857812777ddc Mon Sep 17 00:00:00 2001
From: behlendo <behlendo>
Date: Fri, 28 Jun 2002 19:48:59 +0000
Subject: [PATCH] - Refined the DTD futher: 'id' changed to 'name'; tree
 structure rearranged   and brought more inline with the documentation; other
 general ongoing   cleanup. - DTD changes reflected in net-local.xml. - obdctl
 properly uses of UUIDs during config, on going work here.

---
 lustre/tests/llxmlsetup.sh |   2 +-
 lustre/tests/net-local.xml |  63 ++++++++++++++------------
 lustre/utils/lustre.dtd    | 107 +++++++++++++++++++++------------------------
 3 files changed, 84 insertions(+), 88 deletions(-)

diff --git a/lustre/tests/llxmlsetup.sh b/lustre/tests/llxmlsetup.sh
index 4076445..d0915cd 100755
--- a/lustre/tests/llxmlsetup.sh
+++ b/lustre/tests/llxmlsetup.sh
@@ -31,5 +31,5 @@ export DEBUG_WAIT=no
 
 echo
 echo "To mount the filesystem:"
-echo "mount -t lustre_lite -o ost=`$OBDCTL name2dev OSCDEV`,mds=`$OBDCTL name2dev MDCDEV` none /mnt/lustre"
+echo "mount -t lustre_lite -o ost=`$OBDCTL name2dev osc-srv`,mds=`$OBDCTL name2dev mdc-srv` none /mnt/lustre"
 
diff --git a/lustre/tests/net-local.xml b/lustre/tests/net-local.xml
index 9d08af5..ed90255 100644
--- a/lustre/tests/net-local.xml
+++ b/lustre/tests/net-local.xml
@@ -2,57 +2,62 @@
 <!DOCTYPE lustre SYSTEM "lustre.dtd">
 
 <lustre>
-  <node id="local" uuid="local-UUID">
-    <profile_id num="1" id="local-profile" uuid="local-profile-UUID"></profile_id>
+  <node name="local" uuid="local-UUID">
+    <profile_id num="1" name="local-profile" uuid="local-profile-UUID">
+    </profile_id>
   </node>
 
-  <profile id="local-profile" uuid="local-profile-UUID">
-    <service_id num="1" id="ldlm-srv" uuid="ldlm-srv-UUID"></service_id>
-    <service_id num="2" id="mds-srv" uuid="mds-srv-UUID"></service_id>
-    <service_id num="3" id="obd-srv" uuid="obd-srv-UUID"></service_id>
-    <service_id num="4" id="ost-srv" uuid="ost-srv-UUID"></service_id>
-    <service_id num="5" id="osc-srv" uuid="osc-srv-UUID"></service_id>
-    <service_id num="6" id="mdc-srv" uuid="mdc-srv-UUID"></service_id>
-    <mountpoint_id num="1" id="lustre-mnt" uuid="lustre-mnt-UUID"></mountpoint_id>
+  <profile name="local-profile" uuid="local-profile-UUID">
+    <service_id num="0" name="ldlm-srv" uuid="ldlm-srv-UUID"></service_id>
+    <service_id num="0" name="obd-srv" uuid="obd-srv-UUID"></service_id>
+    <service_id num="0" name="mds-srv" uuid="mds-srv-UUID"></service_id>
+    <service_id num="1" name="ost-srv" uuid="ost-srv-UUID"></service_id>
+    <service_id num="2" name="osc-srv" uuid="osc-srv-UUID"></service_id>
+    <service_id num="3" name="mdc-srv" uuid="mdc-srv-UUID"></service_id>
+    <mountpoint_id num="0" name="lustre-mnt" uuid="lustre-mnt-UUID">
+    </mountpoint_id>
   </profile>
 
-  <ldlm id="ldlm-srv" uuid="ldlm-srv-UUID"></ldlm>
+  <ldlm name="ldlm-srv" uuid="ldlm-srv-UUID"></ldlm>
 
-  <mds id="mds-srv" uuid="mds-srv-UUID">
-    <fstype>extN</fstype>
-    <device>/dev/loop0</device>
-    <server_id num="1" id="local" uuid="local-UUID"></server_id>
-    <failover_id num="1" id="local" uuid="local-UUID"></failover_id>
-  </mds>
-
-  <obd id="obd-srv" uuid="obd-srv-UUID" type="obdfilter">
+  <obd name="obd-srv" uuid="obd-srv-UUID" type="obdfilter">
     <fstype>extN</fstype>
     <device>/dev/loop1</device>
     <autoformat>no</autoformat>
   </obd>
 
-  <ost id="ost-srv" uuid="ost-srv-UUID">
-    <server_id num="1" id="local" uuid="local-UUID"></server_id>
-    <failover_id num="1" id="local" uuid="local-UUID"></failover_id>
-  </ost>
-
-  <osc id="osc-srv" uuid="osc-srv-UUID">
+  <mds name="mds-srv" uuid="mds-srv-UUID">
     <network type="tcp">
       <server>localhost</server>
       <port>1234</port>
     </network>
-  </osc>
+    <fstype>extN</fstype>
+    <device>/dev/loop0</device>
+    <server_id num="1" name="mds-srv" uuid="mds-srv-UUID"></server_id>
+    <failover_id num="1" name="mds-srv" uuid="mds-srv-UUID"></failover_id>
+  </mds>
 
-  <mdc id="mdc-srv" uuid="mdc-srv-UUID">
+  <ost name="ost-srv" uuid="ost-srv-UUID">
     <network type="tcp">
       <server>localhost</server>
       <port>1234</port>
     </network>
+    <server_id num="1" name="$obd-srv" uuid="obd-srv-UUID"></server_id>
+    <failover_id num="1" name="$obd-srv" uuid="obd-srv-UUID"></failover_id>
+  </ost>
+
+  <osc name="osc-srv" uuid="osc-srv-UUID">
+    <!-- Temporarily this points to the OBD and not the OST -->
+    <service_id num="1" name="obd-srv" uuid="obd-srv-UUID"></service_id>
+  </osc>
+
+  <mdc name="mdc-srv" uuid="mdc-srv-UUID">
+    <service_id num="1" name="mds-srv" uuid="mds-srv-UUID"></service_id>
   </mdc>
 
-  <mountpoint id="lustre-mnt" uuid="lustre-mnt-UUID">
+  <mountpoint name="lustre-mnt" uuid="lustre-mnt-UUID">
     <path>/mnt/lustre</path>
     <fileset>dev</fileset>
-    <mds_id num="1" id="mds-srv" uuid="mds-srv-UUID"></mds_id>
+    <mds_id num="1" name="mds-srv" uuid="mds-srv-UUID"></mds_id>
   </mountpoint>
 </lustre>
diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
index d76dc27..1b44735 100644
--- a/lustre/utils/lustre.dtd
+++ b/lustre/utils/lustre.dtd
@@ -1,78 +1,69 @@
 <!-- Lustre Management DTD -->
 
 <!-- basic entities -->
-<!ENTITY % basic.content '#PCDATA'>
-<!ENTITY % id.content 'num | id | uuid'>
+<!ENTITY % tag.content '(#PCDATA)'>
+<!ENTITY % tag.id '(num) #CDATA #IMPLIED (name, uuid) #CDATA #REQUIRED'>
+<!ENTITY % tag.attr '(name, uuid) #CDATA #REQUIRED'>
 
 <!-- main elements -->
 <!ELEMENT lustre (node | profile | mountpoint |
                   mds | obd | ost | osc | lov | router)*>
 
 <!ELEMENT profile (mountpoint_id, service_id)>
-<!ATTLIST profile id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
+<!ATTLIST profile %tag.attr;>
 <!ELEMENT mountpoint (path, fileset, mds_id, lov_id)>
-<!ATTLIST mountpoint id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
+<!ATTLIST mountpoint %tag.attr;>
 <!ELEMENT node (profile_id)>
-<!ATTLIST node id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
-<!ELEMENT ldlm ()*>
-<!ATTLIST ldlm id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
-<!ELEMENT mds (fstype | device | server_id | failover_id)*>
-<!ATTLIST mds id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
+<!ATTLIST node %tag.attr;>
+<!ELEMENT ldlm>
+<!ATTLIST ldlm %tag.attr;>
 
 <!ELEMENT obd (fstype | device | autoformat)*>
-<!ATTLIST obd id #CDATA #REQUIRED uuid #CDATA #REQUIRED
-                type (obdfilter | obdext2 | obdecho) 'obdfilter'>
-
-<!ELEMENT ost (server_id | failover_id)*>
-<!ATTLIST ost id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-        
-<!ELEMENT osc (network)*>
-<!ATTLIST osc id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
-<!ELEMENT mdc (network)*>
-<!ATTLIST mdc id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
+<!ATTLIST obd %tag.attr; type (obdfilter | obdext2 | obdecho) 'obdfilter'>
+<!ELEMENT ost (network | server_id | failover_id)*>
+<!ATTLIST ost %tag.attr;>
+<!ELEMENT mds (network | fstype | device | server_id | failover_id)*>
+<!ATTLIST mds %tag.attr;>
+
+<!ELEMENT osc (service_id)>
+<!ATTLIST osc %tag.attr;>
+<!ELEMENT mdc (service_id)>
+<!ATTLIST mdc %tag.attr;>
 <!ELEMENT lov (osc_id | obd_id | mdc_id)*>
-<!ATTLIST lov id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
-
+<!ATTLIST lov %tag.attr;>
 <!ELEMENT router (misc)*>
-<!ATTLIST router id #CDATA #REQUIRED uuid #CDATA #REQUIRED>
+<!ATTLIST router %tag.attr;>
 
 <!-- basic elements -->
-<!ELEMENT network (%basic.content;)*>
+<!ELEMENT network %tag.content;>
 <!ATTLIST network type (tcp | elan | myrinet) 'tcp'>
 
-<!ELEMENT fstype        (%basic.content;)*>
-<!ELEMENT device        (%basic.content;)*>
-<!ELEMENT server        (%basic.content;)*>
-<!ELEMENT autoformat    (%basic.content;)*>
-<!ELEMENT path          (%basic.content;)*>
-<!ELEMENT fileset       (%basic.content;)*>
-
-<!ELEMENT profile_id    (%basic.content;)*>
-<!ATTLIST profile_id    (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT ldlm_id       (%basic.content;)*>
-<!ATTLIST ldlm_id       (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT mds_id        (%basic.content;)*>
-<!ATTLIST mds_id        (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT obd_id        (%basic.content;)*>
-<!ATTLIST obd_id        (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT osc_id        (%basic.content;)*>
-<!ATTLIST osc_id        (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT lov_id        (%basic.content;)*>
-<!ATTLIST lov_id        (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT mdc_id        (%basic.content;)*>
-<!ATTLIST mdc_id        (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT mountpoint_id (%basic.content;)*>
-<!ATTLIST mountpoint_id (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT service_id    (%basic.content;)*>
-<!ATTLIST service_id    (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT server_id     (%basic.content;)*>
-<!ATTLIST server_id     (%id.content;)* #CDATA #IMPLIED>
-<!ELEMENT failover_id   (%basic.content;)*>
-<!ATTLIST failover_id   (%id.content;)* #CDATA #IMPLIED>
+<!ELEMENT fstype        %tag.content;>
+<!ELEMENT device        %tag.content;>
+<!ELEMENT server        %tag.content;>
+<!ELEMENT autoformat    %tag.content;>
+<!ELEMENT path          %tag.content;>
+<!ELEMENT fileset       %tag.content;>
+
+<!-- id tag elements -->
+<!ELEMENT profile_id    %tag.content;>
+<!ATTLIST profile_id    %tag.id;>
+<!ELEMENT obd_id        %tag.content;>
+<!ATTLIST obd_id        %tag.id;>
+<!ELEMENT mds_id        %tag.content;>
+<!ATTLIST mds_id        %tag.id;>
+<!ELEMENT osc_id        %tag.content;>
+<!ATTLIST osc_id        %tag.id;>
+<!ELEMENT lov_id        %tag.content;>
+<!ATTLIST lov_id        %tag.id;>
+<!ELEMENT mdc_id        %tag.content;>
+<!ATTLIST mdc_id        %tag.id;>
+<!ELEMENT mountpoint_id %tag.content;>
+<!ATTLIST mountpoint_id %tag.id;>
+<!ELEMENT service_id    %tag.content;>
+<!ATTLIST service_id    %tag.id;>
+<!ELEMENT server_id     %tag.content;>
+<!ATTLIST server_id     %tag.id;>
+<!ELEMENT failover_id   %tag.content;>
+<!ATTLIST failover_id   %tag.id;>
 
-- 
1.8.3.1