ONOS-2812 Refactored the link code in search of a defect; the root cause was old…

… OVS-based switch which is wrongly forwarding LLDP frames.

ONOS can fix this later by tracking links to be pruned using port pairs.

Change-Id: Ia79ec69946daff80636f5ab4b75a3dcdba91465d

@@ -275,6 +275,10 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
         packetService.cancelPackets(selector.build(), PacketPriority.CONTROL, appId);
         packetService.cancelPackets(selector.build(), PacketPriority.CONTROL, appId);
     }
     }
 
 
+    private LinkDiscovery createLinkDiscovery(Device device) {
+        return new LinkDiscovery(device, packetService, masterService,
+                                 providerService, useBDDP);
+    }
 
 
     private class InternalRoleListener implements MastershipListener {
     private class InternalRoleListener implements MastershipListener {
 
 
@@ -297,11 +301,8 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
             synchronized (discoverers) {
             synchronized (discoverers) {
                 if (!discoverers.containsKey(deviceId)) {
                 if (!discoverers.containsKey(deviceId)) {
                     // ideally, should never reach here
                     // ideally, should never reach here
-                    log.debug("Device mastership changed ({}) {}",
-                              event.type(), deviceId);
-                    discoverers.put(deviceId, new LinkDiscovery(device,
-                                                                packetService, masterService, providerService,
-                                                                useBDDP));
+                    log.debug("Device mastership changed ({}) {}", event.type(), deviceId);
+                    discoverers.put(deviceId, createLinkDiscovery(device));
                 }
                 }
             }
             }
         }
         }
@@ -331,15 +332,11 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
                                 log.debug("LinkDiscovery from {} disabled by configuration", device.id());
                                 log.debug("LinkDiscovery from {} disabled by configuration", device.id());
                                 return;
                                 return;
                             }
                             }
-                            log.debug("Device added ({}) {}", event.type(),
-                                      deviceId);
-                            discoverers.put(deviceId, new LinkDiscovery(device,
-                                                                        packetService, masterService,
-                                                                        providerService, useBDDP));
+                            log.debug("Device added ({}) {}", event.type(), deviceId);
+                            discoverers.put(deviceId, createLinkDiscovery(device));
                         } else {
                         } else {
                             if (ld.isStopped()) {
                             if (ld.isStopped()) {
-                                log.debug("Device restarted ({}) {}", event.type(),
-                                          deviceId);
+                                log.debug("Device restarted ({}) {}", event.type(), deviceId);
                                 ld.start();
                                 ld.start();
                             }
                             }
                         }
                         }
@@ -363,15 +360,13 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
                         }
                         }
                     } else {
                     } else {
                         log.debug("Port down {}", port);
                         log.debug("Port down {}", port);
-                        ConnectPoint point = new ConnectPoint(deviceId,
-                                                              port.number());
+                        ConnectPoint point = new ConnectPoint(deviceId, port.number());
                         providerService.linksVanished(point);
                         providerService.linksVanished(point);
                     }
                     }
                     break;
                     break;
                 case PORT_REMOVED:
                 case PORT_REMOVED:
                     log.debug("Port removed {}", port);
                     log.debug("Port removed {}", port);
-                    ConnectPoint point = new ConnectPoint(deviceId,
-                                                          port.number());
+                    ConnectPoint point = new ConnectPoint(deviceId, port.number());
                     providerService.linksVanished(point);
                     providerService.linksVanished(point);
 
 
                     break;
                     break;
@@ -411,8 +406,7 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
             if (context == null) {
             if (context == null) {
                 return;
                 return;
             }
             }
-            LinkDiscovery ld = discoverers.get(
-                    context.inPacket().receivedFrom().deviceId());
+            LinkDiscovery ld = discoverers.get(context.inPacket().receivedFrom().deviceId());
             if (ld == null) {
             if (ld == null) {
                 return;
                 return;
             }
             }
@@ -441,8 +435,7 @@ public class LLDPLinkProvider extends AbstractProvider implements LinkProvider {
                     synchronized (discoverers) {
                     synchronized (discoverers) {
                         LinkDiscovery discoverer = discoverers.get(did);
                         LinkDiscovery discoverer = discoverers.get(did);
                         if (discoverer == null) {
                         if (discoverer == null) {
-                            discoverer = new LinkDiscovery(dev, packetService,
-                                    masterService, providerService, useBDDP);
+                            discoverer = createLinkDiscovery(dev);
                             discoverers.put(did, discoverer);
                             discoverers.put(did, discoverer);
                         }
                         }