From dc356ae7b6d44d6a1260d2643a91a6b719927792 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 23 Apr 2015 17:12:07 +0000
Subject: [PATCH] XML Modelization of the relations: XML definition moved so as
 to allow a minimal installation (no virtualization)

SVN:trunk[3557]
---
 .../itop-config-mgmt/datamodel.itop-config-mgmt.xml  | 10 ----------
 .../datamodel.itop-virtualization-mgmt.xml           | 12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 4c0d9369aa..2a5efc46e9 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -2758,16 +2758,6 @@
           <code><![CDATA[	public static function GetRelationQueries($sRelCode){return parent::GetRelationQueries($sRelCode);} ]]></code>
         </method>
       </methods>
-      <relations>
-        <relation id="impacts">
-          <neighbours>
-            <neighbour id="hypervisor">
-              <query_down>SELECT Hypervisor AS o WHERE o.server_id = :this-&gt;id</query_down>
-              <query_up>SELECT Server AS o WHERE o.id = :this-&gt;server_id</query_up>
-            </neighbour>
-          </neighbours>
-        </relation>
-      </relations>
     </class>
     <class id="ApplicationSolution" _delta="define">
       <parent>FunctionalCI</parent>
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index 44f2377089..e3c9160fac 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -901,6 +901,18 @@
         </list>
       </presentation>
     </class>
+    <class id="Server" _delta="merge">
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="hypervisor">
+              <query_down>SELECT Hypervisor AS o WHERE o.server_id = :this-&gt;id</query_down>
+              <query_up>SELECT Server AS o WHERE o.id = :this-&gt;server_id</query_up>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
   </classes>
   <menus>
     <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">