test_parser: Add test case for OXS related messages in OF1.5

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 <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

10 files changed, 189 insertions, 0 deletions

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 00000000..bbb51918
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet
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 00000000..4bf534cf
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet
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 00000000..a5a5bc11
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet
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 00000000..1df2b2ed
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet
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 00000000..5ca44bbd
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet
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 00000000..07cb6c2f
--- /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 00000000..3caab6f9
--- /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 00000000..62e46c65
--- /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 00000000..daf05248
--- /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 00000000..e2713569
--- /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
+    }
+}