From e32c1a4447a7bc2deca7aed08f525cc5f2dfded2 Mon Sep 17 00:00:00 2001
From: Vincent Dumas <vincent.dumas@combodo.com>
Date: Thu, 21 Sep 2017 13:52:01 +0000
Subject: [PATCH] Standard DataModel: Add org_id and location_id to 'Rack'
 reconciliation keys. Mandatory for CSV import of CI on a Rack, when Rack name
 is not a unique identifier.

SVN:trunk[4929]
---
 .../2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml       | 2 ++
 .../itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml   | 4 ++++
 2 files changed, 6 insertions(+)

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 b30f9bfb2..c0f7e9c00 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
@@ -1663,6 +1663,8 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="location_id"/>
+            <attribute id="location_name"/>
             <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index d8e20468a..eb20acff9 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -20,6 +20,10 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="location_id"/>
+            <attribute id="location_name"/>
           </attributes>
         </reconciliation>
       </properties>