From 5f4ef74d34544083486feb4046bae75de79e4913 Mon Sep 17 00:00:00 2001
From: BenGrenoble <benjamin.planque@combodo.com>
Date: Thu, 9 Feb 2023 10:45:10 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05968=20-=20Add=20structural=20data=20for?=
 =?UTF-8?q?=20Brand,=20OSFamily=20and=20OSVersion=20Move=20data=20to=20con?=
 =?UTF-8?q?fig-mgmt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/en_us.data.itop-brand.xml            |  0
 .../data/en_us.data.itop-osfamily.xml         |  0
 .../data/en_us.data.itop-osversion.xml        |  0
 .../module.itop-config-mgmt.php               |  3 +
 .../data/en_us.data.itop-model.xml            | 83 -------------------
 .../itop-structure/module.itop-structure.php  |  4 -
 6 files changed, 3 insertions(+), 87 deletions(-)
 rename datamodels/2.x/{itop-structure => itop-config-mgmt}/data/en_us.data.itop-brand.xml (100%)
 rename datamodels/2.x/{itop-structure => itop-config-mgmt}/data/en_us.data.itop-osfamily.xml (100%)
 rename datamodels/2.x/{itop-structure => itop-config-mgmt}/data/en_us.data.itop-osversion.xml (100%)
 delete mode 100755 datamodels/2.x/itop-structure/data/en_us.data.itop-model.xml

diff --git a/datamodels/2.x/itop-structure/data/en_us.data.itop-brand.xml b/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-brand.xml
similarity index 100%
rename from datamodels/2.x/itop-structure/data/en_us.data.itop-brand.xml
rename to datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-brand.xml
diff --git a/datamodels/2.x/itop-structure/data/en_us.data.itop-osfamily.xml b/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osfamily.xml
similarity index 100%
rename from datamodels/2.x/itop-structure/data/en_us.data.itop-osfamily.xml
rename to datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osfamily.xml
diff --git a/datamodels/2.x/itop-structure/data/en_us.data.itop-osversion.xml b/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml
similarity index 100%
rename from datamodels/2.x/itop-structure/data/en_us.data.itop-osversion.xml
rename to datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml
diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
index ac74283a0..7f7b8d439 100755
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -26,6 +26,9 @@ SetupWebPage::AddModule(
 			'main.itop-config-mgmt.php',
 		),
 		'data.struct' => array(
+			'./data/en_us.data.itop-brand.xml',
+			'./data/en_us.data.itop-osfamily.xml',
+			'./data/en_us.data.itop-osversion.xml',
 		),
 		'data.sample' => array(
 			'data.sample.brand.xml',
diff --git a/datamodels/2.x/itop-structure/data/en_us.data.itop-model.xml b/datamodels/2.x/itop-structure/data/en_us.data.itop-model.xml
deleted file mode 100755
index ae7ea8152..000000000
--- a/datamodels/2.x/itop-structure/data/en_us.data.itop-model.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Set>
-    <Model alias="Model" id="1">
-        <name>1050</name>
-        <brand_id>6</brand_id>
-        <brand_id_friendlyname>HPE</brand_id_friendlyname>
-        <brand_name>HPE</brand_name>
-        <type>Storage System</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>1050</friendlyname>
-    </Model>
-    <Model alias="Model" id="2">
-        <name>42U NetShelter SX</name>
-        <brand_id>5</brand_id>
-        <brand_id_friendlyname>DELL</brand_id_friendlyname>
-        <brand_name>DELL</brand_name>
-        <type>Rack</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>42U NetShelter SX</friendlyname>
-    </Model>
-    <Model alias="Model" id="3">
-        <name>8851</name>
-        <brand_id>4</brand_id>
-        <brand_id_friendlyname>CISCO</brand_id_friendlyname>
-        <brand_name>CISCO</brand_name>
-        <type>IP Phone</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>8851</friendlyname>
-    </Model>
-    <Model alias="Model" id="4">
-        <name>AP8858EU3</name>
-        <brand_id>5</brand_id>
-        <brand_id_friendlyname>DELL</brand_id_friendlyname>
-        <brand_name>DELL</brand_name>
-        <type>PDU</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>AP8858EU3</friendlyname>
-    </Model>
-    <Model alias="Model" id="5">
-        <name>DL380</name>
-        <brand_id>6</brand_id>
-        <brand_id_friendlyname>HPE</brand_id_friendlyname>
-        <brand_name>HPE</brand_name>
-        <type>Server</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>DL380</friendlyname>
-    </Model>
-    <Model alias="Model" id="6">
-        <name>HP Elitebook 840 G8</name>
-        <brand_id>6</brand_id>
-        <brand_id_friendlyname>HP Inc</brand_id_friendlyname>
-        <brand_name>HP Inc</brand_name>
-        <type>PC</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>HP Elitebook 840 G8</friendlyname>
-    </Model>
-    <Model alias="Model" id="7">
-        <name>HP LaserJet Enterprise 500 MFP M525dn</name>
-        <brand_id>6</brand_id>
-        <brand_id_friendlyname>HP Inc</brand_id_friendlyname>
-        <brand_name>HP Inc</brand_name>
-        <type>Printer</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>HP LaserJet Enterprise 500 MFP M525dn</friendlyname>
-    </Model>
-    <Model alias="Model" id="8">
-        <name>HP Z4 G4</name>
-        <brand_id>6</brand_id>
-        <brand_id_friendlyname>HP Inc</brand_id_friendlyname>
-        <brand_name>HP Inc</brand_name>
-        <type>PC</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>HP Z4 G4</friendlyname>
-    </Model>
-    <Model alias="Model" id="9">
-        <name>R550</name>
-        <brand_id>5</brand_id>
-        <brand_id_friendlyname>DELL</brand_id_friendlyname>
-        <brand_name>DELL</brand_name>
-        <type>Server</type>
-        <finalclass>Model</finalclass>
-        <friendlyname>R550</friendlyname>
-    </Model>
-</Set>
diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index f81f1bf34..4b917bc46 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -25,10 +25,6 @@ SetupWebPage::AddModule(
 			'model.itop-structure.php',
 		),
 		'data.struct' => array(
-			'./data/en_us.data.itop-brand.xml',
-			'./data/en_us.data.itop-model.xml',
-			'./data/en_us.data.itop-osfamily.xml',
-			'./data/en_us.data.itop-osversion.xml',
 		),
 		'data.sample' => array(
 			'data.sample.organizations.xml',