diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java index 3e43b6c527ebe786e641d6a891ecf429369ddc0b..c4421acfcf4971431da1efa0f5686df4871cf54f 100644 --- a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java +++ b/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 diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java index 18a5fd7d2e92cad9c531c7063c7e0e88c65b0a7c..b818e8f7b848be108218c92c1b007bbc68e8ed16 100644 --- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java +++ b/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; diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java b/src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java index 8fe1ff046f192cd0bcded0792a0bbf3a7030a737..1c44848b9425b4c109950c7e9f8b364910ac28a2 100644 --- a/src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java +++ b/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); } }