Fix for BUG 3623

Remove entry in dpn-endpoint map when tunnel interface is deleted

Change-Id: If7747ce9f9d1a2465d62e1f563ec1fdd4e39d422
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
(cherry picked from commit 3bdb8284ba3a5b811ea19e6aa1f905b02a139605)

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
index 1543b57a621d66ef426ca1a543a41206f2317bf7..0f75bb6b1705398f5de1d312e7570a9cb8e44bbf 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
@@ -281,11 +281,9 @@ public class InterfaceManager extends AbstractDataChangeListener<Interface> impl
             if(ncId != null) {
                 mapNcToInterfaceName.remove(ncId);
                 if(delInterface.getType().isAssignableFrom(L3tunnel.class)) {
-                    Node node = getNodeFromDataStore(delInterface);
-                    if((node != null) &&(node.getNodeConnector().isEmpty())) {
-                        dbDpnEndpoints.remove(node.getId());
-                        LOG.trace("dbDpnEndpoints: {}",dbDpnEndpoints);
-                    }
+                    NodeId nodeId = getNodeIdFromNodeConnectorId(ncId);
+                    dbDpnEndpoints.remove(nodeId);
+                    LOG.trace("dbDpnEndpoints: {}",dbDpnEndpoints);
                 }
             }
         }