Edges are left in TopologyManager database when nodes disconnect

When nodes are disconnected from ODL Controller, some edges are left
in TopologyManager's database. As a result GUI (and possibly REST APIs0
still shows some switches to be connected even when there are no
switches connected to the controller.

Change-Id: Ia4a5ae0160b07ba0207bf763dbc234e34dcf5816
Signed-off-by: Maurice Qureshi <maquresh@cisco.com>

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
index 548bfb1f9fb26eb93ab4ca5bcd456d9bdc4082c3..fc668b3f4d0f1a1f01bb3a9b096b6bc7440515c0 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
@@ -945,7 +945,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa
         if (!src.getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)) {
             if (type == UpdateType.ADDED) {
                 edgeMap.put(dst, edge);
         if (!src.getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)) {
             if (type == UpdateType.ADDED) {
                 edgeMap.put(dst, edge);

-            } else {
+            } else if (type == UpdateType.REMOVED) {

                 edgeMap.remove(dst);
             }
         } else {
                 edgeMap.remove(dst);
             }
         } else {


@@ -954,7 +954,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa
              */
             if (type == UpdateType.ADDED) {
                 prodMap.put(dst, edge);
              */
             if (type == UpdateType.ADDED) {
                 prodMap.put(dst, edge);

-            } else {
+            } else if (type == UpdateType.REMOVED) {

                 prodMap.remove(dst);
             }
         }
                 prodMap.remove(dst);
             }
         }