Code Review / ccsdk / features.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
update websocketmanager
[ccsdk/features.git] / sdnr / wt / devicemanager-onf14 / provider / src / main / java / org / onap / ccsdk / features / sdnr / wt / devicemanager / onf14 / impl / interfaces / Onf14EthernetContainerNotificationListener.java
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/interfaces/Onf14EthernetContainerNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/interfaces/Onf14EthernetContainerNotificationListener.java
index 7cc3c9b..fb67a24 100644 (file)
--- a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/interfaces/Onf14EthernetContainerNotificationListener.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/interfaces/Onf14EthernetContainerNotificationListener.java
@@ -21,6 +21,9 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl.interfaces;
 
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.AttributeValueChangedNotification;
@@ -28,7 +31,16 @@ import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200
 import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectCreationNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectDeletionNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEWARNING;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,27 +52,37 @@ public class Onf14EthernetContainerNotificationListener implements EthernetConta
     private final NetconfAccessor netconfAccessor;
     private final DeviceManagerServiceProvider serviceProvider;
 
+    private static final Map<Class<? extends SEVERITYTYPE>, SeverityType> severityMap = initSeverityMap();
+
     public Onf14EthernetContainerNotificationListener(NetconfAccessor netconfAccessor,
             DeviceManagerServiceProvider serviceProvider) {
         this.netconfAccessor = netconfAccessor;
         this.serviceProvider = serviceProvider;
     }
 
+    private static Map<Class<? extends SEVERITYTYPE>, SeverityType> initSeverityMap() {
+        Map<Class<? extends SEVERITYTYPE>, SeverityType> map = new HashMap<>();
+        map.put(SEVERITYTYPECRITICAL.class, SeverityType.Critical);
+        map.put(SEVERITYTYPEMAJOR.class, SeverityType.Major);
+        map.put(SEVERITYTYPEMINOR.class, SeverityType.Minor);
+        map.put(SEVERITYTYPEWARNING.class, SeverityType.Warning);
+        map.put(SEVERITYTYPENONALARMED.class, SeverityType.NonAlarmed);
+        return map;
+    }
+
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
         log.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
 
         EventlogBuilder eventlogBuilder = new EventlogBuilder();
-        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
-        .setAttributeName("")
-        .setCounter(notification.getCounter().intValue())
-        .setNewValue("deleted")
-        .setObjectId(notification.getObjectIdRef().getValue())
-        .setSourceType(SourceType.Netconf)
-        .setTimestamp(notification.getTimestamp());
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue()).setAttributeName("")
+                .setCounter(notification.getCounter().intValue()).setNewValue("deleted")
+                .setObjectId(notification.getObjectIdRef().getValue()).setSourceType(SourceType.Netconf)
+                .setTimestamp(notification.getTimestamp());
         serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
         serviceProvider.getNotificationService().deletionNotification(netconfAccessor.getNodeId(),
-                notification.getCounter().intValue(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+                notification.getCounter().intValue(), notification.getTimestamp(),
+                notification.getObjectIdRef().getValue());
 
         log.debug("onObjectDeletionNotification log entry written");
     }
@@ -68,12 +90,19 @@ public class Onf14EthernetContainerNotificationListener implements EthernetConta
     @Override
     public void onProblemNotification(ProblemNotification notification) {
         log.debug("Got event of type :: {}", ProblemNotification.class.getSimpleName());
+        FaultlogEntity faultAlarm = new FaultlogBuilder().setObjectId(notification.getObjectIdRef().getValue())
+                .setProblem(notification.getProblem()).setTimestamp(notification.getTimestamp())
+                .setNodeId(this.netconfAccessor.getNodeId().getValue()).setSourceType(SourceType.Netconf)
+                .setSeverity(mapSeverity(notification.getSeverity())).setCounter(notification.getCounter().intValue())
+                .build();
+        serviceProvider.getFaultService().faultNotification(faultAlarm);
+        serviceProvider.getWebsocketService().sendNotification(notification, netconfAccessor.getNodeId().getValue(),
+                ProblemNotification.QNAME, notification.getTimestamp());
 
-        serviceProvider.getFaultService().faultNotification(netconfAccessor.getNodeId(),
-                notification.getCounter().intValue(), notification.getTimestamp(),
-                notification.getObjectIdRef().getValue(), notification.getProblem(),
-                Onf14EthernetContainer.mapSeverity(notification.getSeverity()));
+    }
 
+    private SeverityType mapSeverity(@Nullable Class<? extends SEVERITYTYPE> severity) {
+        return severityMap.getOrDefault(severity, SeverityType.NonAlarmed);
     }
 
     @Override
@@ -82,14 +111,12 @@ public class Onf14EthernetContainerNotificationListener implements EthernetConta
 
         EventlogBuilder eventlogBuilder = new EventlogBuilder();
         eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
-        .setAttributeName(notification.getAttributeName())
-        .setCounter(notification.getCounter().intValue())
-        .setNewValue(notification.getNewValue())
-        .setObjectId(notification.getObjectIdRef().getValue())
-        .setSourceType(SourceType.Netconf)
-        .setTimestamp(notification.getTimestamp());
+                .setAttributeName(notification.getAttributeName()).setCounter(notification.getCounter().intValue())
+                .setNewValue(notification.getNewValue()).setObjectId(notification.getObjectIdRef().getValue())
+                .setSourceType(SourceType.Netconf).setTimestamp(notification.getTimestamp());
         serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
-        serviceProvider.getNotificationService().eventNotification(eventlogBuilder.build());
+        serviceProvider.getWebsocketService().sendNotification(notification, netconfAccessor.getNodeId().getValue(),
+                AttributeValueChangedNotification.QNAME, notification.getTimestamp());
 
         log.debug("onAttributeValueChangedNotification log entry written");
     }
@@ -99,16 +126,13 @@ public class Onf14EthernetContainerNotificationListener implements EthernetConta
         log.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
 
         EventlogBuilder eventlogBuilder = new EventlogBuilder();
-        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
-        .setAttributeName(notification.getObjectType())
-        .setCounter(notification.getCounter().intValue())
-        .setNewValue("created")
-        .setObjectId(notification.getObjectIdRef().getValue())
-        .setSourceType(SourceType.Netconf)
-        .setTimestamp(notification.getTimestamp());
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue()).setAttributeName(notification.getObjectType())
+                .setCounter(notification.getCounter().intValue()).setNewValue("created")
+                .setObjectId(notification.getObjectIdRef().getValue()).setSourceType(SourceType.Netconf)
+                .setTimestamp(notification.getTimestamp());
         serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
-        serviceProvider.getNotificationService().creationNotification(netconfAccessor.getNodeId(),
-                notification.getCounter().intValue(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+        serviceProvider.getWebsocketService().sendNotification(notification, netconfAccessor.getNodeId().getValue(),
+                ObjectCreationNotification.QNAME, notification.getTimestamp());
 
         log.debug("onObjectCreationNotification log entry written");
     }
CCSDK Karaf features