Fix severity mapping in VES Fault

Fix severity mapping in VES Fault

Issue-ID: CCSDK-3427
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I3491fb0e730fc5a1eadb59728f6925acdf22ef43
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java
index 0d68bdb..ec8eaa7 100644 (file)
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java
@@ -148,7 +148,11 @@ public class ORanFaultToVESFaultMapper {
         vesFaultFields.setAlarmCondition(alarmNotif.getFaultId().toString());
         vesFaultFields.setAlarmInterfaceA(alarmNotif.getFaultSource());
         vesFaultFields.setEventCategory(VES_EVENT_CATEGORY);
-        vesFaultFields.setEventSeverity(alarmNotif.getFaultSeverity().getName());
+        if (alarmNotif.getIsCleared()) {
+            vesFaultFields.setEventSeverity("NORMAL");
+        } else {
+            vesFaultFields.setEventSeverity(alarmNotif.getFaultSeverity().getName());
+        }
         vesFaultFields.setEventSourceType(getModelName());
         vesFaultFields.setFaultFieldsVersion(VES_FAULT_FIELDS_VERSION);
         vesFaultFields.setSpecificProblem(alarmNotif.getFaultText());

diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/TestAlarmNotif.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/TestAlarmNotif.java
index b338811..4d10dd1 100644 (file)
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/TestAlarmNotif.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/TestAlarmNotif.java
@@ -83,8 +83,7 @@ public class TestAlarmNotif implements AlarmNotif {
 
     @Override
     public Boolean getIsCleared() {
-        // TODO Auto-generated method stub
-        return null;
+        return true;
     }
 
 }