commit 8d30b616b4a40bdd1c5393ba73f26b53ff053556
author Palash Kala <palash.kala@samsung.com> Fri Mar 02 11:06:10 2018 +0900
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue Mar 06 02:27:50 2018 +0000
tree f84f94f90d2f2b7342c406196649b624827aafbb
parent 78885a22402441ca2c6ed413cdc385bf38b40260

[ONOS-7509] deviceDisconnected method in Device Manager uses ports description information

Change-Id: Id32fc7f0d35382158e2d06fa71cc6d75b856018b

core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 7f593e7..818f0583 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -660,6 +660,7 @@
 
                 final Port oldPort = ports.get(number);
                 final Port newPort;
+                boolean isRemoved = portDescription.isRemoved();
 
 
                 final Timestamped<PortDescription> existingPortDesc = descs.getPortDesc(number);
@@ -675,9 +676,13 @@
                     continue;
                 }
 
-                events.add(oldPort == null ?
-                                   createPort(device, newPort, ports) :
-                                   updatePort(device, oldPort, newPort, ports));
+                if (isRemoved && oldPort != null) {
+                    events.add(removePort(deviceId, oldPort.number()));
+                } else if (!isRemoved) {
+                    events.add(oldPort == null ?
+                                       createPort(device, newPort, ports) :
+                                       updatePort(device, oldPort, newPort, ports));
+                }
             }
 
             events.addAll(pruneOldPorts(device, ports, processed));