Enhancements for hosts behing trunks

- Allow to skip dot1Q if present
- Allow to dispatch only to container if there is a match else pass to default

Change-Id: I58c0a11e0e499f2f531f72b803863cf8f996867f
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
index e5491824397c1678b26b819b4e2691d0295f95a6..db94a7c86734888b47c4e9c80071e5a2194e460e 100644 (file)
--- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
+++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
@@ -51,6 +51,7 @@ import org.opendaylight.controller.sal.packet.Ethernet;
 import org.opendaylight.controller.sal.packet.IDataPacketService;
 import org.opendaylight.controller.sal.packet.IListenDataPacket;
 import org.opendaylight.controller.sal.packet.IPv4;
 import org.opendaylight.controller.sal.packet.IDataPacketService;
 import org.opendaylight.controller.sal.packet.IListenDataPacket;
 import org.opendaylight.controller.sal.packet.IPv4;

+import org.opendaylight.controller.sal.packet.IEEE8021Q;

 import org.opendaylight.controller.sal.packet.Packet;
 import org.opendaylight.controller.sal.packet.PacketResult;
 import org.opendaylight.controller.sal.packet.RawPacket;
 import org.opendaylight.controller.sal.packet.Packet;
 import org.opendaylight.controller.sal.packet.PacketResult;
 import org.opendaylight.controller.sal.packet.RawPacket;


@@ -654,6 +655,10 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA
         Packet formattedPak = this.dataPacketService.decodeDataPacket(inPkt);
         if (formattedPak instanceof Ethernet) {
             Object nextPak = formattedPak.getPayload();
         Packet formattedPak = this.dataPacketService.decodeDataPacket(inPkt);
         if (formattedPak instanceof Ethernet) {
             Object nextPak = formattedPak.getPayload();

+            if (nextPak instanceof IEEE8021Q) {
+                log.trace("Moved after the dot1Q header");
+                nextPak = ((IEEE8021Q) nextPak).getPayload();
+            }

             if (nextPak instanceof IPv4) {
                 log.trace("Handle IP packet: {}", formattedPak);
                 handlePuntedIPPacket((IPv4) nextPak, inPkt.getIncomingNodeConnector());
             if (nextPak instanceof IPv4) {
                 log.trace("Handle IP packet: {}", formattedPak);
                 handlePuntedIPPacket((IPv4) nextPak, inPkt.getIncomingNodeConnector());

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java
index 54d5fb888a268ab25ca508498069ff3d2811acd6..932ac4e20be37f8d5ea1234265054209ceda120f 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java
@@ -212,17 +212,8 @@ public class DataPacketMuxDemux implements IContainerListener,
                     }
                 }
 
                     }
                 }
 

-                // Now dispatch the packet toward SAL for default container
-                IPluginOutDataPacketService defaultOutService = this.pluginOutDataPacketServices
-                        .get(GlobalConstants.DEFAULT.toString());
-                if (defaultOutService != null) {
-                    defaultOutService.receiveDataPacket(dataPacket);
-                    if (logger.isTraceEnabled()) {
-                        logger.trace("Dispatched to apps a frame of size: {} on " + "container: {}: {}",
-                                new Object[] { ofPacket.getPacketData().length, GlobalConstants.DEFAULT.toString(),
-                                        HexEncode.bytesToHexString(dataPacket.getPacketData()) });
-                    }
-                }
+                boolean dispatched_to_container = false;
+

                 // Now check the mapping between nodeConnector and
                 // Container and later on optimally filter based on
                 // flowSpec
                 // Now check the mapping between nodeConnector and
                 // Container and later on optimally filter based on
                 // flowSpec


@@ -254,10 +245,25 @@ public class DataPacketMuxDemux implements IContainerListener,
                                                         HexEncode.bytesToHexString(dataPacket.getPacketData()) });
                                     }
                                 }
                                                         HexEncode.bytesToHexString(dataPacket.getPacketData()) });
                                     }
                                 }

+                                dispatched_to_container = true;

                             }
                         }
                     }
                 }
                             }
                         }
                     }
                 }

+                if (!dispatched_to_container) {
+                    // Now dispatch the packet toward SAL for default container
+                    IPluginOutDataPacketService defaultOutService = this.pluginOutDataPacketServices
+                        .get(GlobalConstants.DEFAULT.toString());
+                    if (defaultOutService != null) {
+                        defaultOutService.receiveDataPacket(dataPacket);
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("Dispatched to apps a frame of size: {} on " + "container: {}: {}",
+                                         new Object[] { ofPacket.getPacketData().length,
+                                                        GlobalConstants.DEFAULT.toString(),
+                                                        HexEncode.bytesToHexString(dataPacket.getPacketData()) });
+                        }
+                    }
+                }

                 // This is supposed to be the catch all for all the
                 // DataPacket hence we will assume it has been handled
                 return;
                 // This is supposed to be the catch all for all the
                 // DataPacket hence we will assume it has been handled
                 return;