ONOS-7077 Openflow 1.5 OXS and stat trigger support
Change-Id: I006bcd3d8eac451a780c7e5c69a12298ead14281
diff --git a/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java b/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java
index 0eb0c04..c5e2a87 100644
--- a/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java
+++ b/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java
@@ -40,6 +40,7 @@
import org.onosproject.openflow.controller.PacketListener;
import org.projectfloodlight.openflow.protocol.OFPacketOut;
import org.projectfloodlight.openflow.protocol.OFPortDesc;
+import org.projectfloodlight.openflow.protocol.OFVersion;
import org.projectfloodlight.openflow.protocol.action.OFAction;
import org.projectfloodlight.openflow.protocol.ver10.OFFactoryVer10;
import org.projectfloodlight.openflow.types.OFBufferId;
@@ -136,12 +137,14 @@
.buildOutput()
.setPort(out)
.build();
- return builder
- .setBufferId(OFBufferId.NO_BUFFER)
- .setInPort(OFPort.CONTROLLER)
+ builder.setBufferId(OFBufferId.NO_BUFFER)
.setActions(Collections.singletonList(act))
- .setData(eth)
- .build();
+ .setData(eth);
+ if (sw.factory().getVersion().getWireVersion() <= OFVersion.OF_14.getWireVersion()) {
+ builder.setInPort(OFPort.CONTROLLER);
+ }
+
+ return builder.build();
}
/**