fix connection state machine

fixed state handlers for netconf nodes

Issue-ID: SDNC-1134
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ibd63e84e4cc891a03ef5bd499760804a8cb89e93

3 files changed, 136 insertions, 49 deletions

diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/eventdatahandler/ODLEventListenerHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/eventdatahandler/ODLEventListenerHandler.java
index 37a9750b3..9f1b2b266 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/eventdatahandler/ODLEventListenerHandler.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/eventdatahandler/ODLEventListenerHandler.java
@@ -32,6 +32,7 @@ import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceCl
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.EventHandlingService;
 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.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
@@ -114,6 +115,15 @@ public class ODLEventListenerHandler implements EventHandlingService {
     }
 
     /**
+     * mountpoint created, connection state not connected
+	 * @param mountpointNodeName uuid that is nodeId or mountpointId
+	 * @param netconfNode
+	 */
+	public void mountpointCreatedIndication(String mountpointNodeName, NetconfNode netconfNode) {
+		LOG.debug("mountpoint create indication for {}", mountpointNodeName);
+		this.registration(mountpointNodeName, netconfNode);
+	}
+    /**
      * After registration
      * @param mountpointNodeName uuid that is nodeId or mountpointId
      * @param deviceType according to assessement
@@ -132,7 +142,18 @@ public class ODLEventListenerHandler implements EventHandlingService {
         webSocketService.sendViaWebsockets(mountpointNodeName, notificationXml);
     }
 
-
+    /**
+     * mountpoint state changed
+	 * @param mountpointNodeName
+	 * @param netconfNode
+	 */
+	public void onStateChangeIndication(String mountpointNodeName, NetconfNode netconfNode) {
+		LOG.debug("mountpoint state changed indication for {}", mountpointNodeName);
+		ConnectionStatus csts = netconfNode.getConnectionStatus();
+		this.updateRegistration(mountpointNodeName, ConnectionStatus.class.getSimpleName(),
+                csts != null ? csts.getName() : "null", netconfNode);
+		
+	}
     /**
      * A deregistration of a mountpoint occured.
      * @param registrationName Name of the event that is used as key in the database.
@@ -155,7 +176,6 @@ public class ODLEventListenerHandler implements EventHandlingService {
      * Mountpoint state changed .. from connected -> connecting or unable-to-connect or vis-e-versa.
      * @param registrationName Name of the event that is used as key in the database.
      */
