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 b3f3813905..0932a15689 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 @@ -109,6 +109,16 @@ 0 0 + + lnkGroupToCI + ci_id + group_id + 0 + 0 + false + SELECT Group WHERE status != 'obsolete' + property +
@@ -386,6 +396,10 @@ model_id name + + model_id + end_of_support + asset_number @@ -907,6 +921,9 @@ 220 + + 230 +
@@ -1056,6 +1073,10 @@ iosversion_id name + + iosversion_id + end_of_support + ram @@ -1143,6 +1164,12 @@ 30 + + 40 + + + 50 + @@ -1165,6 +1192,9 @@ 10 + + 20 + @@ -1385,6 +1415,10 @@ osversion_id name + + osversion_id + end_of_support + osversion_id]]> @@ -1532,6 +1566,12 @@ 30 + + 40 + + + 50 + @@ -1554,6 +1594,9 @@ 10 + + 20 + @@ -1794,9 +1837,12 @@ 10 - @@ -1987,9 +2033,12 @@ 10 - @@ -2114,6 +2163,10 @@ software_id name + + software_id + end_of_support + software_id]]> @@ -2377,6 +2430,9 @@ 10 + + 20 + 10 @@ -2385,6 +2441,9 @@ 10 + + 20 + 20 @@ -2561,6 +2620,9 @@ 10 + + 20 + 10 @@ -2569,6 +2631,9 @@ 10 + + 20 + 20 @@ -2745,6 +2810,9 @@ 10 + + 20 + 10 @@ -2753,6 +2821,9 @@ 10 + + 20 + 20 @@ -2921,6 +2992,9 @@ 10 + + 20 + 10 @@ -2929,6 +3003,9 @@ 10 + + 20 + 20 @@ -3084,6 +3161,9 @@ 10 + + 20 + 10 @@ -3092,6 +3172,9 @@ 10 + + 20 + 20 @@ -3266,9 +3349,12 @@ 10 - @@ -3436,6 +3522,9 @@ 10 + + 20 + 20 @@ -3622,9 +3711,12 @@ 10 - @@ -3800,6 +3892,11 @@ 128 true + + end_of_support + + true + SoftwareInstance software_id @@ -3855,13 +3952,21 @@ + + + + 10 + + + 10 + - 10 + 20 20 @@ -3891,6 +3996,9 @@ 30 + + 40 + @@ -3917,6 +4025,9 @@ 20 + + 30 + @@ -5028,6 +5139,11 @@ osfamily_id name + + end_of_support + + true + OSPatch osversion_id @@ -5044,9 +5160,12 @@ 20 - + 30 + + 40 + @@ -5056,7 +5175,7 @@ - + 10 @@ -5064,6 +5183,19 @@ 20 + + 30 + + + + + + + 20 + + + 30 + @@ -5142,9 +5274,6 @@ - - 10 - @@ -5320,6 +5449,11 @@ 512 true + + end_of_support + + true + label @@ -5402,6 +5536,9 @@ 20 + + 25 + 30 @@ -5423,17 +5560,33 @@ - + 10 + + 20 + + + 30 + + + 40 + + + + + 20 30 + + 40 + @@ -5465,6 +5618,9 @@ + + logo + @@ -5568,6 +5724,11 @@ brand_id name + + end_of_support + + true + NetworkDevice iosversion_id @@ -5584,9 +5745,12 @@ 20 - + 30 + + 40 + @@ -5596,7 +5760,7 @@ - + 10 @@ -5604,6 +5768,19 @@ 20 + + 30 + + + + + + + 20 + + + 30 + diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php index d77c8a9f4d..1d27ac577e 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php @@ -103,6 +103,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium', 'Class:FunctionalCI/Attribute:move2production' => 'Move to production date', 'Class:FunctionalCI/Attribute:move2production+' => '', + 'Class:FunctionalCI/Attribute:groups_list' => 'Groups', + 'Class:FunctionalCI/Attribute:groups_list+' => 'Groups can be used as tags, to document environment, projects (migration, upgrade, security), etc…', 'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts', 'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item', 'Class:FunctionalCI/Attribute:documents_list' => 'Documents', @@ -147,6 +149,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:PhysicalDevice/Attribute:brand_name+' => '', 'Class:PhysicalDevice/Attribute:model_id' => 'Model', 'Class:PhysicalDevice/Attribute:model_id+' => '', + 'Class:PhysicalDevice/Attribute:model_end_of_support' => 'Model end of support', + 'Class:PhysicalDevice/Attribute:model_end_of_support+' => 'When the hardware model is no more supported by the manufacturer, if this information is documented on the Model.', 'Class:PhysicalDevice/Attribute:model_name' => 'Model name', 'Class:PhysicalDevice/Attribute:model_name+' => '', 'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number', @@ -295,6 +299,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:NetworkDevice/Attribute:iosversion_id+' => '', 'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name', 'Class:NetworkDevice/Attribute:iosversion_name+' => '', + 'Class:NetworkDevice/Attribute:ios_end_of_support' => 'IOS end of support', + 'Class:NetworkDevice/Attribute:ios_end_of_support+' => 'The date after which the editor no longer provides fixes for this IOS version.', 'Class:NetworkDevice/Attribute:ram' => 'RAM', 'Class:NetworkDevice/Attribute:ram+' => '', ]); @@ -315,6 +321,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:Server/Attribute:osversion_id+' => '', 'Class:Server/Attribute:osversion_name' => 'OS version name', 'Class:Server/Attribute:osversion_name+' => '', + 'Class:Server/Attribute:os_end_of_support' => 'OS end of support', + 'Class:Server/Attribute:os_end_of_support+' => 'The date after which the editor ceases to provide patches for this OS version.', 'Class:Server/Attribute:oslicence_id' => 'OS license', 'Class:Server/Attribute:oslicence_id+' => '', 'Class:Server/Attribute:oslicence_name' => 'OS license name', @@ -391,6 +399,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:PC/Attribute:osversion_id+' => '', 'Class:PC/Attribute:osversion_name' => 'OS version name', 'Class:PC/Attribute:osversion_name+' => '', + 'Class:PC/Attribute:os_end_of_support' => 'OS end of support', + 'Class:PC/Attribute:os_end_of_support+' => 'The date after which the editor ceases to provide patches for this OS version.', 'Class:PC/Attribute:cpu' => 'CPU', 'Class:PC/Attribute:cpu+' => '', 'Class:PC/Attribute:ram' => 'RAM', @@ -540,6 +550,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:Software/Attribute:vendor+' => '', 'Class:Software/Attribute:version' => 'Version', 'Class:Software/Attribute:version+' => '', + 'Class:Software/Attribute:end_of_support' => 'End of support', + 'Class:Software/Attribute:end_of_support+' => 'The date after which the editor ceases to provide patches for this software version.', 'Class:Software/Attribute:documents_list' => 'Documents', 'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software', 'Class:Software/Attribute:logo' => 'Logo', @@ -579,6 +591,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:SoftwareInstance/Attribute:software_id+' => '', 'Class:SoftwareInstance/Attribute:software_name' => 'Software name', 'Class:SoftwareInstance/Attribute:software_name+' => '', + 'Class:SoftwareInstance/Attribute:software_end_of_support' => 'Software end of support', + 'Class:SoftwareInstance/Attribute:software_end_of_support+' => 'The date after which the editor ceases to provide patches for this software version.', 'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software license', 'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '', 'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software license name', @@ -776,6 +790,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:VirtualMachine/Attribute:osversion_id+' => '', 'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name', 'Class:VirtualMachine/Attribute:osversion_name+' => '', + 'Class:VirtualMachine/Attribute:os_end_of_support' => 'OS end of support', + 'Class:VirtualMachine/Attribute:os_end_of_support+' => 'When the OS version is no more supported by the vendor, if this information is documented on the OS Version.', 'Class:VirtualMachine/Attribute:oslicence_id' => 'OS license', 'Class:VirtualMachine/Attribute:oslicence_id+' => '', 'Class:VirtualMachine/Attribute:oslicence_name' => 'OS license name', @@ -1064,6 +1080,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:OSVersion/Attribute:osfamily_id+' => '', 'Class:OSVersion/Attribute:osfamily_name' => 'OS family name', 'Class:OSVersion/Attribute:osfamily_name+' => '', + 'Class:OSVersion/Attribute:end_of_support' => 'End of support', + 'Class:OSVersion/Attribute:end_of_support+' => 'The date after which the editor ceases to provide patches for this OS version.', 'Class:OSVersion/Attribute:ospatches_list' => 'OS patches', 'Class:OSVersion/Attribute:ospatches_list+' => 'All the OS patches for this OS version', 'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family', @@ -1118,6 +1136,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:Model/Attribute:picture+' => '', 'Class:Model/Attribute:type' => 'Device type', 'Class:Model/Attribute:type+' => '', + 'Class:Model/Attribute:end_of_support' => 'End of support', + 'Class:Model/Attribute:end_of_support+' => 'The date after which the manufacturer ceases to provide patches and support for this model.', 'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source', 'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source', 'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array', @@ -1184,6 +1204,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:IOSVersion/Attribute:brand_id+' => '', 'Class:IOSVersion/Attribute:brand_name' => 'Brand name', 'Class:IOSVersion/Attribute:brand_name+' => '', + 'Class:IOSVersion/Attribute:end_of_support' => 'End of support', + 'Class:IOSVersion/Attribute:end_of_support+' => 'The date after which the editor ceases to provide patches for this IOS version.', 'Class:IOSVersion/Attribute:networkdevices_list' => 'Network devices', 'Class:IOSVersion/Attribute:networkdevices_list+' => 'All the network devices running this IOS version', 'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index 63ac04e40b..91b0e184ae 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -87,6 +87,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'moyenne', 'Class:FunctionalCI/Attribute:move2production' => 'Date de mise en production', 'Class:FunctionalCI/Attribute:move2production+' => '', + 'Class:FunctionalCI/Attribute:groups_list' => 'Groupes', + 'Class:FunctionalCI/Attribute:groups_list+' => 'Les groupes sont des sortes d\'étiquettes qui permettent d\'identifier des environnements de travail, l\'appartenance à des projets ou les équipements qui doivent être mise à jour, déplacés, remplacés, etc…', 'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts', 'Class:FunctionalCI/Attribute:contacts_list+' => 'Tous les contacts de cet élément de configuration', 'Class:FunctionalCI/Attribute:documents_list' => 'Documents', @@ -143,6 +145,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:PhysicalDevice/Attribute:model_id+' => '', 'Class:PhysicalDevice/Attribute:model_name' => 'Nom Modèle', 'Class:PhysicalDevice/Attribute:model_name+' => '', + 'Class:PhysicalDevice/Attribute:model_end_of_support' => 'Fin de support du modèle', + 'Class:PhysicalDevice/Attribute:model_end_of_support+' => 'Date au delà de laquelle le fabricant ne fournit plus ni correctif, ni pièces de rechange pour ce modèle.', 'Class:PhysicalDevice/Attribute:asset_number' => 'Numéro Asset', 'Class:PhysicalDevice/Attribute:asset_number+' => '', 'Class:PhysicalDevice/Attribute:purchase_date' => 'Date d\'achat', @@ -312,6 +316,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:NetworkDevice/Attribute:iosversion_id+' => '', 'Class:NetworkDevice/Attribute:iosversion_name' => 'Nom Version IOS', 'Class:NetworkDevice/Attribute:iosversion_name+' => '', + 'Class:NetworkDevice/Attribute:ios_end_of_support' => 'Fin de support de l\'IOS', + 'Class:NetworkDevice/Attribute:ios_end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version d\'IOS.', 'Class:NetworkDevice/Attribute:ram' => 'RAM', 'Class:NetworkDevice/Attribute:ram+' => '', ]); @@ -332,6 +338,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Server/Attribute:osversion_id+' => '', 'Class:Server/Attribute:osversion_name' => 'Nom Version OS', 'Class:Server/Attribute:osversion_name+' => '', + 'Class:Server/Attribute:os_end_of_support' => 'Fin de support de l\'OS', + 'Class:Server/Attribute:os_end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version d\'OS.', 'Class:Server/Attribute:oslicence_id' => 'Licence OS', 'Class:Server/Attribute:oslicence_id+' => '', 'Class:Server/Attribute:oslicence_name' => 'Nom Licence OS', @@ -426,6 +434,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:PC/Attribute:osversion_id+' => '', 'Class:PC/Attribute:osversion_name' => 'Nom Version OS', 'Class:PC/Attribute:osversion_name+' => '', + 'Class:PC/Attribute:os_end_of_support' => 'Fin de support de l\'OS', + 'Class:PC/Attribute:os_end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version d\'OS.', 'Class:PC/Attribute:cpu' => 'CPU', 'Class:PC/Attribute:cpu+' => '', 'Class:PC/Attribute:ram' => 'RAM', @@ -592,6 +602,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:SoftwareInstance/Attribute:software_id+' => '', 'Class:SoftwareInstance/Attribute:software_name' => 'Nom du logiciel', 'Class:SoftwareInstance/Attribute:software_name+' => '', + 'Class:SoftwareInstance/Attribute:software_end_of_support' => 'Fin de support du logiciel', + 'Class:SoftwareInstance/Attribute:software_end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version du logiciel.', 'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Licence logiciel', 'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '', 'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Nom Licence logiciel', @@ -819,6 +831,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:VirtualMachine/Attribute:osversion_id+' => '', 'Class:VirtualMachine/Attribute:osversion_name' => 'Nom Version OS', 'Class:VirtualMachine/Attribute:osversion_name+' => '', + 'Class:VirtualMachine/Attribute:os_end_of_support' => 'Fin de support de l\'OS', + 'Class:VirtualMachine/Attribute:os_end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version d\'OS.', 'Class:VirtualMachine/Attribute:oslicence_id' => 'Licence OS', 'Class:VirtualMachine/Attribute:oslicence_id+' => '', 'Class:VirtualMachine/Attribute:oslicence_name' => 'Nom Licence OS', @@ -982,6 +996,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Software/Attribute:vendor+' => '', 'Class:Software/Attribute:version' => 'Version', 'Class:Software/Attribute:version+' => '', + 'Class:Software/Attribute:end_of_support' => 'Fin de support', + 'Class:Software/Attribute:end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version du logiciel.', 'Class:Software/Attribute:documents_list' => 'Documents', 'Class:Software/Attribute:documents_list+' => 'Tous les documents liés à ce logiciel', 'Class:Software/Attribute:logo' => 'Logo', @@ -1092,6 +1108,7 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Licence/Attribute:organization_name+' => 'Common name', 'Class:Licence/Attribute:usage_limit' => 'Limite d\'utilisation', 'Class:Licence/Attribute:usage_limit+' => '', + // Incoherent FR specific entries below in this table, wrong class. To be either moved or modified 'Class:Location/Attribute:physicaldevice_list/UI:Links:Create:Button+' => 'Créer un %4$s', 'Class:Location/Attribute:physicaldevice_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s', 'Class:Location/Attribute:physicaldevice_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s', @@ -1197,6 +1214,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:OSVersion/Attribute:osfamily_id+' => '', 'Class:OSVersion/Attribute:osfamily_name' => 'Nom Famille OS', 'Class:OSVersion/Attribute:osfamily_name+' => '', + 'Class:OSVersion/Attribute:end_of_support' => 'Fin de support', + 'Class:OSVersion/Attribute:end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version.', 'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Le nom doit être unique au sein de cette famille d\'OS', 'Class:OSVersion/UniquenessRule:name_osfamily' => 'cette version d\'OS existe déjà dans cette famille', 'Class:OSVersion/Attribute:ospatches_list' => 'Patchs OS', @@ -1257,6 +1276,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Model/Attribute:picture+' => '', 'Class:Model/Attribute:type' => 'Type de matériel', 'Class:Model/Attribute:type+' => '', + 'Class:Model/Attribute:end_of_support' => 'Fin de support', + 'Class:Model/Attribute:end_of_support+' => 'Date au delà de laquelle le constructeur ne fournit plus ni correctif ni support.', 'Class:Model/Attribute:type/Value:PowerSource' => 'Arrivée électrique', 'Class:Model/Attribute:type/Value:PowerSource+' => 'Arrivée électrique', 'Class:Model/Attribute:type/Value:DiskArray' => 'Baie de disques', @@ -1335,6 +1356,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:IOSVersion/Attribute:brand_id+' => '', 'Class:IOSVersion/Attribute:brand_name' => 'Nom Marque', 'Class:IOSVersion/Attribute:brand_name+' => '', + 'Class:IOSVersion/Attribute:end_of_support' => 'Fin de support', + 'Class:IOSVersion/Attribute:end_of_support+' => 'Date au delà de laquelle l\'éditeur ne fournit plus de correctif pour cette version.', 'Class:IOSVersion/UniquenessRule:name_brand+' => 'Le nom doit être unique pour cette marque', 'Class:IOSVersion/UniquenessRule:name_brand' => 'cette version d\'IOS existe déja sur cette marque', 'Class:IOSVersion/Attribute:networkdevices_list' => 'Equipements réseaux', 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 d654e81ecc..3347fc4962 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 @@ -438,9 +438,12 @@ 10 - @@ -993,6 +996,9 @@ 10 + + 20 + 20 @@ -1196,6 +1202,9 @@ 10 + + 20 + 20 @@ -1254,6 +1263,16 @@ + + + + + + + false + true + + @@ -1298,6 +1317,16 @@ + + + + + + + false + true + + 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 be9652e86c..b35689d46c 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 @@ -109,13 +109,16 @@ 10 - 110 + 10 - 120 + 20 - 130 + 30 + + + 40 @@ -123,7 +126,10 @@ 20 - 140 + 10 + + + 20 @@ -350,6 +356,9 @@ 30 + + 40 + @@ -358,6 +367,9 @@ 10 + + 20 + @@ -565,6 +577,9 @@ 10 + + 20 + @@ -760,6 +775,9 @@ 30 + + 40 + @@ -768,6 +786,9 @@ 10 + + 20 + @@ -989,6 +1010,9 @@ 30 + + 40 + @@ -997,6 +1021,9 @@ 10 + + 20 + diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml index 5fa8387ba0..1502d05d7b 100755 --- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml +++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml @@ -90,6 +90,9 @@ 160 + + 170 + @@ -253,6 +256,9 @@ 30 + + 40 + @@ -261,6 +267,9 @@ 10 + + 20 + @@ -470,6 +479,9 @@ 30 + + 40 + @@ -478,6 +490,9 @@ 10 + + 20 + @@ -673,6 +688,9 @@ 30 + + 40 + @@ -681,6 +699,9 @@ 10 + + 20 + @@ -869,6 +890,9 @@ 30 + + 40 + @@ -877,6 +901,9 @@ 10 + + 20 + @@ -1029,6 +1056,10 @@ osversion_id name + + osversion_id + end_of_support + cpu @@ -1130,6 +1161,12 @@ 30 + + 40 + + + 50 + @@ -1138,6 +1175,9 @@ 10 + + 20 + @@ -1336,6 +1376,9 @@ 30 + + 40 + @@ -1344,6 +1387,9 @@ 10 + + 20 + @@ -1536,6 +1582,9 @@ 30 + + 40 + @@ -1544,6 +1593,9 @@ 10 + + 20 + diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml index 538b989bcf..8fb0c36aeb 100644 --- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml +++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml @@ -136,6 +136,9 @@ 30 + + 40 + @@ -158,6 +161,9 @@ 10 + + 20 + @@ -395,6 +401,9 @@ 30 + + 40 + @@ -417,6 +426,9 @@ 10 + + 20 + @@ -654,6 +666,9 @@ 30 + + 40 + @@ -676,6 +691,9 @@ 10 + + 20 + @@ -913,6 +931,9 @@ 30 + + 40 + @@ -935,6 +956,9 @@ 10 + + 20 + 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 2633bee89b..f2f1524551 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 @@ -421,6 +421,9 @@ 10 + + 20 + 20 @@ -598,6 +601,9 @@ 10 + + 20 + 20 @@ -740,6 +746,10 @@ osversion_id name + + osversion_id + end_of_support + osversion_id]]> @@ -856,6 +866,9 @@ 10 + + 20 + @@ -864,6 +877,9 @@ 10 + + 20 + @@ -1253,9 +1269,12 @@ 10 -