Filter Fm notifications with CollisionAndConfusion

Issue-ID: DCAEGEN2-2480
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I406791e28a824ee1edb5025901a4fa8b7bbee841

diff --git a/pom.xml b/pom.xml
index 999e62a..66be5f9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
        <groupId>org.onap.dcaegen2.services.son-handler</groupId>
        <artifactId>son-handler</artifactId>
        <name>dcaegen2-services-son-handler</name>
-       <version>2.1.1-SNAPSHOT</version>
+       <version>2.1.2-SNAPSHOT</version>
 
        <!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId>
                <version>2.0.4.RELEASE</version> </parent -->

diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/MainThread.java b/src/main/java/org/onap/dcaegen2/services/sonhms/MainThread.java
index 2f30a91..a434b31 100644 (file)
--- a/src/main/java/org/onap/dcaegen2/services/sonhms/MainThread.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/MainThread.java
@@ -2,7 +2,7 @@
  *  ============LICENSE_START=======================================================
  *  son-handler
  *  ================================================================================
- *   Copyright (C) 2019 Wipro Limited.
+ *   Copyright (C) 2019-2020 Wipro Limited.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -164,7 +164,9 @@ public class MainThread implements Runnable {
                                                        } else if ((fmNotification.getEvent().getFaultFields().getSpecificProblem()
                                                                        .equals("Collision"))
                                                                        || (fmNotification.getEvent().getFaultFields().getSpecificProblem()
-                                                                                       .equals("Confusion"))) {
+                                                                                       .equals("Confusion"))
+                                                                       || (fmNotification.getEvent().getFaultFields().getSpecificProblem()
+                                                                                       .equals("CollisionAndConfusion"))) {
                                                                faultCellId = fmNotification.getEvent().getCommonEventHeader().getSourceName();
                                                                bufferedFmNotificationCells.put(faultCellId, fmNotification);
                                                                log.info("Buffered FM cell {}", faultCellId);

diff --git a/version.properties b/version.properties
index 7b4ae8c..0040aea 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -20,7 +20,7 @@
 ###############################################################################
 major=2
 minor=1
-patch=1
+patch=2
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT