From 2f2396a24d5771f49a186494df661034dd87d473 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Sun, 22 Mar 2009 17:06:25 +0000
Subject: Packages: Implement schema verification

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5137 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/packages.xsd         | 32 ++++++++++++++++++++++++++++++++
 src/sbin/bcfg2-repo-validate |  5 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 schemas/packages.xsd

diff --git a/schemas/packages.xsd b/schemas/packages.xsd
new file mode 100644
index 000000000..843e5ee68
--- /dev/null
+++ b/schemas/packages.xsd
@@ -0,0 +1,32 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+  
+  <xsd:annotation>
+    <xsd:documentation>
+      bundle schema for bcfg2
+      Narayan Desai, Argonne National Laboratory
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:complexType name='SourceType'>
+    <xsd:sequence>
+      <xsd:element name="Group" type="xsd:string" minOccurs='1' 
+                   maxOccurs='unbounded'/>
+      <xsd:element name="URL" type="xsd:string" minOccurs='1' 
+                   maxOccurs='unbounded'/>
+      <xsd:element name="Version" type="xsd:string"/>
+      <xsd:element name="Component" type="xsd:string" minOccurs='1'
+                   maxOccurs='unbounded'/>    
+      <xsd:element name="Arch" type="xsd:string"  minOccurs='1'
+                   maxOccurs='unbounded'/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name='Sources'>
+    <xsd:complexType>
+      <xsd:choice minOccurs='1' maxOccurs='unbounded'>
+        <xsd:element name='APTSource' type='SourceType'/>
+        <xsd:element name='YUMSource' type='SourceType'/>
+      </xsd:choice>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index e65e7aa78..e04cf6c3c 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -78,6 +78,7 @@ if __name__ == '__main__':
     services_list = glob.glob("%s/Svcmgr/*.xml" % repo)
     deps_list = glob.glob("%s/Deps/*.xml" % repo)
     dec_list = glob.glob("%s/Decisions/*" % repo)
+    pkgcfg_list = glob.glob("%s/Packages/config.xml" % repo)
 
     filesets = {'metadata':(metadata_list, "%s/metadata.xsd"),
                 'clients':(clients_list, "%s/clients.xsd"),
@@ -89,7 +90,9 @@ if __name__ == '__main__':
                 'imageinfo':(imageinfo_list, "%s/report-configuration.xsd"),
                 'services':(services_list, "%s/services.xsd"),
                 'deps':(deps_list, "%s/deps.xsd"),
-                'decisions': (dec_list, "%s/decisions.xsd")}
+                'decisions': (dec_list, "%s/decisions.xsd"),
+                'packages': (pkgcfg_list, "%s/packages.xsd"), 
+                }
 
     failures  = 0
     for k, (filelist, schemaname) in filesets.iteritems():
-- 
cgit v1.2.3-1-g7c22