Barebones XML support added to obdctl via the --xml option. Validation of

the XML should be performed against the lustre.dtd (but isn't yet).  Also
of note we now need the libxml2 library to be installed.

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 4b64b74..270e7a8 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -5,7 +5,7 @@ CFLAGS:=-g -I. -I/usr/include/glib-1.2 -I$(PORTALS)/include \
 -I/usr/lib/glib/include -I$(srcdir)/../include -Wall
 KFLAGS:=
 CPPFLAGS :=
-LDADD := -lreadline -ltermcap # -lefence
+LDADD := -lreadline -ltermcap -lxml2 # -lefence
 bin_PROGRAMS = obdctl
 obdctl_SOURCES = parser.c obdctl.c
 

diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
new file mode 100644 (file)
index 0000000..ba4af32
--- /dev/null
+++ b/lustre/utils/lustre.dtd
@@ -0,0 +1,71 @@
+<!-- Lustre Management DTD -->\r
+\r
+<!-- basic entities -->\r
+<!ENTITY % basic.content '#PCDATA'>\r
+<!ENTITY % id.content 'num | id | uuid'>\r
+\r
+<!-- main elements -->\r
+<!ELEMENT lustre (node | profile | mountpoint |\r
+                  mds | obd | ost | osc | lov | router)*>\r
+\r
+<!ELEMENT profile (mountpoint_id, service_id)>\r
+<!ATTLIST profile id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT mountpoint (mntpt, fileset, mds_id, lov_id)>\r
+<!ATTLIST mountpoint id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT node (profile_id)>\r
+<!ATTLIST node id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT mds (fstype | device | server_id | failover_id)*>\r
+<!ATTLIST mds id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT obd (fstype | device | autoformat)*>\r
+<!ATTLIST obd id #CDATA #REQUIRED uuid #CDATA #REQUIRED\r
+                type (obdfilter | obdext2 | obdecho) 'obdfilter'>\r
+\r
+<!ELEMENT ost (server_id | failover_id)*>\r
+<!ATTLIST ost id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+        \r
+<!ELEMENT osc (network)*>\r
+<!ATTLIST osc id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT lov (osc_id | obd_id | mdc_id)*>\r
+<!ATTLIST lov id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!ELEMENT router (misc)*>\r
+<!ATTLIST router id #CDATA #REQUIRED uuid #CDATA #REQUIRED>\r
+\r
+<!-- basic elements -->\r
+<!ELEMENT network (%basic.content;)*>\r
+<!ATTLIST network type (ip | elan | myrinet) 'ip'\r
+                  address #CDATA 'localhost'>\r
+\r
+<!ELEMENT fstype        (%basic.content;)*>\r
+<!ELEMENT device        (%basic.content;)*>\r
+<!ELEMENT server        (%basic.content;)*>\r
+<!ELEMENT autoformat    (%basic.content;)*>\r
+<!ELEMENT mntpt         (%basic.content;)*>\r
+<!ELEMENT fileset       (%basic.content;)*>\r
+\r
+<!ELEMENT profile_id    (%basic.content;)*>\r
+<!ATTLIST profile_id    (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT mds_id        (%basic.content;)*>\r
+<!ATTLIST mds_id        (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT obd_id        (%basic.content;)*>\r
+<!ATTLIST obd_id        (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT osc_id        (%basic.content;)*>\r
+<!ATTLIST osc_id        (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT lov_id        (%basic.content;)*>\r
+<!ATTLIST lov_id        (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT mdc_id        (%basic.content;)*>\r
+<!ATTLIST mdc_id        (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT mountpoint_id (%basic.content;)*>\r
+<!ATTLIST mountpoint_id (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT service_id    (%basic.content;)*>\r
+<!ATTLIST service_id    (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT server_id     (%basic.content;)*>\r
+<!ATTLIST server_id     (%id.content;)* #CDATA #IMPLIED>\r
+<!ELEMENT failover_id   (%basic.content;)*>\r
+<!ATTLIST failover_id   (%id.content;)* #CDATA #IMPLIED>\r
+\r