update from master Merge remote-tracking branch 'bigswitch/master'

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

+package net.floodlightcontroller.linkdiscovery.web;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery.LinkType;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.LinkInfo;
+import net.floodlightcontroller.routing.Link;
+
+import org.restlet.resource.Get;
+import org.restlet.resource.ServerResource;
+
+public class ExternalLinksResource extends ServerResource {
+
+    @Get("json")
+    public Set<LinkWithType> retrieve() {
+        ILinkDiscoveryService ld = (ILinkDiscoveryService)getContext().getAttributes().
+                get(ILinkDiscoveryService.class.getCanonicalName());
+        Map<Link, LinkInfo> links = new HashMap<Link, LinkInfo>();
+        Set<LinkWithType> returnLinkSet = new HashSet<LinkWithType>();
+
+        if (ld != null) {
+            links.putAll(ld.getLinks());
+            for (Link link: links.keySet()) {
+                LinkInfo info = links.get(link);
+                LinkType type = ld.getLinkType(link, info);
+                if (type == LinkType.MULTIHOP_LINK) {
+                    LinkWithType lwt = new LinkWithType(link,
+                                                        info.getSrcPortState(),
+                                                        info.getDstPortState(),
+                                                        type);
+
+                    returnLinkSet.add(lwt);
+                }
+            }
+        }
+        return returnLinkSet;
+    }
+}

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

@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery.LinkType;
 import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.floodlightcontroller.linkdiscovery.LinkInfo;
 import net.floodlightcontroller.routing.Link;
@@ -25,11 +26,14 @@ public class LinksResource extends ServerResource {
             links.putAll(ld.getLinks());
             for (Link link: links.keySet()) {
                 LinkInfo info = links.get(link);
+                LinkType type = ld.getLinkType(link, info);
                 LinkWithType lwt = new LinkWithType(link,
                                                     info.getSrcPortState(),
                                                     info.getDstPortState(),
-                                                    ld.getLinkType(link, info));
-                returnLinkSet.add(lwt);
+                                                    type);
+
+                if (type == LinkType.DIRECT_LINK || type == LinkType.TUNNEL)
+                    returnLinkSet.add(lwt);
             }
         }
         return returnLinkSet;

src/main/java/net/floodlightcontroller/topology/web/TopologyWebRoutable.java

@@ -3,6 +3,7 @@ package net.floodlightcontroller.topology.web;
 import org.restlet.Context;
 import org.restlet.routing.Router;
 
+import net.floodlightcontroller.linkdiscovery.web.ExternalLinksResource;
 import net.floodlightcontroller.linkdiscovery.web.LinksResource;
 import net.floodlightcontroller.restserver.RestletRoutable;
 
@@ -14,6 +15,7 @@ public class TopologyWebRoutable implements RestletRoutable {
     public Router getRestlet(Context context) {
         Router router = new Router(context);
         router.attach("/links/json", LinksResource.class);
+        router.attach("/external-links/json", ExternalLinksResource.class);
         router.attach("/tunnellinks/json", TunnelLinksResource.class);
         router.attach("/switchclusters/json", SwitchClustersResource.class);
         router.attach("/broadcastdomainports/json", BroadcastDomainPortsResource.class);

src/main/java/org/openflow/protocol/OFPacketOut.java

@@ -24,6 +24,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
 import org.openflow.protocol.action.OFAction;
 import org.openflow.protocol.factory.OFActionFactory;
 import org.openflow.protocol.factory.OFActionFactoryAware;
+import org.openflow.util.HexString;
 import org.openflow.util.U16;
 
 /**
@@ -235,6 +236,6 @@ public class OFPacketOut extends OFMessage implements OFActionFactoryAware {
         return "OFPacketOut [actionFactory=" + actionFactory + ", actions="
                 + actions + ", actionsLength=" + actionsLength + ", bufferId=0x"
                 + Integer.toHexString(bufferId) + ", inPort=" + inPort + ", packetData="
-                + Arrays.toString(packetData) + "]";
+                + HexString.toHexString(packetData) + "]";
     }
 }