X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Ftopology-lldp-discovery%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ftopology%2Flldp%2FLLDPDiscoveryListener.java;h=08c3c9c4a9b196cb47517fbca2aafe7493efbb9e;hb=27a4314a19491672dcb76c7300c3c4087ed1effa;hp=10acfcbd8438130430fdf767987fa06f1b1fb589;hpb=a99eab3e4e25d57cb9f7a548646196ff91fc5fc1;p=openflowplugin.git

diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
index 10acfcbd84..08c3c9c4a9 100644
--- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
+++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.openflowplugin.applications.topology.lldp;
 
+import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.openflowplugin.applications.topology.lldp.utils.LLDPDiscoveryUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkDiscovered;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkDiscoveredBuilder;
@@ -17,25 +18,29 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 class LLDPDiscoveryListener implements PacketProcessingListener {
-    static Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryListener.class);
 
-    private LLDPDiscoveryProvider manager;
+    private LLDPLinkAger lldpLinkAger;
+    private NotificationProviderService notificationService;
 
-    LLDPDiscoveryListener(LLDPDiscoveryProvider manager) {
-        this.manager = manager;
+    LLDPDiscoveryListener(NotificationProviderService notificationService) {
+        this.notificationService = notificationService;
     }
 
     public void onPacketReceived(PacketReceived lldp) {
-        NodeConnectorRef src = LLDPDiscoveryUtils.lldpToNodeConnectorRef(lldp.getPayload());
+        NodeConnectorRef src = LLDPDiscoveryUtils.lldpToNodeConnectorRef(lldp.getPayload(), true);
         if(src != null) {
             LinkDiscoveredBuilder ldb = new LinkDiscoveredBuilder();
             ldb.setDestination(lldp.getIngress());
             ldb.setSource(new NodeConnectorRef(src));
             LinkDiscovered ld = ldb.build();
 
-            manager.getNotificationService().publish(ld);
-            LLDPLinkAger.getInstance().put(ld);
+            notificationService.publish(ld);
+            lldpLinkAger.put(ld);
         }
     }
 
+    public void setLldpLinkAger(LLDPLinkAger lldpLinkAger) {
+        this.lldpLinkAger = lldpLinkAger;
+    }
 }