Integration of Provider Manifest for use by SLA Description

compatibleone · Sep 23, 2012 · 38d98c2 · 38d98c2
1 parent 38787bf
commit 38d98c2
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 59 deletions.
diff --git a/provision.xsd b/provision.xsd
@@ -10,7 +10,7 @@
 
 	<xsd:include schemaLocation="http://www.compatibleone.fr/schemes/quotatypes.xsd"/>
 
-	<xsd:element name="provider" type="cords_provider"/>
+	<xsd:element name="provider" type="cordsProvider"/>
 
 </xsd:schema>
 

diff --git a/quotatypes.xsd b/quotatypes.xsd
@@ -1,64 +1,71 @@
-
 <xsd:schema xmlns:xsd="http://www.w3c.org/2001/XMLSchema">
 
-<xsd:complexType name="cords_operator">
-	<xsd:attribute name="id" type="xsd:string"/>
-	<xsd:attribute name="name" type="xsd:string"/>
-	<xsd:attribute name="description" type="xsd:string"/>
-	<xsd:attribute name="account" type="xsd:string"/>
-	<xsd:attribute name="security" type="xsd:string"/>
-	<xsd:attribute name="pricelist" type="xsd:string"/>
-	<xsd:attribute name="state" type="xsd:integer"/>
-</xsd:complexType>
+	<xsd:annotation>
+		<xsd:documentation xml:lang="en">
+			Compatible One Resource and Request Description Schema Version 2.12
+			Provisionary Version 24th September
+			Provider Quota Description Types for SLA manager
+		</xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:complexType name="cordsOperator">
+		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attribute name="name" type="xsd:string"/>
+		<xsd:attribute name="description" type="xsd:string"/>
+		<xsd:attribute name="account" type="xsd:string"/>
+		<xsd:attribute name="security" type="xsd:string"/>
+		<xsd:attribute name="pricelist" type="xsd:string"/>
+		<xsd:attribute name="state" type="xsd:integer"/>
+	</xsd:complexType>
 
-<xsd:complexType name="cords_price">
-	<xsd:attribute name="id" type="xsd:string"/>
-	<xsd:attribute name="name" type="xsd:string"/>
-	<xsd:attribute name="operator" type="xsd:string"/>
-	<xsd:attribute name="description" type="xsd:string"/>
-	<xsd:attribute name="currency" type="xsd:string"/>
-	<xsd:attribute name="fixed" type="xsd:string"/>
-	<xsd:attribute name="rate" type="xsd:string"/>
-	<xsd:attribute name="units" type="xsd:string"/>
-	<xsd:attribute name="period" type="xsd:string"/>
-	<xsd:attribute name="state" type="xsd:integer"/>
-</xsd:complexType>
+	<xsd:complexType name="cordsPrice">
+		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attribute name="name" type="xsd:string"/>
+		<xsd:attribute name="operator" type="xsd:string"/>
+		<xsd:attribute name="description" type="xsd:string"/>
+		<xsd:attribute name="currency" type="xsd:string"/>
+		<xsd:attribute name="fixed" type="xsd:string"/>
+		<xsd:attribute name="rate" type="xsd:string"/>
+		<xsd:attribute name="units" type="xsd:string"/>
+		<xsd:attribute name="period" type="xsd:string"/>
+		<xsd:attribute name="state" type="xsd:integer"/>
+	</xsd:complexType>
 
