From e789c6baec30278f958093c062d5abf214b60d8e Mon Sep 17 00:00:00 2001 From: Erwan Taloc Date: Tue, 26 Nov 2013 21:06:56 +0000 Subject: [PATCH] Fix enhancement request #834 Add IP for Virtual Machine SVN:trunk[2993] --- .../2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php | 2 ++ .../2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php | 4 ++++ .../itop-config-mgmt/es_cr.dict.itop-config-mgmt.php | 2 ++ .../2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php | 2 ++ .../2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php | 4 +++- .../2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php | 4 +++- .../datamodel.itop-virtualization-mgmt.xml | 11 +++++++++++ 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php index 8a2e45f4d..1a4386a46 100755 --- a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php @@ -779,6 +779,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Class:VirtualMachine/Attribute:cpu+' => '', 'Class:VirtualMachine/Attribute:ram' => 'RAM', 'Class:VirtualMachine/Attribute:ram+' => '', + 'Class:VirtualMachine/Attribute:managementip' => 'Management-IP', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Netzwerk-Interfaces', 'Class:VirtualMachine/Attribute:logicalinterface_list+' => '', 'Class:LogicalVolume' => 'Logical Volume', diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php index f28244646..627561739 100755 --- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php @@ -830,6 +830,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:WebApplication/Attribute:url+' => '', )); + // // Class: VirtualDevice // @@ -917,6 +918,8 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:VirtualMachine/Attribute:cpu+' => '', 'Class:VirtualMachine/Attribute:ram' => 'RAM', 'Class:VirtualMachine/Attribute:ram+' => '', + 'Class:VirtualMachine/Attribute:managementip' => 'IP', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces', 'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces', )); @@ -1792,6 +1795,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:Document' => 'Documents', 'Menu:Document+' => 'All documents', 'Menu:Location' => 'Locations', + 'Menu:Location+' => 'All locations', 'Menu:ConfigManagementCI' => 'Configuration items', 'Menu:ConfigManagementCI+' => 'Configuration items', diff --git a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php index fedbcad1d..42fe79428 100755 --- a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php @@ -915,6 +915,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Class:VirtualMachine/Attribute:cpu+' => 'CPU', 'Class:VirtualMachine/Attribute:ram' => 'RAM', 'Class:VirtualMachine/Attribute:ram+' => 'RAM', + 'Class:VirtualMachine/Attribute:managementip' => 'IP', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Interfases de Red', 'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Interfases de Red', )); diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php index f7241bbc4..e26c22bd9 100755 --- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php @@ -862,6 +862,8 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Class:VirtualMachine/Attribute:cpu+' => '', 'Class:VirtualMachine/Attribute:ram' => 'RAM', 'Class:VirtualMachine/Attribute:ram+' => '', + 'Class:VirtualMachine/Attribute:managementip' => 'IP', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Interfaces réseaux', 'Class:VirtualMachine/Attribute:logicalinterface_list+' => '', )); diff --git a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php index 38fa51ad9..7ef5613a5 100755 --- a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php @@ -856,6 +856,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Class:VirtualMachine/Attribute:osversion_name+' => '', 'Class:VirtualMachine/Attribute:oslicence_name' => 'OSライセンス名', 'Class:VirtualMachine/Attribute:oslicence_name+' => '', + 'Class:VirtualMachine/Attribute:managementip' => '管理ip', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:LogicalVolume/Attribute:storagesystem_name' => 'ストレージシステム名', 'Class:LogicalVolume/Attribute:storagesystem_name+' => '', 'Class:lnkServerToVolume/Attribute:volume_name' => 'ボリューム名', @@ -1093,4 +1095,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Person:notifiy' => '通知', 'Class:Document:PreviewTab' => 'プレビュー', // 'Preview', # 'Preview' )); -?> \ No newline at end of file +?> diff --git a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php index 3f17b05f9..f3012162a 100755 --- a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php @@ -782,6 +782,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Class:VirtualMachine/Attribute:cpu+' => '', 'Class:VirtualMachine/Attribute:ram' => 'RAM~~', 'Class:VirtualMachine/Attribute:ram+' => '', + 'Class:VirtualMachine/Attribute:managementip' => 'IP', + 'Class:VirtualMachine/Attribute:managementip+' => '', 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~', 'Class:VirtualMachine/Attribute:logicalinterface_list+' => '', 'Class:LogicalVolume' => 'Logical Volume~~', @@ -1099,4 +1101,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Menu:ConfigManagement:Typology' => 'Конфигурация топологии~~', 'Class:Document:PreviewTab' => 'Предпросмотр', )); -?> \ No newline at end of file +?> 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 57ea490eb..228471441 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 @@ -677,6 +677,11 @@ 0 0 + + managementip + + true + @@ -770,6 +775,9 @@ 20 + + 25 + 30 @@ -812,6 +820,9 @@ 30 + + 25 + 40