commit f91dbea8e6cdd86645bed844b3ca6f8e802b6467
author Charles M.C. Chan <rascov@gmail.com> Mon Jan 12 18:46:34 2015 +0800
committer Pavlin Radoslavov <pavlin@onlab.us> Sat Jan 17 00:49:11 2015 +0000
tree 8d8136f90b38ef04f0c943c31e05218a6d6e0c18
parent 86a6ca43d4b6d75b8acd53a10208b3e90bba7012

ONOS-537 Provided maxLen setting to make sure packet data is sent with packet-in message. (OF1.3)

Apply Thomas Vachuska's solution of ONOS-537 (#2177) to FlowModBuilderVer13.
This solves the exception mentioned in the comment of ONOS-540.
Tested with OpenvSwitch 2.3.0 in Mininet 2.2.0.

Change-Id: Ia6680c0403577053948c4ede3b3e8b5b846495be

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index 9a90388..c351e1b 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.instructions.Instruction;
@@ -41,6 +42,7 @@
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.OFFlowModFlags;
 import org.projectfloodlight.openflow.protocol.action.OFAction;
+import org.projectfloodlight.openflow.protocol.action.OFActionOutput;
 import org.projectfloodlight.openflow.protocol.match.Match;
 import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
 import org.projectfloodlight.openflow.types.CircuitSignalID;
@@ -62,6 +64,7 @@
 public class FlowModBuilderVer13 extends FlowModBuilder {
 
     private static final Logger log = LoggerFactory.getLogger(FlowModBuilderVer10.class);
+    private static final int OFPCML_NO_BUFFER = 0xffff;
 
     private final TrafficTreatment treatment;
 
@@ -174,8 +177,12 @@
                 break;
             case OUTPUT:
                 OutputInstruction out = (OutputInstruction) i;
-                actions.add(factory().actions().buildOutput().setPort(
-                        OFPort.of((int) out.port().toLong())).build());
+                OFActionOutput.Builder action = factory().actions().buildOutput()
+                        .setPort(OFPort.of((int) out.port().toLong()));
+                if (out.port().equals(PortNumber.CONTROLLER)) {
+                    action.setMaxLen(OFPCML_NO_BUFFER);
+                }
+                actions.add(action.build());
                 break;
             case GROUP:
             default: