*/
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;
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
@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 {
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 the control loop event to DMaaP", e);
- } catch (JsonProcessingException e) {
- log.info("Failed to convert the control loop event to json");
} catch (NullPointerException e) {
log.error("DMaaP configurations do not exist!");
}
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()));
- 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.in-maint", vmEntity.getInMaint());
+ policyMsg.getAai().put("vserver.is-closed-loop-disabled",
+ vmEntity.getClosedLoopDisable());
policyMsg.getAai().put("vserver.prov-status", vmEntity.getProvStatus());
policyMsg.getAai().put("vserver.resource-version", vmEntity.getResourceVersion());
} else {
}
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");
+ }
+ }
}