summaryrefslogtreecommitdiffstats
path: root/schemas/rules.xsd
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-02-16 21:24:52 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-02-16 21:24:52 +0000
commitbcadd1b89d852fbc5af48917be9c7e9a318e7306 (patch)
tree66994492665a7e5e497caef5dd0b2bcd414b92c6 /schemas/rules.xsd
parentdc75130cd8355a3a7c72312cf73a0dedc5e2b362 (diff)
downloadbcfg2-bcadd1b89d852fbc5af48917be9c7e9a318e7306.tar.gz
bcfg2-bcadd1b89d852fbc5af48917be9c7e9a318e7306.tar.bz2
bcfg2-bcadd1b89d852fbc5af48917be9c7e9a318e7306.zip
Fix rules validation (Resolves Ticket #404)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2830 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'schemas/rules.xsd')
-rw-r--r--schemas/rules.xsd36
1 files changed, 27 insertions, 9 deletions
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 81859613b..5c0bca4b0 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -9,21 +9,39 @@
</xsd:annotation>
<xsd:include schemaLocation="types.xsd"/>
-
- <xsd:complexType name='ServiceType'>
- <xsd:attribute type='xsd:string' name='name'/>
- <xsd:attribute type='StatusEnum' name='status'/>
- <xsd:attribute type='xsd:string' name='reload'/>
- <xsd:attribute type='xsd:string' name='type'/>
- <xsd:attribute type='xsd:string' name='protocol'/>
- <xsd:attribute type='xsd:string' name='port'/>
- </xsd:complexType>
<xsd:complexType name='PackageType'>
<xsd:attribute type='xsd:string' name='name'/>
<xsd:attribute type='xsd:string' name='version'/>
+ <xsd:attribute type='xsd:string' name='file'/>
+ <xsd:attribute type='xsd:string' name='verify'/>
+ <xsd:attribute type='xsd:string' name='simplefile'/>
+ <xsd:attribute type='xsd:string' name='reloc'/>
+ <xsd:attribute type='xsd:string' name='multiarch'/>
+ <xsd:attribute type='xsd:string' name='srcs'/>
+ <xsd:attribute type='xsd:string' name='type'/>
+ <xsd:attribute type='xsd:string' name='bname'/>
</xsd:complexType>
+ <xsd:complexType name='ServiceType'>
+ <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+ <xsd:element name='User'>
+ <xsd:complexType>
+ <xsd:attribute name='address' type='xsd:string' use='required'/>
+ <xsd:attribute name='mask' type='xsd:string' use='required'/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ <xsd:attribute name='name' type='xsd:string' use='required'/>
+ <xsd:attribute name='status' type='xsd:string' use='required'/>
+ <xsd:attribute name='port' type='xsd:string'/>
+ <xsd:attribute name='protocol' type='xsd:string'/>
+ <xsd:attribute name='reload' type='xsd:string'/>
+ <xsd:attribute name='FMRI' type='xsd:string'/>
+ <xsd:attribute name='type' type='xsd:string'/>
+ </xsd:complexType>
+
+
<xsd:complexType name='DirectoryType'>
<xsd:attribute type='xsd:string' name='name' use='required'/>
<xsd:attribute type='xsd:string' name='perms'/>