From f9a40915be030cd446a843b26a603907538ab971 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Mon, 23 Aug 2021 17:02:34 +0530 Subject: Fix severity mapping in VES Fault Fix severity mapping in VES Fault Issue-ID: CCSDK-3427 Signed-off-by: Ravi Pendurty Change-Id: I3491fb0e730fc5a1eadb59728f6925acdf22ef43 Signed-off-by: Ravi Pendurty --- .../sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java | 6 +++++- .../features/sdnr/wt/devicemanager/oran/impl/TestAlarmNotif.java | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'sdnr/wt/devicemanager-o-ran-sc/o-ran') 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 0d68bdbf5..ec8eaa7b7 100644 --- 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 b3388114b..4d10dd154 100644 --- 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; } } -- cgit 1.2.3-korg