summaryrefslogtreecommitdiffstats
path: root/schemas
diff options
context:
space:
mode:
Diffstat (limited to 'schemas')
-rw-r--r--schemas/base.xsd8
-rw-r--r--schemas/bundle.xsd4
-rw-r--r--schemas/clients.xsd26
-rw-r--r--schemas/metadata.xsd63
-rw-r--r--schemas/pkglist.xsd13
-rw-r--r--schemas/services.xsd7
-rw-r--r--schemas/translation.xsd2
7 files changed, 61 insertions, 62 deletions
diff --git a/schemas/base.xsd b/schemas/base.xsd
index 14009cf4e..61e065ecc 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -4,7 +4,7 @@
<xsd:documentation>
base schema for bcfg2
Narayan Desai, Argonne National Laboratory
- $Id: $
+ $Id$
</xsd:documentation>
</xsd:annotation>
@@ -18,8 +18,7 @@
<xsd:element name='SymLink' type='SymLinkType'/>
<xsd:element name='Directory' type='DirectoryType'/>
<xsd:element name='Permissions' type='PermissionType'/>
- <xsd:element name='Class' type='ContainerType'/>
- <xsd:element name='Image' type='ContainerType'/>
+ <xsd:element name='Group' type='ContainerType'/>
</xsd:choice>
<xsd:attribute name='name' type='xsd:string'/>
</xsd:complexType>
@@ -27,8 +26,7 @@
<xsd:element name='Base'>
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element name='Image' type='ContainerType'/>
- <xsd:element name='Class' type='ContainerType'/>
+ <xsd:element name='Group' type='ContainerType'/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 22e8336ba..391a5a27e 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -25,8 +25,7 @@
<xsd:element name='Bundle'>
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element type='GroupType' name='System'/>
- <xsd:element type='GroupType' name='Attribute'/>
+ <xsd:element type='GroupType' name='Group'/>
<xsd:element name='Package' type='PackageType'/>
<xsd:element name='Service' type='ServiceType'/>
<xsd:element name='ConfigFile' type='ConfigFileType'/>
@@ -34,6 +33,7 @@
<xsd:element name='SymLink' type='SymLinkType'/>
<xsd:element name='Permission' type='PermissionType'/>
<xsd:element name='PostInstall' type='PostInstallType'/>
+ <xsd:element name='Group' type='GroupType'/>
</xsd:choice>
<xsd:attribute type='xsd:string' name='name'/>
<xsd:attribute type='xsd:string' name='version'/>
diff --git a/schemas/clients.xsd b/schemas/clients.xsd
new file mode 100644
index 000000000..f1a3ec27e
--- /dev/null
+++ b/schemas/clients.xsd
@@ -0,0 +1,26 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xsd:annotation>
+ <xsd:documentation>
+ client schema for bcfg2
+ Narayan Desai, Argonne National Laboratory
+ $Id$
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:complexType name='ClientType'>
+ <xsd:attribute type='xsd:string' name='name' use='required'/>
+ <xsd:attribute type='xsd:string' name='profile' use='required'/>
+ <xsd:attribute type='xsd:string' name='pingable' use='required'/>
+ <xsd:attribute type='xsd:string' name='pingtime' use='required'/>
+ </xsd:complexType>
+
+ <xsd:element name='Clients'>
+ <xsd:complexType>
+ <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+ <xsd:element name='Client' type='ClientType'/>
+ </xsd:choice>
+ <xsd:attribute name='version' type='xsd:string'/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema> \ No newline at end of file
diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 3636bb2b8..d200694cc 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -4,69 +4,44 @@
<xsd:documentation>
metadata schema for bcfg2
Narayan Desai, Argonne National Laboratory
- $Id: $
+ $Id$
</xsd:documentation>
</xsd:annotation>
- <xsd:complexType name='ClientType'>
- <xsd:attribute type='xsd:string' name='name' use='required'/>
- <xsd:attribute type='xsd:string' name='image' use='required'/>
- <xsd:attribute type='xsd:string' name='profile' use='required'/>
- </xsd:complexType>
+ <xsd:simpleType name='toolsetType'>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="rh|debian|solaris"/>
+ </xsd:restriction>
+ </xsd:simpleType>
- <xsd:complexType name='ProfileType'>
- <xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element name='Class'>
- <xsd:complexType>
- <xsd:attribute type='xsd:string' name='name' use='required'/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name='Attribute'>
- <xsd:complexType>
- <xsd:attribute name='name' type='xsd:string' use='required'/>
- <xsd:attribute name='scope' type='xsd:string' use='required'/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- <xsd:attribute type='xsd:string' name='name' use='required'/>
- <xsd:attribute type='xsd:string' name='public' use='required'/>
- </xsd:complexType>
+ <xsd:simpleType name='booleanType'>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="true|false"/>
+ </xsd:restriction>
+ </xsd:simpleType>
- <xsd:complexType name='ClassType'>
+ <xsd:complexType name='groupType'>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
<xsd:element name='Bundle'>
<xsd:complexType>
<xsd:attribute type='xsd:string' name='name' use='required'/>
</xsd:complexType>
</xsd:element>
+ <xsd:element name='Group' type='groupType'/>
</xsd:choice>
+ <xsd:attribute type='booleanType' name='profile' use='optional'/>
+ <xsd:attribute type='booleanType' name='public' use='optional'/>
<xsd:attribute type='xsd:string' name='name' use='required'/>
- </xsd:complexType>
-
- <xsd:simpleType name='ToolSetType'>
- <xsd:restriction base="xsd:string">
- <xsd:pattern value="rh|debian|solaris"/>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name='ImageType'>
- <xsd:attribute type='xsd:string' name='name' use='required'/>
- <xsd:attribute type='ToolSetType' name='toolset' use='required'/>
+ <xsd:attribute type='toolsetType' name='toolset' use='optional'/>
+ <xsd:attribute type='xsd:string' name='category' use='optional'/>
</xsd:complexType>
-
- <xsd:element name='Metadata'>
+ <xsd:element name='Groups'>
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element name='Client' type='ClientType'/>
- <xsd:element name='Class' type='ClassType'/>
- <xsd:element name='Profile' type='ProfileType'/>
- <xsd:element name='Image' type='ImageType'/>
+ <xsd:element name='Group' type='groupType'/>
</xsd:choice>
<xsd:attribute name='version' type='xsd:string'/>
- <xsd:attribute type='xsd:string' name='default_image' use='required'/>
- <xsd:attribute type='xsd:string' name='default_profile' use='required'/>
</xsd:complexType>
</xsd:element>
-
</xsd:schema>
diff --git a/schemas/pkglist.xsd b/schemas/pkglist.xsd
index 31fa9959d..d262963ee 100644
--- a/schemas/pkglist.xsd
+++ b/schemas/pkglist.xsd
@@ -4,7 +4,7 @@
<xsd:documentation>
package list schema for bcfg2
Narayan Desai, Argonne National Laboratory
- $Id: $
+ $Id$
</xsd:documentation>
</xsd:annotation>
@@ -16,20 +16,21 @@
<xsd:attribute type='xsd:string' name='simplefile'/>
</xsd:complexType>
- <xsd:complexType name='LocationType'>
+ <xsd:complexType name='GroupType'>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
<xsd:element name='Package' type='PackageType'/>
</xsd:choice>
- <xsd:attribute type='xsd:string' name='uri' use='required'/>
- <xsd:attribute type='xsd:string' name='type' use='required'/>
+ <xsd:attribute type='xsd:string' name='name' use='required'/>
</xsd:complexType>
<xsd:element name='PackageList'>
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element name='Location' type='LocationType'/>
+ <xsd:element name='Group' type='GroupType'/>
</xsd:choice>
- <xsd:attribute name='image' type='xsd:string' use='required'/>
+ <xsd:attribute name='priority' type='xsd:integer' use='required'/>
+ <xsd:attribute name='type' type='xsd:string' use='required'/>
+ <xsd:attribute name='uri' type='xsd:string' use='optional'/>
</xsd:complexType>
</xsd:element>
diff --git a/schemas/services.xsd b/schemas/services.xsd
index 012bb2876..286c925aa 100644
--- a/schemas/services.xsd
+++ b/schemas/services.xsd
@@ -4,7 +4,7 @@
<xsd:documentation>
services schema for bcfg2
Narayan Desai, Argonne National Laboratory
- $Id: $
+ $Id$
</xsd:documentation>
</xsd:annotation>
@@ -35,11 +35,10 @@
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
<xsd:element name='Service' type='ServiceType'/>
- <xsd:element name='Class' type='ContainerType'/>
- <xsd:element name='Image' type='ContainerType'/>
+ <xsd:element name='Group' type='ContainerType'/>
<xsd:element name='Host' type='ContainerType'/>
- <xsd:element name='Global' type='ContainerType'/>
</xsd:choice>
+ <xsd:attribute name='priority' type='xsd:integer'/>
</xsd:complexType>
</xsd:element>
diff --git a/schemas/translation.xsd b/schemas/translation.xsd
index cdf117a8a..9a58ab640 100644
--- a/schemas/translation.xsd
+++ b/schemas/translation.xsd
@@ -4,7 +4,7 @@
<xsd:documentation>
translation image info schema for bcfg2
Narayan Desai, Argonne National Laboratory
- $Id: $
+ $Id$
</xsd:documentation>
</xsd:annotation>