From 9aa6b13250ef2bf28cc81fe5fd0989e27e85ae58 Mon Sep 17 00:00:00 2001
From: behlendo <behlendo>
Date: Mon, 1 Jul 2002 23:45:32 +0000
Subject: [PATCH] -Minor fixes to ensure the DTD is valid.  net-local.xml
 passes validation  with the provided validation tool.

 >xmllint --valid --noout net-local.xml
---
 lustre/tests/net-local.xml |  2 +-
 lustre/utils/lustre.dtd    | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

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