From ed586368c3de8b531a3069aa2c43235b61548465 Mon Sep 17 00:00:00 2001
From: annprog <tecbbs@qq.com>
Date: Fri, 5 May 2017 15:33:50 +0800
Subject: [PATCH] =?UTF-8?q?[le-config-mgmt]=E5=90=AF=E7=94=A8contacts?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82=E4=BD=BF=E7=94=A8=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E5=99=A8+action-shell-exec=E6=9B=B4=E6=96=B0contacts=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5.=20fix=20#7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 le-config-mgmt/datamodel.le-config-mgmt.xml | 72 ++++++++++++++++-----
 le-config-mgmt/zh.dict.le-config-mgmt.php   |  1 +
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/le-config-mgmt/datamodel.le-config-mgmt.xml b/le-config-mgmt/datamodel.le-config-mgmt.xml
index add0245..77df066 100644
--- a/le-config-mgmt/datamodel.le-config-mgmt.xml
+++ b/le-config-mgmt/datamodel.le-config-mgmt.xml
@@ -491,7 +491,6 @@
 				</method>
 
 			</methods>
-
 			<relations>
 				<relation id="impacts">
 					<neighbours>
@@ -638,6 +637,9 @@
 						<item id="status" _delta="define">
 							<rank>20</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>21</rank>
+						</item>						
 						<item id="businessprocess_id" _delta="define">
 							<rank>16</rank>
 						</item>
@@ -664,8 +666,10 @@
 						<item id="businessprocess_id" _delta="define">
 							<rank>6</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>21</rank>
+						</item>						
 					</items>
-
 				</list>
 			</presentation>
 			<relations>
@@ -1062,7 +1066,6 @@
 						<item id="name">
 							<rank>1</rank>
 						</item>
-
 						<item id="hostname">
 							<rank>20</rank>
 						</item>
@@ -1100,6 +1103,9 @@
 						<item id="use_pam">
 							<rank>130</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>150</rank>
+						</item>						
 					</items>
 				</search>
 				<list _delta="redefine">
@@ -1110,24 +1116,27 @@
 						<item id="all_ip">
 							<rank>25</rank>
 						</item>
-
 						<item id="cpu">
 							<rank>3</rank>
 						</item>
 						<item id="ram">
 							<rank>5</rank>
 						</item>
-
 						<item id="status">
 							<rank>21</rank>
 						</item>
-
 						<item id="rack_id">
 							<rank>40</rank>
 						</item>
 						<item id="model_id">
 							<rank>60</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>65</rank>
+						</item>
+						<item id="use_pam" _delta="define">
+							<rank>66</rank>
+						</item>
 						<item id="org_id">
 							<rank>70</rank>
 						</item>
@@ -1617,6 +1626,9 @@
 						<item id="record_id" _delta="define">
 							<rank>16</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>17</rank>
+						</item>						
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -1641,7 +1653,7 @@
 						</item>
 						<item id="record_id" _delta="define">
 							<rank>16</rank>
-						</item>						
+						</item>	
 						<item id="contacts">
 							<rank>19</rank>
 						</item>
@@ -1793,6 +1805,9 @@
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>						
 						<item id="status">
 							<rank>30</rank>
 						</item>
@@ -1818,6 +1833,9 @@
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>						
 						<item id="status">
 							<rank>30</rank>
 						</item>
@@ -2076,7 +2094,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -2099,7 +2119,6 @@
 						<item id="location">
 							<rank>11</rank>
 						</item>
-
 						<item id="status">
 							<rank>15</rank>
 						</item>
@@ -2220,7 +2239,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -2349,7 +2370,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -2372,7 +2395,6 @@
 						<item id="location">
 							<rank>11</rank>
 						</item>
-
 						<item id="status">
 							<rank>15</rank>
 						</item>
@@ -2473,7 +2495,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -2678,7 +2702,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -2943,7 +2969,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -3189,7 +3217,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -3311,7 +3341,9 @@
 						<item id="info">
 							<rank>18</rank>
 						</item>
-
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -3654,6 +3686,9 @@
 						<item id="status">
 							<rank>15</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>						
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
@@ -3682,6 +3717,9 @@
 						<item id="status">
 							<rank>15</rank>
 						</item>
+						<item id="contacts" _delta="define">
+							<rank>19</rank>
+						</item>						
 						<item id="org_id">
 							<rank>20</rank>
 						</item>
diff --git a/le-config-mgmt/zh.dict.le-config-mgmt.php b/le-config-mgmt/zh.dict.le-config-mgmt.php
index c6df51e..789c9a6 100644
--- a/le-config-mgmt/zh.dict.le-config-mgmt.php
+++ b/le-config-mgmt/zh.dict.le-config-mgmt.php
@@ -404,4 +404,5 @@
 // FunctionalCI
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:FunctionalCI/Attribute:ci_id' => 'ID',
+	'Class:FunctionalCI/Attribute:contacts' => '联系人',
 ));