Update the ILinkDiscovery service method to include link and linkinfo to get the link type.

src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java

@@ -37,7 +37,7 @@ public interface ILinkDiscoveryService extends IFloodlightService {
      * @param info
      * @return
      */
-    public ILinkDiscovery.LinkType getLinkType(LinkInfo info);
+    public ILinkDiscovery.LinkType getLinkType(Link lt, LinkInfo info);
 
     /**
      * Returns an unmodifiable map from switch id to a set of all links with it 

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -740,17 +740,6 @@ IFloodlightModule, IInfoProvider, IHAListener {
         else return UpdateOperation.PORT_DOWN;
     }
 
-    @Override
-    public LinkType getLinkType(LinkInfo info) {
-
-        if (info.getUnicastValidTime() != null)
-            return LinkType.DIRECT_LINK;
-        else if (info.getMulticastValidTime() != null)
-            return LinkType.MULTIHOP_LINK;
-
-        return LinkType.INVALID_LINK;
-    }
-
     protected boolean addOrUpdateLink(Link lt, LinkInfo newInfo) {
 
         NodePortTuple srcNpt, dstNpt;

src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java

@@ -25,7 +25,7 @@ public class LinksResource extends ServerResource {
             links.putAll(ld.getLinks());
             for (Link link: links.keySet()) {
                 LinkInfo info = links.get(link);
-                LinkWithType lwt = new LinkWithType(link, ld.getLinkType(info));
+                LinkWithType lwt = new LinkWithType(link, ld.getLinkType(link, info));
                 returnLinkSet.add(lwt);
             }
         }