-<xsd:complexType name="cords_quota">
-	<xsd:sequence>
-		<xsd:element name="price" type="cords_price" minOccurs='1' maxOccurs='1'/>
-	</xsd:sequence>
-	<xsd:attribute name="id" type="xsd:string"/>
-	<xsd:attribute name="name" type="xsd:string"/>
-	<xsd:attribute name="description" type="xsd:string"/>
-	<xsd:attribute name="operator" type="xsd:string"/>
-	<xsd:attribute name="price" type="xsd:string"/>
-	<xsd:attribute name="zone" type="xsd:string"/>
-	<xsd:attribute name="opinion" type="xsd:string"/>
-	<xsd:attribute name="ceiling" type="xsd:integer"/>
-	<xsd:attribute name="offered" type="xsd:integer"/>
-	<xsd:attribute name="reserved" type="xsd:integer"/>
-	<xsd:attribute name="consumed" type="xsd:integer"/>
-	<xsd:attribute name="state" type="xsd:integer"/>
-</xsd:complexType>
+	<xsd:complexType name="cordsQuota">
+		<xsd:sequence>
+			<xsd:element name="price" type="cordsPrice" minOccurs='1' maxOccurs='1'/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attribute name="name" type="xsd:string"/>
+		<xsd:attribute name="description" type="xsd:string"/>
+		<xsd:attribute name="operator" type="xsd:string"/>
+		<xsd:attribute name="price" type="xsd:string"/>
+		<xsd:attribute name="zone" type="xsd:string"/>
+		<xsd:attribute name="opinion" type="xsd:string"/>
+		<xsd:attribute name="ceiling" type="xsd:integer"/>
+		<xsd:attribute name="offered" type="xsd:integer"/>
+		<xsd:attribute name="reserved" type="xsd:integer"/>
+		<xsd:attribute name="consumed" type="xsd:integer"/>
+		<xsd:attribute name="state" type="xsd:integer"/>
+	</xsd:complexType>
 
-<xsd:complexType name="cords_provider">
-	<xsd:sequence>
-		<xsd:element name="quota" type="cords_quota" minOccurs='1' maxOccurs='unbounded'/>
-	</xsd:sequence>
-	<xsd:attribute name="id" type="xsd:string"/>
-	<xsd:attribute name="name" type="xsd:string"/>
-	<xsd:attribute name="identity" type="xsd:string"/>
-	<xsd:attribute name="category" type="xsd:string"/>
-	<xsd:attribute name="profile" type="xsd:string"/>
-	<xsd:attribute name="operator" type="xsd:string"/>
-	<xsd:attribute name="price" type="xsd:string"/>
-	<xsd:attribute name="zone" type="xsd:string"/>
-	<xsd:attribute name="opinion" type="xsd:string"/>
-	<xsd:attribute name="security" type="xsd:string"/>
-	<xsd:attribute name="quotas" type="xsd:integer"/>
-	<xsd:attribute name="state" type="xsd:integer"/>
-</xsd:complexType>
+	<xsd:complexType name="cordsProvider">
+		<xsd:sequence>
+			<xsd:element name="quota" type="cordsQuota" minOccurs='1' maxOccurs='unbounded'/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attribute name="name" type="xsd:string"/>
+		<xsd:attribute name="identity" type="xsd:string"/>
+		<xsd:attribute name="category" type="xsd:string"/>
+		<xsd:attribute name="profile" type="xsd:string"/>
+		<xsd:attribute name="operator" type="xsd:string"/>
+		<xsd:attribute name="price" type="xsd:string"/>
+		<xsd:attribute name="zone" type="xsd:string"/>
+		<xsd:attribute name="opinion" type="xsd:string"/>
+		<xsd:attribute name="security" type="xsd:string"/>
+		<xsd:attribute name="quotas" type="xsd:integer"/>
+		<xsd:attribute name="state" type="xsd:integer"/>
+	</xsd:complexType>
 
 </xsd:schema>
 

diff --git a/slam.xsd b/slam.xsd
@@ -3,13 +3,14 @@
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			Compatible One Service Level Agreement Description Schema Version 2.08
-			Provisionary Version 24th May 2012
+			Compatible One Service Level Agreement Description Schema Version 2.12
+			Provisionary Version 21st Sept 2012
 			Enforced by the ACCORDS Parser
 		</xsd:documentation>
 	</xsd:annotation>
 
 	<xsd:include schemaLocation="http://www.compatibleone.fr/schemes/cordstypes.xsd"/>
+	<xsd:include schemaLocation="http://www.compatibleone.fr/schemes/quotatypes.xsd"/>
 
 	<xsd:element name="agreement" type="cordsAgreement"/>
 
@@ -47,6 +48,7 @@
 	<xsd:complexType name="cordsTerm">
 		<xsd:choice>
 			<xsd:element name="manifest" type="cordsManifest" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="provider" type="cordsProvider" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="guarantee" type="cordsGuarantee" minOccurs="0" maxOccurs="unbounded"/>
 			<xsd:element name="variable" type="cordsVariable" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:choice>