diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-09-02 15:05:57 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-02 19:41:37 +0900 |
| commit | 1e93f598645aaaa6c1af610bc07a4bd5f66dca80 (patch) | |
| tree | 8be23b23e1a6c2c6f8ff0b07bbd4443bdd8b47bb | |
| parent | dd10c22d5a36820883a43ad44e001f93f7ac0380 (diff) | |
of12: 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>
7 files changed, 30 insertions, 10 deletions
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 c723d766..d12cac71 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 @@ -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/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 f2e382b8..19cddf0e 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 @@ -12,7 +12,9 @@ "instructions": [], "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "packet_count": 0, @@ -48,6 +50,7 @@ ], "match": { "OFPMatch": { + "length": 10, "oxm_fields": [ { "OXMTlv": { @@ -56,7 +59,8 @@ "value": 2054 } } - ] + ], + "type": 1 } }, "packet_count": 0, @@ -83,6 +87,7 @@ ], "match": { "OFPMatch": { + "length": 22, "oxm_fields": [ { "OXMTlv": { @@ -98,7 +103,8 @@ "value": "f2:0b:a4:7d:f8:ea" } } - ] + ], + "type": 1 } }, "packet_count": 3, @@ -134,7 +140,9 @@ ], "match": { "OFPMatch": { - "oxm_fields": [] + "length": 4, + "oxm_fields": [], + "type": 1 } }, "packet_count": 1, 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 7fb726e5..313190a8 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 @@ -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/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 d09f5327..cc3d76fd 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 @@ -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/of12/3-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json index 012f650b..cd68b51f 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 @@ -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/of12/3-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json index 3f60b488..b211934e 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,6 +4,7 @@ "data": "////////8gukffjqCAYAAQgABgQAAfILpH346goAAAEAAAAAAAAKAAAD", "match": { "OFPMatch": { + "length": 80, "oxm_fields": [ { "OXMTlv": { @@ -68,7 +69,8 @@ "value": "00:00:00:00:00:00" } } - ] + ], + "type": 1 } }, "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 3edd7395..994953e6 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,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, |