update websocketmanager

update complete notification flow

Issue-ID: CCSDK-3252
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I87ba00f615707b942471fcace57bcda50ce37e61

5 files changed, 44 insertions, 25 deletions

diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
index 4b3881e0b..c28b9245b 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
@@ -26,7 +26,21 @@ import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 
 public interface NetworkElementFactory {
 
-    Optional<NetworkElement> create(@NonNull NetconfAccessor acessor,
+    /**
+     * Called after connect of device. Decide if devicemanger should be started to manage device.
+     * @param accessor function to access device and get information from mountpoint
+     * @param serviceProvider provides base device manager services.
+     * @return Empty or NetworkElement object
+     */
+    Optional<NetworkElement> create(@NonNull NetconfAccessor accessor,
             @NonNull DeviceManagerServiceProvider serviceProvider);
 
+    /**
+     * Called directly after factory registration to allow initialization
+     * @param serviceProvider provides base device manager services.
+     */
+    default void init(DeviceManagerServiceProvider serviceProvider) {
+    }
+
+
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
index 22a0a1370..163f80839 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
@@ -20,6 +20,7 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.service;
 import org.eclipse.jdt.annotation.NonNull;
 import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.WebsocketManagerService;
 
 public interface DeviceManagerServiceProvider {
 
@@ -31,6 +32,10 @@ public interface DeviceManagerServiceProvider {
     @NonNull
     NotificationService getNotificationService();
 
+    /** @return Get ws notification service **/
+    @NonNull
+    WebsocketManagerService getWebsocketService();
+
     /** @return Get service for handling fault **/
     @NonNull
     FaultService getFaultService();
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
index 10a3aa670..323140191 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
@@ -19,8 +19,8 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.service;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerService;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.EquipmentData;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 
 /**
  * @author herbert
@@ -30,9 +30,10 @@ public interface EquipmentService extends DeviceManagerService {
 
     /**
      * Write equipment to database
-     * 
+     *
+     * @param nodeId
      * @param equipment with all equipment entities (card, subrack) of device
      */
-    void writeEquipment(@NonNull EquipmentData equipment);
+    void writeEquipment(NodeId nodeId, @NonNull EquipmentData equipment);
 
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
index 9a4c89d4a..f414b4b15 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
@@ -18,11 +18,8 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.service;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.FaultData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 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.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 
 /**
@@ -32,27 +29,15 @@ public interface FaultService extends DeviceManagerService {
 
     /**
      * Notify fault information to devicemanager
-     * 
+     *
      * @param faultNotification to send
      */
     void faultNotification(@NonNull FaultlogEntity faultNotification);
 
-    /**
-     * Fault notification
-     * 
-     * @param nodeId of node
-     * @param counter provided
-     * @param timeStamp provided
-     * @param objectId provided
-     * @param problem provided
-     * @param severity provided
-     */
-    void faultNotification(@NonNull NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
-            @Nullable String objectId, @Nullable String problem, @Nullable SeverityType severity);
-
+    //void faultNotification(@NonNull NodeId nodeId,Notification notification, QName type, DateAndTime timeStamp);
     /**
      * Remove current problems of node
-     * 
+     *
      * @param nodeId of node
      * @return number of removed entries
      */
@@ -60,7 +45,7 @@ public interface FaultService extends DeviceManagerService {
 
     /**
      * Write initial list of problems of node
-     * 
+     *
      * @param nodeId of node
      * @param resultList
      */
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
index 5a153a1cc..b249c5008 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
@@ -32,17 +32,26 @@ public interface NotificationService extends DeviceManagerService {
     /** Event notification to devicemanager. Can be change, create or remove indication **/
     void eventNotification(@NonNull EventlogEntity eventNotification);
 
+//    void eventNotification(NodeId nodeId, Notification notification, @NonNull QName qname,
+//            @Nullable DateAndTime timeStamp);
+
     /** create notification for an object **/
     void creationNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
             @Nullable String objectId);
 
-    /** create notification of object **/
+//    void creationNotification(NodeId nodeId, Notification notification, @NonNull QName qname,
+//            @Nullable DateAndTime timeStamp);
+
+    /** delete notification of object **/
     void deletionNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
             @Nullable String objectId);
 
+//    void deletionNotification(NodeId nodeId, Notification notification, @NonNull QName qname,
+//            @Nullable DateAndTime timeStamp);
+
     /**
      * change notification of attribute of object
-     * 
+     *
      * @param nodeId of device
      * @param counter provided
      * @param timeStamp provided
@@ -53,4 +62,9 @@ public interface NotificationService extends DeviceManagerService {
     void changeNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
             @Nullable String objectId, @Nullable String attributeName, @Nullable String newValue);
 
+//    void changeNotification(NodeId nodeId, Notification notification, @NonNull QName qname,
+//            @Nullable DateAndTime timeStamp);
+
+
+
 }