From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Fri, 24 Aug 2018 06:05:41 +0000 (+0800)
Subject: Added Service Instance ID to the CL Event
X-Git-Tag: 1.2.0~21^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=commitdiff_plain;h=6a237c08f158ccbfdf13b44cbb62b3bcd2b97d2a

Added Service Instance ID to the CL Event

Change-Id: Ibed23ac96483f97e0b93384716925806bf672d5b
Issue-ID: HOLMES-162
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
---

diff --git a/rules/ccvnp-rule.drl b/rules/ccvnp-rule.drl
index e1bfc8a..9de2491 100644
--- a/rules/ccvnp-rule.drl
+++ b/rules/ccvnp-rule.drl
@@ -72,14 +72,18 @@ function Map<String, Object> getAdditionalResourceInfo(String networkId, String
 
 	Map<String, Object> ret = new HashMap<String, Object>();
 
-	StringBuilder sb = new StringBuilder();
+	StringBuilder sbn = new StringBuilder();
+	StringBuilder sbi = new StringBuilder();
 	for(int i = 0; i < instances.size(); ++i) {
 		JSONObject o = instances.getJSONObject(i);
 		String name = o.getString("service-instance-name");
+		String id = o.getString("service-instance-id");
 		ret.put(name + ".input-parameters", o.getString("input-parameters"));
-		sb.append(name).append(",");
+		sbn.append(name).append(",");
+		sbi.append(id).append(",");
 	}
-	ret.put("service-instance.service-instance-name", sb.substring(0, sb.length() -1).toString());
+	ret.put("service-instance.service-instance-name", sbn.substring(0, sbn.length() -1).toString());
+	ret.put("service-instance.service-instance-id", sbi.substring(0, sbi.length() -1).toString());
 	ret.put("vserver.vserver-name", "TBD");
 	ret.put("globalSubscriberId", instances.getJSONObject(0).getString("globalSubscriberId"));
 	ret.put("serviceType", instances.getJSONObject(0).getString("serviceType"));