-
     @Override
     public void updateRegistration(String registrationName, String attribute, String attributeNewValue, NetconfNode nNode) {
         AttributeValueChangedNotificationXml notificationXml = new AttributeValueChangedNotificationXml(ownKeyName,
@@ -238,4 +258,8 @@ public class ODLEventListenerHandler implements EventHandlingService {
         return eventNumber++;
     }
 
+	
+
+	
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java
index e1fde7062..d63ff5d09 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java
@@ -23,6 +23,8 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -33,7 +35,9 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.NetworkElementConnectionEntitiyUtil;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.InternalConnectionStatus;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
@@ -104,40 +108,95 @@ public class ConnectionStatusHousekeepingService implements ClusterSingletonServ
             String nodeId;
             if (list == null || list.size() <= 0) {
                 LOG.trace("no items in list.");
-                return;
             }
-            for (NetworkElementConnectionEntity item : list) {
-
-                // compare with MD-SAL
-                nodeId = item.getNodeId();
-                LOG.trace("check status of {}", nodeId);
-                dbStatus = item.getStatus();
-                mdsalStatus = this.getMDSalConnectionStatus(nodeId);
-                if (mdsalStatus == null) {
-                    LOG.trace("unable to get connection status. jump over");
-                    continue;
-                }
-                // if different then update db
-                if (dbStatus != mdsalStatus) {
-                    LOG.trace("status is inconsistent db={}, mdsal={}. updating db", dbStatus, mdsalStatus);
-                    if(!item.isIsRequired() && mdsalStatus==ConnectionLogStatus.Disconnected) {
-                        this.dataProvider.removeNetworkConnection(nodeId);
-                    }
-                    else {
-                    this.dataProvider.updateNetworkConnectionDeviceType(
-                            new NetworkElementConnectionBuilder().setStatus(mdsalStatus).build(), nodeId);
-                    }
-                } else {
-                    LOG.trace("no difference");
-                }
-
+            else {
+	            //check all db entries and sync connection status
+	            for (NetworkElementConnectionEntity item : list) {
+	
+	                // compare with MD-SAL
+	                nodeId = item.getNodeId();
+	                LOG.trace("check status of {}", nodeId);
+	                dbStatus = item.getStatus();
+	                mdsalStatus = this.getMDSalConnectionStatus(nodeId);
+	                if (mdsalStatus == null) {
+	                    LOG.trace("unable to get connection status. jump over");
+	                    continue;
+	                }
+	                // if different then update db
+	                if (dbStatus != mdsalStatus) {
+	                    LOG.trace("status is inconsistent db={}, mdsal={}. updating db", dbStatus, mdsalStatus);
+	                    if((item.isIsRequired()==null || item.isIsRequired()==false) && mdsalStatus==ConnectionLogStatus.Disconnected) {
+	                    	LOG.info("removing entry for node {} ({}) from database due missing MD-SAL entry",item.getNodeId(),mdsalStatus);
+	                        this.dataProvider.removeNetworkConnection(nodeId);
+	                    }
+	                    else {
+	                    this.dataProvider.updateNetworkConnectionDeviceType(
+	                            new NetworkElementConnectionBuilder().setStatus(mdsalStatus).build(), nodeId);
+	                    }
+	                } else {
+	                    LOG.trace("no difference");
+	                }
+	
+	            }
             }
-        } catch (Exception e) {
+			//check all md-sal entries and add non-existing to db
+//			List<Node> mdsalNodes = this.getMDSalNodes();
+//			NodeId nid;
+//			for (Node mdsalNode : mdsalNodes) {
+//				nid = mdsalNode.getNodeId();
+//				if (nid == null) {
+//					continue;
+//				}
+//				nodeId = nid.getValue();
+//				if (nodeId == null) {
+//					continue;
+//				}
+//				if (contains(list, nodeId)) {
+//					LOG.debug("found mountpoint for {} without db entry. creating.",nodeId);
+//					this.dataProvider.updateNetworkConnection22(NetworkElementConnectionEntitiyUtil
+//							.getNetworkConnection(nodeId, mdsalNode.augmentation(NetconfNode.class)), nodeId);
+//				}
+//			}
+
+		} catch (Exception e) {
             LOG.warn("problem executing housekeeping task: {}", e);
         }
         LOG.debug("finish housekeeping");
     }
 
+	/**
+	 * @param list
+	 * @param nodeId
+	 * @return
+	 */
+//	private boolean contains(List<NetworkElementConnectionEntity> list, @NonNull String nodeId) {
+//		if(list==null || list.size()<=0) {
+//			return false;
+//		}
+//		for(NetworkElementConnectionEntity item:list) {
+//			if(item!=null && nodeId.equals(item.getNodeId())) {
+//				return true;
+//			}
+//		}
+//		return false;
+//	}
+//
+//	private List<Node> getMDSalNodes(){
+//    	ReadTransaction trans = this.dataBroker.newReadOnlyTransaction();
+//        FluentFuture<Optional<Topology>> optionalTopology =trans.read(LogicalDatastoreType.OPERATIONAL, NETCONF_TOPO_IID);
+//        List<Node> nodes = new ArrayList<>();
+//        try {
+//        	Topology topo = optionalTopology.get(20, TimeUnit.SECONDS).get();
+//        	List<Node> topoNodes=topo.getNode();
+//        	if(topoNodes!=null){
+//        		nodes.addAll(topoNodes);
+//        	}
+//        }
+//        catch(Exception e) {
+//        	LOG.warn("unable to read netconf topology for housekeeping: {}",e);
+//        }
+//        return nodes;
+//    }
     private ConnectionLogStatus getMDSalConnectionStatus(String nodeId) {
 
         @SuppressWarnings("null")
@@ -173,24 +232,24 @@ public class ConnectionStatusHousekeepingService implements ClusterSingletonServ
         this.scheduler.shutdown();
     }
 
-     @SuppressWarnings("null")
-        @Override
-        public @NonNull ServiceGroupIdentifier getIdentifier() {
-             return IDENT;
-        }
-
-        @Override
-        public void instantiateServiceInstance() {
-            LOG.info("We take Leadership");
-            this.isMaster=true;
-            this.start();
-        }
-
-        @Override
-        public ListenableFuture<? extends Object> closeServiceInstance() {
-            LOG.info("We lost Leadership");
-            this.isMaster=false;
-            this.start();
-            return Futures.immediateFuture(null);
-        }
+	@SuppressWarnings("null")
+	@Override
+	public @NonNull ServiceGroupIdentifier getIdentifier() {
+		return IDENT;
+	}
+
+	@Override
+	public void instantiateServiceInstance() {
+		LOG.info("We take Leadership");
+		this.isMaster = true;
+		this.start();
+	}
+
+	@Override
+	public ListenableFuture<? extends Object> closeServiceInstance() {
+		LOG.info("We lost Leadership");
+		this.isMaster = false;
+		this.start();
+		return Futures.immediateFuture(null);
+	}
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
index 2d64f3745..5f9911ba8 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
@@ -130,11 +130,14 @@ public class DeviceManagerNetconfConnectHandler implements NetconfNodeConnectLis
     @Override
     public void onCreated(NodeId nNodeId, NetconfNode netconfNode) {
         LOG.info("onCreated {}", nNodeId);
+        odlEventListenerHandler.mountpointCreatedIndication(nNodeId.getValue(), netconfNode);
+        
     }
 
     @Override
     public void onStateChange(NodeId nNodeId, NetconfNode netconfNode) {
         LOG.info("onStateChange {}", nNodeId);
+        odlEventListenerHandler.onStateChangeIndication(nNodeId.getValue(),netconfNode);
     }
 
     @Override
@@ -181,6 +184,7 @@ public class DeviceManagerNetconfConnectHandler implements NetconfNodeConnectLis
         if (result != null) {
             LOG.warn("NE list was not empty as expected, but contained {} ", result.getNodeId());
         } else {
+        	LOG.debug("refresh necon entry for {} with type {}",mountPointNodeName,ne.getDeviceType());
             odlEventListenerHandler.connectIndication(mountPointNodeName, ne.getDeviceType());
         }
     }