- move the peter branch changes to the head

[fs/lustre-release.git] / lustre / utils / lustre.dtd

diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
index 7716c01..49f3faa 100644 (file)
--- a/lustre/utils/lustre.dtd
+++ b/lustre/utils/lustre.dtd
@@ -2,10 +2,10 @@
 \r
 <!-- basic entities -->\r
 <!ENTITY % tag.content "(#PCDATA)">\r
-<!ENTITY % tag.id "\r
+<!ENTITY % tag.ref "\r
   num CDATA #IMPLIED\r
-  name CDATA #REQUIRED\r
-  uuid CDATA #REQUIRED">\r
+  name CDATA #IMPLIED\r
+  uuidref CDATA #REQUIRED">\r
 <!ENTITY % tag.attr "\r
   name CDATA #REQUIRED\r
   uuid CDATA #REQUIRED">\r
@@ -14,28 +14,32 @@
 <!ELEMENT lustre (node | profile | mountpoint | ldlm |\r
                   mds | mdc | obd | ost | osc | lov | router)*>\r
 \r
-<!ELEMENT profile (service_id)*>\r
+<!ELEMENT profile (service_ref)*>\r
 <!ATTLIST profile %tag.attr;>\r
-<!ELEMENT mountpoint (path | fileset | mds_id | lov_id)*>\r
+<!ELEMENT mountpoint (path | fileset | mdc_ref | osc_ref)*>\r
 <!ATTLIST mountpoint %tag.attr;>\r
-<!ELEMENT node (network*, profile_id)>\r
+<!ELEMENT node (network*, profile_ref)>\r
 <!ATTLIST node %tag.attr;>\r
 <!ELEMENT ldlm EMPTY>\r
 <!ATTLIST ldlm %tag.attr;>\r
 \r
 <!ELEMENT obd (fstype | device | autoformat)*>\r
 <!ATTLIST obd %tag.attr; type (obdfilter | obdext2 | obdecho) 'obdfilter'>\r
-<!ELEMENT ost (network_id | server_id | failover_id)*>\r
+<!ELEMENT ost (network_ref | obd_ref | failover_ref)*>\r
 <!ATTLIST ost %tag.attr;>\r
-<!ELEMENT mds (network_id | fstype | device | server_id | failover_id)*>\r
+<!ELEMENT mds (network_ref | fstype | device | autoformat | server_ref | failover_ref)*>\r
 <!ATTLIST mds %tag.attr;>\r
 \r
-<!ELEMENT osc (service_id)>\r
+<!ELEMENT osc (network_ref | obd_ref)*>\r
 <!ATTLIST osc %tag.attr;>\r
-<!ELEMENT mdc (service_id)>\r
+<!ELEMENT mdc (network_ref | mds_ref)*>\r
 <!ATTLIST mdc %tag.attr;>\r
-<!ELEMENT lov (osc_id | obd_id | mdc_id)*>\r
+<!ELEMENT lov (devices | mdc_ref)*>\r
 <!ATTLIST lov %tag.attr;>\r
+<!ELEMENT devices (osc_ref)+>\r
+<!ATTLIST devices stripesize CDATA #REQUIRED\r
+                  stripeoffset CDATA #REQUIRED\r
+                  pattern    CDATA #REQUIRED>\r
 <!ELEMENT router (misc)*>\r
 <!ATTLIST router %tag.attr;>\r
 \r
@@ -44,11 +48,9 @@
 <!ATTLIST network type (tcp | elan | myrinet) 'tcp'\r
                   %tag.attr;>\r
 \r
-<!ELEMENT network_id    %tag.content;>\r
-<!ATTLIST network_id    %tag.attr;>\r
-\r
 <!ELEMENT fstype        %tag.content;>\r
 <!ELEMENT device        %tag.content;>\r
+<!ATTLIST device        size CDATA #IMPLIED>\r
 <!ELEMENT server        %tag.content;>\r
 <!ELEMENT port          %tag.content;>\r
 <!ELEMENT autoformat    %tag.content;>\r
@@ -56,24 +58,26 @@
 <!ELEMENT fileset       %tag.content;>\r
 \r
 <!-- id tag elements -->\r
-<!ELEMENT profile_id    %tag.content;>\r
-<!ATTLIST profile_id    %tag.id;>\r
-<!ELEMENT obd_id        %tag.content;>\r
-<!ATTLIST obd_id        %tag.id;>\r
-<!ELEMENT mds_id        %tag.content;>\r
-<!ATTLIST mds_id        %tag.id;>\r
-<!ELEMENT osc_id        %tag.content;>\r
-<!ATTLIST osc_id        %tag.id;>\r
-<!ELEMENT lov_id        %tag.content;>\r
-<!ATTLIST lov_id        %tag.id;>\r
-<!ELEMENT mdc_id        %tag.content;>\r
-<!ATTLIST mdc_id        %tag.id;>\r
-<!ELEMENT mountpoint_id %tag.content;>\r
-<!ATTLIST mountpoint_id %tag.id;>\r
-<!ELEMENT service_id    %tag.content;>\r
-<!ATTLIST service_id    %tag.id;>\r
-<!ELEMENT server_id     %tag.content;>\r
-<!ATTLIST server_id     %tag.id;>\r
-<!ELEMENT failover_id   %tag.content;>\r
-<!ATTLIST failover_id   %tag.id;>\r
+<!ELEMENT network_ref    %tag.content;>\r
+<!ATTLIST network_ref    %tag.ref;>\r
+<!ELEMENT profile_ref    %tag.content;>\r
+<!ATTLIST profile_ref    %tag.ref;>\r
+<!ELEMENT obd_ref        %tag.content;>\r
+<!ATTLIST obd_ref        %tag.ref;>\r
+<!ELEMENT mds_ref        %tag.content;>\r
+<!ATTLIST mds_ref        %tag.ref;>\r
+<!ELEMENT osc_ref        %tag.content;>\r
+<!ATTLIST osc_ref        %tag.ref;>\r
+<!ELEMENT lov_ref        %tag.content;>\r
+<!ATTLIST lov_ref        %tag.ref;>\r
+<!ELEMENT mdc_ref        %tag.content;>\r
+<!ATTLIST mdc_ref        %tag.ref;>\r
+<!ELEMENT mountpoint_ref %tag.content;>\r
+<!ATTLIST mountpoint_ref %tag.ref;>\r
+<!ELEMENT service_ref    %tag.content;>\r
+<!ATTLIST service_ref    %tag.ref;>\r
+<!ELEMENT server_ref     %tag.content;>\r
+<!ATTLIST server_ref     %tag.ref;>\r
+<!ELEMENT failover_ref   %tag.content;>\r
+<!ATTLIST failover_ref   %tag.ref;>\r
 \r