X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fdmaap%2FDmaapService.java;h=ba52262c5dc7d45dbcb9ad5d182b6b0d8719e58f;hb=953aee4dbbed4ce9edae8ca9914290b3164b077a;hp=738bfd97d6e203947293b15279c8c9158f8cd990;hpb=c8e4878d4f519e63a81bd30b30fcba0a0b398eb5;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index 738bfd9..ba52262 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -15,7 +15,7 @@
  */
 package org.onap.holmes.common.dmaap;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +31,7 @@ import org.onap.holmes.common.dcae.DcaeConfigurationsCache;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg.EVENT_STATUS;
 import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.JacksonUtil;
+import org.onap.holmes.common.utils.GsonUtil;
 
 @Slf4j
 @Service
@@ -39,8 +39,8 @@ public class DmaapService {
 
     @Inject
     private AaiQuery aaiQuery;
-    public static ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
-    public static ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
 
     public void publishPolicyMsg(PolicyMsg policyMsg, String dmaapConfigKey) {
         try {
@@ -48,32 +48,31 @@ public class DmaapService {
             publisher.setUrl(DcaeConfigurationsCache.getPubSecInfo(dmaapConfigKey).getDmaapInfo()
                     .getTopicUrl());
             publisher.publish(policyMsg);
-            log.info("send policyMsg: " + JacksonUtil.beanToJson(policyMsg));
+            deleteRequestId(policyMsg);
+            log.info("send policyMsg: " + GsonUtil.beanToJson(policyMsg));
         } catch (CorrelationException e) {
-            log.error("Failed to publish policyMsg to dmaap", e.getMessage());
-        } catch (JsonProcessingException e) {
-            log.info("Failed to convert policyMsg to json");
+            log.error("Failed to publish the control loop event to DMaaP", e);
         } catch (NullPointerException e) {
-            log.error("DMaaP configurations does not exist!");
+            log.error("DMaaP configurations do not exist!");
         }
     }
 
     public PolicyMsg getPolicyMsg(VesAlarm rootAlarm, VesAlarm childAlarm, String packgeName) {
         return Optional.ofNullable(getVmEntity(rootAlarm.getSourceId(), rootAlarm.getSourceName()))
                 .map(vmEntity -> getEnrichedPolicyMsg(vmEntity, rootAlarm, childAlarm, packgeName))
-                .orElse(getDefaultPolicyMsg(rootAlarm.getSourceName()));
+                .orElse(getDefaultPolicyMsg(rootAlarm, packgeName));
     }
 
     private PolicyMsg getEnrichedPolicyMsg(VmEntity vmEntity, VesAlarm rootAlarm, VesAlarm childAlarm,
             String packageName) {
         PolicyMsg policyMsg = new PolicyMsg();
-        policyMsg.setRequestID(getUniqueRequestId(rootAlarm, policyMsg));
+        policyMsg.setRequestID(getUniqueRequestId(rootAlarm));
         if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ONSET) {
             enrichVnfInfo(vmEntity, childAlarm, policyMsg);
             policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
-            policyMsg.getAai().put("vserver.in-maint", String.valueOf(vmEntity.getInMaint()));
+            policyMsg.getAai().put("vserver.in-maint", vmEntity.getInMaint());
             policyMsg.getAai().put("vserver.is-closed-loop-disabled",
-                    String.valueOf(vmEntity.getClosedLoopDisable()));
+                        vmEntity.getClosedLoopDisable());
             policyMsg.getAai().put("vserver.prov-status", vmEntity.getProvStatus());
             policyMsg.getAai().put("vserver.resource-version", vmEntity.getResourceVersion());
         } else {
@@ -90,15 +89,22 @@ public class DmaapService {
         return policyMsg;
     }
 
-    private PolicyMsg getDefaultPolicyMsg(String sourceName) {
+    private PolicyMsg getDefaultPolicyMsg(VesAlarm rootAlarm, String packageName) {
         PolicyMsg policyMsg = new PolicyMsg();
-        policyMsg.setTarget("vserver.vserver-id");
+        policyMsg.setRequestID(getUniqueRequestId(rootAlarm));
+        policyMsg.setClosedLoopControlName(loopControlNames.get(packageName));
+        policyMsg.setClosedLoopAlarmStart(rootAlarm.getStartEpochMicrosec());
+        policyMsg.setTarget("vserver.vserver-name");
         policyMsg.setTargetType("VM");
-        policyMsg.getAai().put("vserver.vserver-name", sourceName);
+        policyMsg.getAai().put("vserver.vserver-name", rootAlarm.getSourceName());
+        if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ABATED) {
+            policyMsg.setClosedLoopAlarmEnd(rootAlarm.getLastEpochMicrosec());
+            policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ABATED);
+        }
         return policyMsg;
     }
 
-    private String getUniqueRequestId(VesAlarm rootAlarm, PolicyMsg policyMsg) {
+    private String getUniqueRequestId(VesAlarm rootAlarm) {
         String alarmUniqueKey = "";
         if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ABATED) {
             alarmUniqueKey =
@@ -155,7 +161,7 @@ public class DmaapService {
         try {
             vnfEntity = aaiQuery.getAaiVnfData(vnfId, vnfName);
         } catch (CorrelationException e) {
-            log.error("Failed to get vnf data", e.getMessage());
+            log.error("Failed to get the VNF data.", e);
         }
         return vnfEntity;
     }
@@ -165,8 +171,22 @@ public class DmaapService {
         try {
             vmEntity = aaiQuery.getAaiVmData(sourceId, sourceName);
         } catch (CorrelationException e) {
-            log.error("Failed to get vm data", e.getMessage());
+            log.error("Failed to get the VM data.", e);
         }
         return vmEntity;
     }
+
+    private void deleteRequestId(PolicyMsg policyMsg){
+    	EVENT_STATUS status = policyMsg.getClosedLoopEventStatus();
+        if(EVENT_STATUS.ABATED.equals(status)) {
+            String requestId = policyMsg.getRequestID();
+            for(Entry<String, String> kv: alarmUniqueRequestID.entrySet()) {
+                if(kv.getValue().equals(requestId)) {
+                    alarmUniqueRequestID.remove(kv.getKey());
+                    break;
+                }
+            }
+            log.info("An alarm is cleared and the corresponding requestId is deleted successfully");
+        }
+    }
 }