From d6ff709f459b532e1c4cc85bed5402d5a271aa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.systems>
Date: Thu, 29 Nov 2018 10:07:53 +0100
Subject: [PATCH] Fix a bug at XSD files and PoolSQL::exist method (#2651)

---
 share/doc/xsd/acct.xsd    |  1 +
 share/doc/xsd/vm.xsd      |  2 +
 share/doc/xsd/vm_pool.xsd | 97 +++++++++++++++++++++++++++++++++++----
 src/pool/PoolSQL.cc       |  2 +-
 4 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
index 8f45cf13e5..b29ffa16c9 100644
--- a/share/doc/xsd/acct.xsd
+++ b/share/doc/xsd/acct.xsd
@@ -152,6 +152,7 @@
                   <xs:sequence>
                     <xs:element name="ALLOW_ORPHANS" type="xs:string"/>
                     <xs:element name="DISK_ID" type="xs:integer"/>
+                    <xs:element name="NEXT_SNAPSHOT" type="xs:integer"/>
                     <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
                       <xs:complexType>
                         <xs:sequence>
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 541df13df4..ee96e8477b 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -92,6 +92,7 @@
                   <xs:sequence>
                     <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
                     <xs:element name="BRIDGE_TYPE" type="xs:string"/>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
                     <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="VCENTER_NET_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="VCENTER_PORTGROUP_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -199,6 +200,7 @@
             <xs:sequence>
               <xs:element name="ALLOW_ORPHANS" type="xs:string"/>
               <xs:element name="DISK_ID" type="xs:integer"/>
+              <xs:element name="NEXT_SNAPSHOT" type="xs:integer"/>
               <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
diff --git a/share/doc/xsd/vm_pool.xsd b/share/doc/xsd/vm_pool.xsd
index ce73df84ab..9676ec8748 100644
--- a/share/doc/xsd/vm_pool.xsd
+++ b/share/doc/xsd/vm_pool.xsd
@@ -1,12 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified"
-    targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
-    <xs:include schemaLocation="vm.xsd"/>
-    <xs:element name="VM_POOL">
-        <xs:complexType>
-            <xs:sequence maxOccurs="1" minOccurs="1">
-                <xs:element ref="VM" maxOccurs="unbounded" minOccurs="0"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:element name="VM_POOL">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="VM" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="UID" type="xs:integer"/>
+              <xs:element name="GID" type="xs:integer"/>
+              <xs:element name="UNAME" type="xs:string"/>
+              <xs:element name="GNAME" type="xs:string"/>
+              <xs:element name="NAME" type="xs:string"/>
+              <xs:element name="LAST_POLL" type="xs:integer"/>
+              <xs:element name="STATE" type="xs:integer"/>
+              <xs:element name="LCM_STATE" type="xs:integer"/>
+              <xs:element name="RESCHED" type="xs:integer"/>
+              <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="TEMPLATE">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                          <xs:element name="VCENTER_DS_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                          <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="VCENTER_NET_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="VCENTER_PORTGROUP_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="MONITORING" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="USER_TEMPLATE">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="HISTORY_RECORDS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="HISTORY" maxOccurs="unbounded" minOccurs="0">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="OID" type="xs:integer"/>
+                          <xs:element name="SEQ" type="xs:integer"/>
+                          <xs:element name="HOSTNAME" type="xs:string"/>
+                          <xs:element name="HID" type="xs:integer"/>
+                          <xs:element name="CID" type="xs:integer"/>
+                          <xs:element name="DS_ID" type="xs:integer"/>
+                          <xs:element name="ACTION" type="xs:integer"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
             </xs:sequence>
-        </xs:complexType>
-    </xs:element>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>
diff --git a/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc
index f46af50be1..7261615905 100644
--- a/src/pool/PoolSQL.cc
+++ b/src/pool/PoolSQL.cc
@@ -225,7 +225,7 @@ void PoolSQL::exist(const string& id_str, std::set<int>& id_list)
     std::set<int>::iterator iterator;
 
     one_util::split_unique(id_str, ',', id_list);
-    search(existing_items, table.c_str(), "true order by 1 ASC");
+    search(existing_items, table.c_str(), "1 order by 1 ASC");
 
     for (iterator = id_list.begin(); iterator != id_list.end(); ++iterator)
     {