diff --git a/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json index 99c65f83..c723d766 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json @@ -4,7 +4,9 @@ "cookie_mask": 0, "flags": 0, "match": { - "OFPMatch": {} + "OFPMatch": { + "oxm_fields": [] + } }, "out_group": 4294967295, "out_port": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json index 534b54e0..72e5be7c 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json @@ -11,7 +11,9 @@ "idle_timeout": 0, "instructions": [], "match": { - "OFPMatch": {} + "OFPMatch": { + "oxm_fields": [] + } }, "packet_count": 0, "priority": 65535, @@ -43,7 +45,15 @@ ], "match": { "OFPMatch": { - "eth_type": 2054 + "oxm_fields": [ + { + "OXMTlv": { + "field": "eth_type", + "mask": null, + "value": 2054 + } + } + ] } }, "packet_count": 0, @@ -68,8 +78,22 @@ ], "match": { "OFPMatch": { - "eth_src": "f2:0b:a4:7d:f8:ea", - "in_port": 6 + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 6 + } + }, + { + "OXMTlv": { + "field": "eth_src", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + } + ] } }, "packet_count": 3, @@ -101,7 +125,9 @@ } ], "match": { - "OFPMatch": {} + "OFPMatch": { + "oxm_fields": [] + } }, "packet_count": 1, "priority": 0, diff --git a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json index 07b57661..3f3b0968 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json @@ -24,7 +24,15 @@ ], "match": { "OFPMatch": { - "eth_dst": "f2:0b:a4:7d:f8:ea" + "oxm_fields": [ + { + "OXMTlv": { + "field": "eth_dst", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + } + ] } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json index 48193b2c..d09f5327 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json @@ -4,7 +4,9 @@ "cookie_mask": 0, "flags": 0, "match": { - "OFPMatch": {} + "OFPMatch": { + "oxm_fields": [] + } }, "out_group": 4294967295, "out_port": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json index 3ac3c2e2..55ff1651 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json @@ -16,8 +16,22 @@ ], "match": { "OFPMatch": { - "eth_src": "f2:0b:a4:7d:f8:ea", - "in_port": 6 + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 6 + } + }, + { + "OXMTlv": { + "field": "eth_src", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + } + ] } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json index 62906afb..3f60b488 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json @@ -4,15 +4,71 @@ "data": "////////8gukffjqCAYAAQgABgQAAfILpH346goAAAEAAAAAAAAKAAAD", "match": { "OFPMatch": { - "arp_op": 1, - "arp_sha": "f2:0b:a4:7d:f8:ea", - "arp_spa": "10.0.0.1", - "arp_tha": "00:00:00:00:00:00", - "arp_tpa": "10.0.0.3", - "eth_dst": "ff:ff:ff:ff:ff:ff", - "eth_src": "f2:0b:a4:7d:f8:ea", - "eth_type": 2054, - "in_port": 6 + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 6 + } + }, + { + "OXMTlv": { + "field": "eth_type", + "mask": null, + "value": 2054 + } + }, + { + "OXMTlv": { + "field": "eth_dst", + "mask": null, + "value": "ff:ff:ff:ff:ff:ff" + } + }, + { + "OXMTlv": { + "field": "eth_src", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + }, + { + "OXMTlv": { + "field": "arp_op", + "mask": null, + "value": 1 + } + }, + { + "OXMTlv": { + "field": "arp_spa", + "mask": null, + "value": "10.0.0.1" + } + }, + { + "OXMTlv": { + "field": "arp_tpa", + "mask": null, + "value": "10.0.0.3" + } + }, + { + "OXMTlv": { + "field": "arp_sha", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + }, + { + "OXMTlv": { + "field": "arp_tha", + "mask": null, + "value": "00:00:00:00:00:00" + } + } + ] } }, "reason": 1, diff --git a/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json index 0dc91f26..3edd7395 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json @@ -8,7 +8,15 @@ "idle_timeout": 3, "match": { "OFPMatch": { - "eth_dst": "f2:0b:a4:7d:f8:ea" + "oxm_fields": [ + { + "OXMTlv": { + "field": "eth_dst", + "mask": null, + "value": "f2:0b:a4:7d:f8:ea" + } + } + ] } }, "packet_count": 1,