Close device handler when it fails to connect

Close RemoteDeviceHandler instance and thus delete operational data
for device from data-store when we failed to establish connection,
for example because of wrong password format used.

JIRA: NETCONF-1114
Change-Id: I9db06595a3867ec04ad30aa76b7a5b21c75b7a8f
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java b/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java
index 43921f32f5add08f4c6a069bafbf8ef342974eea..b7bcc26313e8cac7c7810954210c4ec4f5024b6c 100644 (file)
--- a/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java
+++ b/apps/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java
@@ -130,7 +130,8 @@ public abstract class AbstractNetconfTopology {
         } catch (IllegalArgumentException e) {
             // This is a workaround for NETCONF-1114 where the encrypted password's lexical structure is not enforced
             // in the datastore and it ends up surfacing when we decrypt the password.
-            LOG.warn("RemoteDevice{{}} failed to connect", nodeId, e);
+            LOG.warn("RemoteDevice{{}} failed to connect, removing from operational datastore", nodeId, e);
+            deviceSalFacade.close();
             return;
         }