TODO: Because Open vSwitch (lib/ofp-util) does not support Extensible Flow Entry Statistics [EXT-334] yet, re-generate the packet data by using packet_data_generator2 when Open vSwitch supports it.
Reference: OpenFlow 1.1+ support status of Open vSwitch https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md Signed-off-by: IWASE Yusuke <[email protected]> --- .../libofproto-OFP15-aggregate_stats_reply.packet | Bin 0 -> 32 bytes .../of15/libofproto-OFP15-flow_desc_reply.packet | Bin 0 -> 80 bytes .../of15/libofproto-OFP15-flow_desc_request.packet | Bin 0 -> 64 bytes .../of15/libofproto-OFP15-flow_removed.packet | Bin 0 -> 56 bytes .../of15/libofproto-OFP15-flow_stats_reply.packet | Bin 0 -> 56 bytes ...ofproto-OFP15-aggregate_stats_reply.packet.json | 24 +++++++++ .../libofproto-OFP15-flow_desc_reply.packet.json | 57 +++++++++++++++++++++ .../libofproto-OFP15-flow_desc_request.packet.json | 26 ++++++++++ .../of15/libofproto-OFP15-flow_removed.packet.json | 38 ++++++++++++++ .../libofproto-OFP15-flow_stats_reply.packet.json | 44 ++++++++++++++++ 10 files changed, 189 insertions(+) create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet new file mode 100644 index 0000000000000000000000000000000000000000..bbb519184abc59648e32f25d03be997187c4bb47 GIT binary patch literal 32 bcmZP*W>8=N0VXgBB6u2@*jRuxBZvb44iW&> literal 0 HcmV?d00001 diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet new file mode 100644 index 0000000000000000000000000000000000000000..4bf534cfc67fe09734008c85701f1dd3c2433cc3 GIT binary patch literal 80 zcmZP*W(Z&a0Y)&%z~BI8vNHS!LdI3A1eJ_kLet7Sfbu*I3=AwtDtQ{1*bsb14h|-u FBmie~2c`f3 literal 0 HcmV?d00001 diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet new file mode 100644 index 0000000000000000000000000000000000000000..a5a5bc119fd91b44b2c1ae19fcd8d1d0a9aeacd8 GIT binary patch literal 64 rcmZP*VsKyp0Y)$hrv5_#NJLP{*d;WryaO)A$iUOUz`z2O0_y+(L^l&b literal 0 HcmV?d00001 diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet new file mode 100644 index 0000000000000000000000000000000000000000..1df2b2ed0d11e36d1d0bdf4703423964b2253310 GIT binary patch literal 56 rcmZSMX0TuY0!9$}&+uPR$=D?{t-J%s<7r@EV1Y=1Q~>!*Y;ZmR&j|(D literal 0 HcmV?d00001 diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet new file mode 100644 index 0000000000000000000000000000000000000000..5ca44bbd7432cb89270edcaa011ca79182b0dd90 GIT binary patch literal 56 pcmZP*X0TuY0YNayz@Wjvzz9N&3_J}C3@kuVAQudH8kpGNd;l@L0k{AF literal 0 HcmV?d00001 diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json new file mode 100644 index 0000000..07cb6c2 --- /dev/null +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json @@ -0,0 +1,24 @@ +{ + "OFPAggregateStatsReply": { + "body": { + "OFPAggregateStats": { + "length": 16, + "stats": { + "OFPStats": { + "length": 12, + "oxs_fields": [ + { + "OXSTlv": { + "field": "flow_count", + "value": 1 + } + } + ] + } + } + } + }, + "flags": 0, + "type": 2 + } +} diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json new file mode 100644 index 0000000..3caab6f --- /dev/null +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json @@ -0,0 +1,57 @@ +{ + "OFPFlowDescStatsReply": { + "body": [ + { + "OFPFlowDesc": { + "cookie": 1234605616436508552, + "flags": 1, + "hard_timeout": 255, + "idle_timeout": 255, + "importance": 43690, + "instructions": [ + { + "OFPInstructionGotoTable": { + "len": 8, + "table_id": 2, + "type": 1 + } + } + ], + "length": 64, + "match": { + "OFPMatch": { + "length": 12, + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 1 + } + } + ], + "type": 1 + } + }, + "priority": 5, + "stats": { + "OFPStats": { + "length": 12, + "oxs_fields": [ + { + "OXSTlv": { + "field": "flow_count", + "value": 1 + } + } + ] + } + }, + "table_id": 1 + } + } + ], + "flags": 0, + "type": 1 + } +} diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json new file mode 100644 index 0000000..62e46c6 --- /dev/null +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json @@ -0,0 +1,26 @@ +{ + "OFPFlowDescStatsRequest": { + "cookie": 1234605616436508552, + "cookie_mask": 18446744073709551615, + "flags": 0, + "match": { + "OFPMatch": { + "length": 12, + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 1 + } + } + ], + "type": 1 + } + }, + "out_group": 4294967295, + "out_port": 4294967295, + "table_id": 1, + "type": 1 + } +} diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json new file mode 100644 index 0000000..daf0524 --- /dev/null +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json @@ -0,0 +1,38 @@ +{ + "OFPFlowRemoved": { + "cookie": 1234605616436508552, + "hard_timeout": 255, + "idle_timeout": 255, + "match": { + "OFPMatch": { + "length": 12, + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 1 + } + } + ], + "type": 1 + } + }, + "priority": 1, + "reason": 0, + "stats": { + "OFPStats": { + "length": 12, + "oxs_fields": [ + { + "OXSTlv": { + "field": "flow_count", + "value": 1 + } + } + ] + } + }, + "table_id": 1 + } +} diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json new file mode 100644 index 0000000..e271356 --- /dev/null +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json @@ -0,0 +1,44 @@ +{ + "OFPFlowStatsReply": { + "body": [ + { + "OFPFlowStats": { + "length": 40, + "match": { + "OFPMatch": { + "length": 12, + "oxm_fields": [ + { + "OXMTlv": { + "field": "in_port", + "mask": null, + "value": 1 + } + } + ], + "type": 1 + } + }, + "priority": 1, + "reason": 0, + "stats": { + "OFPStats": { + "length": 12, + "oxs_fields": [ + { + "OXSTlv": { + "field": "flow_count", + "value": 1 + } + } + ] + } + }, + "table_id": 1 + } + } + ], + "flags": 0, + "type": 17 + } +} -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
