From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Thu, 23 Aug 2018 10:09:43 +0000 (+0800)
Subject: Add Several Fields to the AAI section
X-Git-Tag: 1.2.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=commitdiff_plain;h=448a62b47b193dd8a658b6d7c0ddf52dbfe2589b

Add Several Fields to the AAI section

Change-Id: Ic1a002983678aacbf21dd3e56508382d59b87d90
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 a4d2c06..afc4c06 100644
--- a/rules/ccvnp-rule.drl
+++ b/rules/ccvnp-rule.drl
@@ -75,12 +75,14 @@ function Map<String, Object> getAdditionalResourceInfo(String networkId, String
 	StringBuilder sb = new StringBuilder();
 	for(int i = 0; i < instances.size(); ++i) {
 		JSONObject o = instances.getJSONObject(i);
-		String name = instances.getJSONObject(i).getString("service-instance-name");
-		ret.put(name + ".input-parameters", "TBD");
+		String name = o.getString("service-instance-name");
+		ret.put(name + ".input-parameters", o.getString("input-parameters"));
 		sb.append(name).append(",");
 	}
 	ret.put("service-instance.service-instance-name", sb.substring(0, sb.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"));
 
 	return ret;
 }