- change id to ref

- change ref attributes to just uuidref
- changing service_ref to more specific references where appropriate.

diff --git a/lustre/tests/net-local.xml b/lustre/tests/net-local.xml
index 43f4730..3e7d15b 100644 (file)
--- a/lustre/tests/net-local.xml
+++ b/lustre/tests/net-local.xml
@@ -7,54 +7,54 @@
       <server>localhost</server>
       <port>2432</port>
     </network>
-    <profile_id num="1" name="local-profile" uuid="local-profile-UUID"/>
+    <profile_ref num="1" name="local-profile" uuidref="local-profile-UUID"/>
   </node>
 
   <profile name="local-profile" uuid="local-profile-UUID">
-    <service_id num="0" name="net-local" uuid="net-local-UUID"/> 
-    <service_id num="0" name="ldlm-srv" uuid="ldlm-srv-UUID"/> 
-    <service_id num="0" name="obd-srv" uuid="obd-srv-UUID"/>
-    <service_id num="1" name="ost-srv" uuid="ost-srv-UUID"/>
-    <service_id num="4" name="lustre-mnt" uuid="lustre-mnt-UUID"/>
-    <service_id num="2" name="osc-srv" uuid="osc-srv-UUID"/>
-    <service_id num="3" name="mdc-srv" uuid="mdc-srv-UUID"/>
-    <service_id num="0" name="mds-srv" uuid="mds-srv-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>/tmp/obd-srv</device>
+    <device size="100">/tmp/obd-srv</device>
     <autoformat>no</autoformat>
   </obd>
 
   <mds name="mds-srv" uuid="mds-srv-UUID">
-    <network_id name='net-local' uuid="net-local-UUID"/>
+    <network_ref name='net-local' uuidref="net-local-UUID"/>
     <fstype>extN</fstype>
-    <device>/tmp/mds-srv</device>
-    <server_id num="1" name="mds-srv" uuid="mds-srv-UUID"/>
-    <failover_id num="1" name="mds-srv" uuid="mds-srv-UUID"/>
+    <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_id name='net-local' uuid="net-local-UUID"/>
-    <server_id num="1" name="$obd-srv" uuid="obd-srv-UUID"/>
-    <failover_id num="1" name="$obd-srv" uuid="obd-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">
-    <!-- Temporarily this points to the OBD and not the OST -->
-    <service_id num="1" name="obd-srv" uuid="obd-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_id num="1" name="mds-srv" uuid="mds-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_id num="1" name="mds-srv" uuid="mds-srv-UUID"/>
+    <mds_ref num="1" name="mds-srv" uuidref="mds-srv-UUID"/>
   </mountpoint>
 </lustre>

diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
index 7716c01..621becc 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,27 +14,27 @@
 <!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 | mds_ref | lov_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 | 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 (service_ref)>\r
 <!ATTLIST mdc %tag.attr;>\r
-<!ELEMENT lov (osc_id | obd_id | mdc_id)*>\r
+<!ELEMENT lov (osc_ref | obd_ref | mdc_ref)*>\r
 <!ATTLIST lov %tag.attr;>\r
 <!ELEMENT router (misc)*>\r
 <!ATTLIST router %tag.attr;>\r
@@ -44,11 +44,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 +54,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