From e0cee6b08b3f8a5302cbcb1afbb286d880e87fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 27 Jul 2015 13:29:09 +0200
Subject: [PATCH] Update XSD files

---
 share/doc/xsd/acct.xsd  | 52 ++++++++++++++++++++++++++++-------------
 share/doc/xsd/image.xsd | 20 ++++++++++++++++
 share/doc/xsd/vm.xsd    | 52 ++++++++++++++++++++++++++++-------------
 3 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
index 50c056b9b3..d02fc7ba4d 100644
--- a/share/doc/xsd/acct.xsd
+++ b/share/doc/xsd/acct.xsd
@@ -183,29 +183,49 @@
               <xs:element name="STIME" type="xs:integer"/>
               <xs:element name="ETIME" type="xs:integer"/>
               <xs:element name="DEPLOY_ID" type="xs:string"/>
+              <xs:element name="MONITORING">
+              <!--
+                <xs:complexType>
+                  <xs:all>
+                    <- Percentage of 1 CPU consumed (two fully consumed cpu is 200) ->
+                    <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
 
-              <!-- MEMORY consumption in kilobytes -->
-              <xs:element name="MEMORY" type="xs:integer"/>
+                    <- MEMORY consumption in kilobytes ->
+                    <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
 
-              <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 200) -->
-              <xs:element name="CPU" type="xs:integer"/>
-
-              <!-- NET_TX: Sent bytes to the network -->
-              <xs:element name="NET_TX" type="xs:integer"/>
-
-              <!-- NET_RX: Received bytes from the network -->
-              <xs:element name="NET_RX" type="xs:integer"/>
-
-              <!-- DISK_ACTUAL_SIZE: Real storage usage for the VM (mb) -->
-              <xs:element name="DISK_ACTUAL_SIZE" type="xs:integer"/>
-
-              <!-- DISK_VIRTUAL_SIZE: Virtual storage usage for the VM (mb) -->
-              <xs:element name="DISK_VIRTUAL_SIZE" type="xs:integer"/>
+                    <- NETTX: Sent bytes to the network ->
+                    <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
 
+                    <- NETRX: Received bytes from the network ->
+                    <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+                  </xs:all>
+                </xs:complexType>
+              -->
+              </xs:element>
               <xs:element name="TEMPLATE" type="xs:anyType"/>
               <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
               <xs:element name="HISTORY_RECORDS">
               </xs:element>
+              <xs:element name="SNAPSHOTS" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="DISK_ID" type="xs:integer"/>
+                    <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ACTIVE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="CHILDREN" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="DATE" type="xs:integer"/>
+                          <xs:element name="ID" type="xs:integer"/>
+                          <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="PARENT" type="xs:integer"/>
+                          <xs:element name="SIZE" type="xs:integer"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd
index 72a5eb7bf2..a1696c031c 100644
--- a/share/doc/xsd/image.xsd
+++ b/share/doc/xsd/image.xsd
@@ -48,6 +48,7 @@
         <xs:element name="RUNNING_VMS" type="xs:integer"/>
         <xs:element name="CLONING_OPS" type="xs:integer"/>
         <xs:element name="CLONING_ID" type="xs:integer"/>
+        <xs:element name="TARGET_SNAPSHOT" type="xs:integer"/>
         <xs:element name="DATASTORE_ID" type="xs:integer"/>
         <xs:element name="DATASTORE" type="xs:string"/>
         <xs:element name="VMS">
@@ -65,6 +66,25 @@
               </xs:complexType>
         </xs:element>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="SNAPSHOTS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CHILDREN" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="ACTIVE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="DATE" type="xs:integer"/>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="PARENT" type="xs:integer"/>
+                    <xs:element name="SIZE" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 8428cec9fe..ecc6c13391 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -114,25 +114,25 @@
         <xs:element name="STIME" type="xs:integer"/>
         <xs:element name="ETIME" type="xs:integer"/>
         <xs:element name="DEPLOY_ID" type="xs:string"/>
+        <xs:element name="MONITORING">
+        <!--
+          <xs:complexType>
+            <xs:all>
+              <- Percentage of 1 CPU consumed (two fully consumed cpu is 200) ->
+              <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
 
-        <!-- MEMORY consumption in kilobytes -->
-        <xs:element name="MEMORY" type="xs:integer"/>
+              <- MEMORY consumption in kilobytes ->
+              <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
 
-        <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 200) -->
-        <xs:element name="CPU" type="xs:integer"/>
-
-        <!-- NET_TX: Sent bytes to the network -->
-        <xs:element name="NET_TX" type="xs:integer"/>
-
-        <!-- NET_RX: Received bytes from the network -->
-        <xs:element name="NET_RX" type="xs:integer"/>
-
-        <!-- DISK_ACTUAL_SIZE: Real storage usage for the VM (mb) -->
-        <xs:element name="DISK_ACTUAL_SIZE" type="xs:integer"/>
-
-        <!-- DISK_VIRTUAL_SIZE: Virtual storage usage for the VM (mb) -->
-        <xs:element name="DISK_VIRTUAL_SIZE" type="xs:integer"/>
+              <- NETTX: Sent bytes to the network ->
+              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
 
+              <- NETRX: Received bytes from the network ->
+              <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+            </xs:all>
+          </xs:complexType>
+        -->
+        </xs:element>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
         <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
         <xs:element name="HISTORY_RECORDS">
@@ -203,6 +203,26 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="SNAPSHOTS" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="DISK_ID" type="xs:integer"/>
+              <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ACTIVE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="CHILDREN" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="DATE" type="xs:integer"/>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="PARENT" type="xs:integer"/>
+                    <xs:element name="SIZE" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>