-Minor fixes to ensure the DTD is valid. net-local.xml passes validation

 with the provided validation tool.

 >xmllint --valid --noout net-local.xml

diff --git a/lustre/tests/net-local.xml b/lustre/tests/net-local.xml
index ed90255..9e4d0c4 100644 (file)
--- a/lustre/tests/net-local.xml
+++ b/lustre/tests/net-local.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE lustre SYSTEM "lustre.dtd">
+<!DOCTYPE lustre SYSTEM "../utils/lustre.dtd">
 
 <lustre>
   <node name="local" uuid="local-UUID">

diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
index 1b44735..72ce628 100644 (file)
--- a/lustre/utils/lustre.dtd
+++ b/lustre/utils/lustre.dtd
@@ -1,21 +1,26 @@
 <!-- Lustre Management DTD -->\r
 \r
 <!-- basic entities -->\r
-<!ENTITY % tag.content '(#PCDATA)'>\r
-<!ENTITY % tag.id '(num) #CDATA #IMPLIED (name, uuid) #CDATA #REQUIRED'>\r
-<!ENTITY % tag.attr '(name, uuid) #CDATA #REQUIRED'>\r
+<!ENTITY % tag.content "(#PCDATA)">\r
+<!ENTITY % tag.id "\r
+  num CDATA #IMPLIED\r
+  name CDATA #REQUIRED\r
+  uuid CDATA #REQUIRED">\r
+<!ENTITY % tag.attr "\r
+  name CDATA #REQUIRED\r
+  uuid CDATA #REQUIRED">\r
 \r
 <!-- main elements -->\r
-<!ELEMENT lustre (node | profile | mountpoint |\r
-                  mds | obd | ost | osc | lov | router)*>\r
+<!ELEMENT lustre (node | profile | mountpoint | ldlm |\r
+                  mds | mdc | obd | ost | osc | lov | router)*>\r
 \r
-<!ELEMENT profile (mountpoint_id, service_id)>\r
+<!ELEMENT profile (service_id | mountpoint_id)*>\r
 <!ATTLIST profile %tag.attr;>\r
-<!ELEMENT mountpoint (path, fileset, mds_id, lov_id)>\r
+<!ELEMENT mountpoint (path | fileset | mds_id | lov_id)*>\r
 <!ATTLIST mountpoint %tag.attr;>\r
 <!ELEMENT node (profile_id)>\r
 <!ATTLIST node %tag.attr;>\r
-<!ELEMENT ldlm>\r
+<!ELEMENT ldlm EMPTY>\r
 <!ATTLIST ldlm %tag.attr;>\r
 \r
 <!ELEMENT obd (fstype | device | autoformat)*>\r
@@ -35,12 +40,13 @@
 <!ATTLIST router %tag.attr;>\r
 \r
 <!-- basic elements -->\r
-<!ELEMENT network %tag.content;>\r
+<!ELEMENT network (server | port)*>\r
 <!ATTLIST network type (tcp | elan | myrinet) 'tcp'>\r
 \r
 <!ELEMENT fstype        %tag.content;>\r
 <!ELEMENT device        %tag.content;>\r
 <!ELEMENT server        %tag.content;>\r
+<!ELEMENT port          %tag.content;>\r
 <!ELEMENT autoformat    %tag.content;>\r
 <!ELEMENT path          %tag.content;>\r
 <!ELEMENT fileset       %tag.content;>\r