Add the CL Name to the Cache when Starting Up

Change-Id: I6a21707cf0475fa42aaf416088663c9f99af5a71
Issue-ID: HOLMES-82
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
index 52f3915..37b39c0 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
@@ -41,7 +41,7 @@ public class DMaaPAlarmPolling implements Runnable {
             try {
                 vesAlarmList = subscriber.subscribe();
             } catch (CorrelationException e) {
-                log.error("Failed polling request alarm." + e.getMessage());
+                log.error("Failed polling request alarm. " + e.getMessage());
             }
             vesAlarmList.forEach(vesAlarm -> droolsEngine.putRaisedIntoStream(vesAlarm));
         }

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
index 5ccf29b..2ecea5e 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
@@ -38,6 +38,7 @@ import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.runtime.rule.FactHandle;\r
 import org.jvnet.hk2.annotations.Service;\r
 import org.onap.holmes.common.api.stat.VesAlarm;\r
+import org.onap.holmes.common.dmaap.DmaapService;\r
 import org.onap.holmes.engine.request.DeployRuleRequest;\r
 import org.onap.holmes.common.api.entity.CorrelationRule;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
@@ -101,6 +102,7 @@ public class DroolsEngine {
         for (CorrelationRule rule : rules) {\r
             if (rule.getContent() != null) {\r
                 deployRuleFromDB(rule.getContent());\r
+                DmaapService.loopControlNames.put(rule.getPackageName(), rule.getClosedControlLoopName());\r
             }\r
         }\r
     }\r

diff --git a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
index b57fa30..dd0b55d 100644 (file)
--- a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
+++ b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
@@ -88,6 +88,8 @@ public class DroolsEngineTest {
         List<CorrelationRule> rules = new ArrayList<CorrelationRule>();\r
         CorrelationRule rule = new CorrelationRule();\r
         rule.setContent("content");\r
+        rule.setClosedControlLoopName("test");\r
+        rule.setPackageName("org.onap.holmes");\r
         rules.add(rule);\r
 \r
         expect(ruleMgtWrapper.queryRuleByEnable(anyInt())).andReturn(rules);\r