Supported either HTTP or HTTPS

[holmes/rule-management.git] / rules / mdons-rule.drl

diff --git a/rules/mdons-rule.drl b/rules/mdons-rule.drl
index c4bc803..4b7dc01 100644 (file)
--- a/rules/mdons-rule.drl
+++ b/rules/mdons-rule.drl
@@ -9,8 +9,8 @@ import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.dmaap.DmaapService;\r
 import org.onap.holmes.common.utils.DroolsLog;\r
 import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;\r
-import com.alibaba.fastjson.JSONArray;\r
-import com.alibaba.fastjson.JSONObject;\r
+import org.onap.holmes.common.dmaap.store.UniqueRequestIdCache;\r
+\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
@@ -50,8 +50,8 @@ function PolicyMsg createPolicyMsg(VesAlarm alarm, String serviceInstanceId, Str
     m.setClosedLoopAlarmEnd(alarm.getLastEpochMicrosec());\r
     m.setTarget("vserver.vserver-name");\r
     m.setAai(getAaiObjectPolicy(serviceName, serviceInstanceId));\r
-       \r
-    DmaapService.alarmUniqueRequestID.put(alarm.getEventId(), m.getRequestID());\r
+\r
+    ServiceLocatorHolder.getLocator().getService(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());\r
     return m;\r
     }\r
        \r
@@ -75,7 +75,7 @@ rule "Process Alarms MSA"
                for(Map.Entry<String,String> entry : map.entrySet()){\r
                    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());\r
                        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\r
-                       dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");\r
+                       dmaapService.publishPolicyMsg(msg, "dcae_cl_out");\r
                        DroolsLog.printInfo("Published to policy=" + msg.toString());\r
 \r
                }\r
@@ -95,7 +95,7 @@ rule "Process Alarms TAPI"
                for(Map.Entry<String,String> entry : map.entrySet()){\r
                    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());\r
                        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\r
-                       dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");\r
+                       dmaapService.publishPolicyMsg(msg, "dcae_cl_out");\r
                        DroolsLog.printInfo("Published to policy=" + msg.toString());\r
 \r
                }\r
@@ -127,4 +127,4 @@ rule "Process Alarms cleared TAPI"
                processAlarmCleared($a.getEventId());\r
                $a.setRootFlag(1);\r
 \r
-end    
\ No newline at end of file
+end    \r