From 1a7f8b1110cbb9bbe2f17f2e588d0157a95c76f3 Mon Sep 17 00:00:00 2001
From: v-dumas <vincent.dumas@combodo.com>
Date: Fri, 26 Dec 2025 09:49:41 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B08515=20-=20Finalize=20Cloud,=20add=20Set?=
 =?UTF-8?q?up=20sub-option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/installation.xml               | 13 ++++++++++
 .../datamodel.itop-container-mgmt.xml         | 24 +++++++++++--------
 .../module.itop-container-mgmt.php            |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml
index a3e53c2d08..65660323df 100755
--- a/datamodels/2.x/installation.xml
+++ b/datamodels/2.x/installation.xml
@@ -71,6 +71,19 @@
 						<module>itop-virtualization-mgmt</module>
 					</modules>
 					<default>true</default>
+          <sub_options>
+            <options type="array">
+              <choice>
+                <extension_code>itop-container-mgmt</extension_code>
+                <title>Containerization</title>
+                <description><![CDATA[Manage Container Images, Applications and Hosts]]></description>
+                <modules type="array">
+                  <module>itop-container-mgmt</module>
+                </modules>
+                <default>false</default>
+              </choice>
+            </options>
+          </sub_options>
 				</choice>
 			</options>
 		</step>
diff --git a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
index 08d889c5e9..c42d8c9a00 100644
--- a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
+++ b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
@@ -1067,7 +1067,7 @@
       </presentation>
     </class>
     <class id="Cloud" _delta="define">
-      <parent>VirtualDevice</parent>
+      <parent>VirtualHost</parent>
       <properties>
         <category>bizmodel,searchable</category>
         <abstract>false</abstract>
@@ -1203,20 +1203,20 @@
               </items>
               <rank>20</rank>
             </item>
-            <item id="contacts_list">
+            <item id="virtualmachine_list">
               <rank>30</rank>
             </item>
-            <item id="documents_list">
+            <item id="containerhosts_list">
               <rank>40</rank>
             </item>
-            <item id="providercontracts_list">
+            <item id="contacts_list">
               <rank>50</rank>
             </item>
-            <item id="containerhosts_list">
-              <rank>70</rank>
+            <item id="documents_list">
+              <rank>60</rank>
             </item>
-            <item id="logicalvolumes_list">
-              <rank>80</rank>
+            <item id="providercontracts_list">
+              <rank>60</rank>
             </item>
           </items>
         </details>
@@ -1378,10 +1378,14 @@
           <cell id="0">
             <rank>0</rank>
             <dashlets>
-              <dashlet id="container_11" xsi:type="DashletBadge" _delta="define">
-                <rank>11</rank>
+              <dashlet id="container_21" xsi:type="DashletBadge" _delta="define">
+                <rank>21</rank>
                 <class>ContainerType</class>
               </dashlet>
+              <dashlet id="container_22" xsi:type="DashletBadge" _delta="define">
+                <rank>22</rank>
+                <class>ContainerImageType</class>
+              </dashlet>
             </dashlets>
           </cell>
         </cells>
diff --git a/datamodels/2.x/itop-container-mgmt/module.itop-container-mgmt.php b/datamodels/2.x/itop-container-mgmt/module.itop-container-mgmt.php
index 53a54711ed..3457897859 100644
--- a/datamodels/2.x/itop-container-mgmt/module.itop-container-mgmt.php
+++ b/datamodels/2.x/itop-container-mgmt/module.itop-container-mgmt.php
@@ -71,7 +71,7 @@ if (!class_exists('ContainerTypeInstaller'))
 				CMDBObject::SetTrackInfo("Initialization ContainerTypeInstaller");
 				$oMyChange = CMDBObject::GetCurrentChange();
 				$sFileName = dirname(__FILE__)."/data/en_us.data.itop-container-type.xml";
-				SetupLog::Info("Uploading ContainerType objects from file: $sFileName");
+				SetupLog::Info("Uploading Typology values for Containers from file: $sFileName");
 				$oDataLoader->StartSession($oMyChange);
 				$oDataLoader->LoadFile($sFileName, false, true);
 				$oDataLoader->EndSession();