Fix Some Bugs

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / dmaap / DmaapService.java

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 300201f..2651c97 100644 (file)
--- 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
@@ -50,11 +50,11 @@ public class DmaapService {
             publisher.publish(policyMsg);
             log.info("send policyMsg: " + JacksonUtil.beanToJson(policyMsg));
         } catch (CorrelationException e) {
-            log.error("Failed to publish policyMsg to dmaap", e.getMessage());
+            log.error("Failed to publish the control loop event to DMaaP", e);
         } catch (JsonProcessingException e) {
-            log.info("Failed to convert policyMsg to json");
+            log.info("Failed to convert the control loop event to json");
         } catch (NullPointerException e) {
-            log.error("DMaaP configurations does not exist!");
+            log.error("DMaaP configurations do not exist!");
         }
     }
 
@@ -71,10 +71,14 @@ public class DmaapService {
         if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ONSET) {
             enrichVnfInfo(vmEntity, childAlarm, policyMsg);
             policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
-            policyMsg.setTarget("vserver.vserver-id");
             policyMsg.getAai().put("vserver.in-maint", String.valueOf(vmEntity.getInMaint()));
-            policyMsg.getAai().put("vserver.is-closed-loop-disabled",
-                    String.valueOf(vmEntity.getClosedLoopDisable()));
+            try {
+                policyMsg.getAai().put("vserver.is-closed-loop-disabled",
+                        Boolean.valueOf(vmEntity.getClosedLoopDisable()).booleanValue());
+            } catch (Exception e) {
+                log.error("Failed to parse the field \"is-closed-loop-disabled\". A boolean string (\"true\"/\"false\")"
+                        + " is expected but the actual value is " + vmEntity.getClosedLoopDisable() + ".", e);
+            }
             policyMsg.getAai().put("vserver.prov-status", vmEntity.getProvStatus());
             policyMsg.getAai().put("vserver.resource-version", vmEntity.getResourceVersion());
         } else {
@@ -87,6 +91,7 @@ public class DmaapService {
         policyMsg.getAai().put("vserver.vserver-name", vmEntity.getVserverName());
         policyMsg.getAai().put("vserver.vserver-name2", vmEntity.getVserverName2());
         policyMsg.getAai().put("vserver.vserver-selflink", vmEntity.getVserverSelflink());
+        policyMsg.setTarget("vserver.vserver-name");
         return policyMsg;
     }
 
@@ -155,7 +160,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,7 +170,7 @@ 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;
     }