diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-09-02 15:06:14 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-02 19:41:38 +0900 |
| commit | d388d994c9a2499541d0d6fe6d3f583a342f3abe (patch) | |
| tree | 01bfbc077aefd5e0cbc2dba4bc117d2edcfa66d1 | |
| parent | ab19de6a8c3fd0456c358133199f501d24d43f58 (diff) | |
of13: update *.json after OFPMatch "type" and "length" changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
8 files changed, 33 insertions, 11 deletions
diff --git a/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json index c723d766..d12cac71 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json @@ -5,7 +5,9 @@ "flags": 0, "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json index 156d2208..7b4603a5 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json @@ -13,7 +13,9 @@ "instructions": [], "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "packet_count": 0, @@ -50,6 +52,7 @@ ], "match": { "OFPMatch": { + "length": 10, "oxm_fields": [ { "OXMTlv": { @@ -58,7 +61,8 @@ "value": 2054 } } - ] + ], + "type": 1 } }, "packet_count": 0, @@ -86,6 +90,7 @@ ], "match": { "OFPMatch": { + "length": 22, "oxm_fields": [ { "OXMTlv": { @@ -101,7 +106,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "packet_count": 3, @@ -138,7 +144,9 @@ ], "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "packet_count": 1, diff --git a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json index 7fb726e5..313190a8 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json @@ -38,6 +38,7 @@ ], "match": { "OFPMatch": { + "length": 14, "oxm_fields": [ { "OXMTlv": { @@ -46,7 +47,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json index d09f5327..cc3d76fd 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json @@ -5,7 +5,9 @@ "flags": 0, "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json index 012f650b..cd68b51f 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json @@ -18,6 +18,7 @@ ], "match": { "OFPMatch": { + "length": 22, "oxm_fields": [ { "OXMTlv": { @@ -33,7 +34,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "out_group": 4294967295, diff --git a/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json index 224eba19..b3051d1c 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json @@ -5,6 +5,7 @@ "data": "////////8gukffjqCAYAAQgABgQAAfILpH346goAAAEAAAAAAAAKAAAD", "match": { "OFPMatch": { + "length": 80, "oxm_fields": [ { "OXMTlv": { @@ -69,7 +70,8 @@ "value": "00:00:00:00:00:00" } } - ] + ], + "type": 1 } }, "reason": 1, diff --git a/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json index 3edd7395..994953e6 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json @@ -8,6 +8,7 @@ "idle_timeout": 3, "match": { "OFPMatch": { + "length": 14, "oxm_fields": [ { "OXMTlv": { @@ -16,7 +17,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "packet_count": 1, diff --git a/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json index a87554e1..97ddd628 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json @@ -32,6 +32,7 @@ ], "match": { "OFPMatch": { + "length": 14, "oxm_fields": [ { "OXMTlv": { @@ -40,7 +41,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "out_group": 4294967295, |