ONOS-3578 Removing netconf device from ONOS core

Change-Id: Ib3165ec26d598ce2f10216a2982dae2cebd539e9

@@ -27,6 +27,8 @@ import org.onosproject.netconf.NetconfDevice;
 import org.onosproject.netconf.NetconfDeviceFactory;
 import org.onosproject.netconf.NetconfDeviceFactory;
 import org.onosproject.netconf.NetconfDeviceInfo;
 import org.onosproject.netconf.NetconfDeviceInfo;
 import org.onosproject.netconf.NetconfDeviceListener;
 import org.onosproject.netconf.NetconfDeviceListener;
+import org.onosproject.netconf.NetconfDeviceOutputEvent;
+import org.onosproject.netconf.NetconfDeviceOutputEventListener;
 import org.onosproject.netconf.NetconfException;
 import org.onosproject.netconf.NetconfException;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -49,6 +51,8 @@ public class NetconfControllerImpl implements NetconfController {
 
 
     private Map<DeviceId, NetconfDevice> netconfDeviceMap = new ConcurrentHashMap<>();
     private Map<DeviceId, NetconfDevice> netconfDeviceMap = new ConcurrentHashMap<>();
 
 
+    private final NetconfDeviceOutputEventListener downListener = new DeviceDownEventListener();
+
     protected Set<NetconfDeviceListener> netconfDeviceListeners = new CopyOnWriteArraySet<>();
     protected Set<NetconfDeviceListener> netconfDeviceListeners = new CopyOnWriteArraySet<>();
     protected NetconfDeviceFactory deviceFactory = new DefaultNetconfDeviceFactory();
     protected NetconfDeviceFactory deviceFactory = new DefaultNetconfDeviceFactory();
 
 
@@ -97,7 +101,9 @@ public class NetconfControllerImpl implements NetconfController {
             return netconfDeviceMap.get(deviceInfo.getDeviceId());
             return netconfDeviceMap.get(deviceInfo.getDeviceId());
         } else {
         } else {
             log.info("Creating NETCONF device {}", deviceInfo);
             log.info("Creating NETCONF device {}", deviceInfo);
-            return createDevice(deviceInfo);
+            NetconfDevice device = createDevice(deviceInfo);
+            device.getSession().addDeviceOutputListener(downListener);
+            return device;
         }
         }
     }
     }
 
 
@@ -140,4 +146,21 @@ public class NetconfControllerImpl implements NetconfController {
             return new DefaultNetconfDevice(netconfDeviceInfo);
             return new DefaultNetconfDevice(netconfDeviceInfo);
         }
         }
     }
     }
+
+    //Listener for closed session with devices, gets triggered whe devices goes down
+    // or sends the endpattern ]]>]]>
+    private class DeviceDownEventListener implements NetconfDeviceOutputEventListener {
+
+        @Override
+        public void event(NetconfDeviceOutputEvent event) {
+            if (event.type().equals(NetconfDeviceOutputEvent.Type.DEVICE_UNREGISTERED)) {
+                removeDevice(event.getDeviceInfo());
+            }
+        }
+
+        @Override
+        public boolean isRelevant(NetconfDeviceOutputEvent event) {
+            return getDevicesMap().containsKey(event.getDeviceInfo().getDeviceId());
+        }
+    }
 }
 }

@@ -136,7 +136,7 @@ public class NetconfDeviceProvider extends AbstractProvider
     public boolean isReachable(DeviceId deviceId) {
     public boolean isReachable(DeviceId deviceId) {
         NetconfDevice netconfDevice = controller.getNetconfDevice(deviceId);
         NetconfDevice netconfDevice = controller.getNetconfDevice(deviceId);
         if (netconfDevice == null) {
         if (netconfDevice == null) {
-            log.warn("BAD REQUEST: the requested device id: "
+            log.debug("Requested device id: "
                              + deviceId.toString()
                              + deviceId.toString()
                              + "  is not associated to any NETCONF Device");
                              + "  is not associated to any NETCONF Device");
             return false;
             return false;