Added some more test cases for java, that use the new Match API of version 1.3 (OXMs)
diff --git a/test_data/of13/packet_in.data b/test_data/of13/packet_in.data
index 6edc12e..1ec0422 100644
--- a/test_data/of13/packet_in.data
+++ b/test_data/of13/packet_in.data
@@ -9,10 +9,10 @@
fe dc ba 98 76 54 32 10 # cookie
00 01 # match.type
00 16 # match.length
-80 00 01 08 # match.oxm_list[0].type_len
+80 00 01 08 # match.oxm_list[0].type_len - Input Port
00 00 00 04 # match.oxm_list[0].value
00 00 00 05 # match.oxm_list[0].mask
-80 00 2A 02 # match.oxm_list[1].type_len
+80 00 2A 02 # match.oxm_list[1].type_len - ARP OpCode
00 01 # match.oxm_list[1].value
00 00 # match.pad
00 00 # pad
@@ -26,12 +26,11 @@
table_id=20,
cookie=0xFEDCBA9876543210,
match=ofp.match(oxm_list=[
- ofp.oxm.in_port_masked(value=4, value_mask=5)]),
- ofp.oxm.arp_op(value=1),
+ ofp.oxm.in_port_masked(value=4, value_mask=5),
+ ofp.oxm.arp_op(value=1)
+ ]),
data="abc")
-- java
-OFOxms oxms = factory.oxms();
-
builder
.setXid(0x12345678)
.setBufferId(100)
@@ -40,12 +39,10 @@
.setTableId((byte) 20)
.setCookie(U64.parseHex("FEDCBA9876543210"))
.setMatch(
- factory.buildMatchV3().setOxmList(
- OFOxmList.of(
- oxms.inPortMasked(OFPort.of(4), OFPort.of(5)),
- oxms.arpOp(ArpOpcode.ARP_OPCODE_REQUEST)
- )
- ).build()
+ factory.buildMatchV3()
+ .setMasked(MatchField.IN_PORT, OFPort.of(4), OFPort.of(5))
+ .setExact(MatchField.ARP_OP, ArpOpcode.ARP_OPCODE_REQUEST)
+ .build()
)
.setData(new byte[] { 97, 98, 99 } );