commit 957390e21a9c8c03c80a1aa4128b9ae1c392450c
author Ray Milkey <ray@onlab.us> Tue Feb 09 10:02:46 2016 -0800
committer Ray Milkey <ray@onlab.us> Tue Feb 09 11:39:54 2016 -0800
tree cc18a3b0deebff07b9ffe06ee88a822bcb6c6897
parent 219f07742e8d6716043aff30f4705748607b218d

Refactored LLDP link discovery to be shared by multiple providers

Change-Id: Ia2253ff6bb39186e936ddbaff0c416aa5be6e117

providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java

diff --git a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
index 2671d93..02d030e 100644
--- a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
+++ b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
@@ -60,6 +60,8 @@
 import org.onosproject.net.packet.PacketService;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
+import org.onosproject.provider.lldpcommon.LinkDiscoveryContext;
+import org.onosproject.provider.lldpcommon.LinkDiscovery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -104,7 +106,7 @@
     // Device link discovery helpers.
     protected final Map<DeviceId, LinkDiscovery> discoverers = new ConcurrentHashMap<>();
 
-    private final DiscoveryContext context = new InternalDiscoveryContext();
+    private final LinkDiscoveryContext context = new InternalDiscoveryContext();
 
     private LinkProviderService providerService;
 
@@ -206,7 +208,7 @@
     /**
      * Provides processing context for the device link discovery helpers.
      */
-    private class InternalDiscoveryContext implements DiscoveryContext {
+    private class InternalDiscoveryContext implements LinkDiscoveryContext {
         @Override
         public MastershipService mastershipService() {
             return masterService;
@@ -234,7 +236,16 @@
 
         @Override
         public void touchLink(LinkKey key) {
-            //linkTimes.put(key, System.currentTimeMillis());
+        }
+
+        @Override
+        public String fingerprint() {
+            return "";
+        }
+
+        @Override
+        public DeviceService deviceService() {
+            return deviceService;
         }
     }