From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Mon, 13 Apr 2015 06:22:55 +0000 (+0200)
Subject: Update DTD and XSD documents
X-Git-Tag: 11.1.5~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e019d978aff25b9b30a86863625120dd32148a47;p=sysstat

Update DTD and XSD documents

Update DTD and XSD documents to take into account FC/HBA XML data.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---

diff --git a/sadf.h b/sadf.h
index e0eb95b..a90d768 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.0"
+#define XML_DTD_VERSION	"3.1"
 
 /* Possible actions for functions used to display reports */
 #define F_BEGIN	0x01
diff --git a/xml/sysstat-3.0.dtd b/xml/sysstat-3.0.dtd
index d5e901f..743c6ac 100644
--- a/xml/sysstat-3.0.dtd
+++ b/xml/sysstat-3.0.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.0 for sysstat. See sadf.h -->
+<!--DTD v3.1 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -254,7 +254,7 @@
 	util-percent CDATA #REQUIRED
 >
 
-<!ELEMENT network (net-dev+, net-edev+, net-nfs, net-nfsd, net-sock, net-ip, net-eip, net-icmp, net-eicmp, net-tcp, net-etcp, net-udp, net-sock6, net-ip6, net-eip6, net-icmp6, net-eicmp6, net-udp6)>
+<!ELEMENT network (net-dev*, net-edev*, net-nfs?, net-nfsd?, net-sock?, net-ip?, net-eip?, net-icmp?, net-eicmp?, net-tcp?, net-etcp?, net-udp?, net-sock6?, net-ip6?, net-eip6?, net-icmp6?, net-eicmp6?, net-udp6?, fchost*)>
 <!ATTLIST network
 	per CDATA #REQUIRED
 >
@@ -485,6 +485,15 @@
 	idgmer6 CDATA #REQUIRED
 >
 
+<!ELEMENT fchost EMPTY>
+<!ATTLIST fchost
+	name CDATA #REQUIRED
+	fch_rxf CDATA #REQUIRED
+	fch_txf CDATA #REQUIRED
+	fch_rxw CDATA #REQUIRED
+	fch_txw CDATA #REQUIRED
+>
+
 <!ELEMENT power-management (cpu-frequency?, fan-speed?, temperature?, voltage-input?, cpu-weighted-frequency?, usb-devices?)>
 
 <!ELEMENT cpu-frequency (cpufreq+)>
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 331c1c1..eaf486c 100644
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat" targetNamespace="http://pagesperso-orange.fr/sebastien.godard/sysstat" elementFormDefault="qualified">
 <xs:annotation>
-	<xs:appinfo>-- XML Schema v3.0 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.1 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -370,6 +370,7 @@
 		<xs:element name="net-icmp6" type="net-icmp6-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="net-eicmp6" type="net-eicmp6-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="net-udp6" type="net-udp6-type" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="fchost" type="fchost-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
 	</xs:sequence>
 	<xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>
@@ -600,6 +601,15 @@
 	<xs:attribute name="idgmer6" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
+<xs:element name="fchost" type="fchost-type"></xs:element>
+<xs:complexType name="fchost-type">
+	<xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+	<xs:attribute name="fch_rxf" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="fch_txf" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="fch_rxw" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="fch_txw" type="hundredth-type" use="required"></xs:attribute>
+</xs:complexType>
+
 <xs:element name="power-management" type="power-management-type"></xs:element>
 <xs:complexType name="power-management-type">
 	<xs:sequence>