From 0841ac66edfc1881e877d14830f27e858cc2008e Mon Sep 17 00:00:00 2001
From: Yusuke Iwase <iwase.yusuke0@gmail.com>
Date: Wed, 19 Aug 2015 10:25:08 +0900
Subject: [PATCH] test_parser: Add test case for OFP15 controller connection
 status messages

TODO: Because Open vSwitch (lib/ofp-util) does not support
controller connection status messages [EXT-454] 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>
---
 .../libofproto-OFP15-controller_status.packet | Bin 0 -> 56 bytes
 ...proto-OFP15-controller_status_reply.packet | Bin 0 -> 64 bytes
 ...oto-OFP15-controller_status_request.packet | Bin 0 -> 16 bytes
 .../of15/libofproto-OFP15-role_reply.packet   | Bin 0 -> 24 bytes
 .../of15/libofproto-OFP15-role_request.packet | Bin 0 -> 24 bytes
 ...fproto-OFP15-controller_status.packet.json |  22 +++++++++++++++
 ...-OFP15-controller_status_reply.packet.json |  26 ++++++++++++++++++
 ...FP15-controller_status_request.packet.json |   6 ++++
 .../libofproto-OFP15-role_reply.packet.json   |   7 +++++
 .../libofproto-OFP15-role_request.packet.json |   7 +++++
 10 files changed, 68 insertions(+)
 create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
 create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
 create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
 create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
 create mode 100644 ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet
 create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
 create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
 create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
 create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
 create mode 100644 ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json

diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
new file mode 100644
index 0000000000000000000000000000000000000000..9b63794ef9547a88ffe14a45172d5ad3967c94c8
GIT binary patch
literal 56
xcmZQmX0TuY0fYblfg~d%BbWywq)Kv%tqd)V^bE}`^o&jPjEt?!%uJ0T@&Me(2iX7s

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
new file mode 100644
index 0000000000000000000000000000000000000000..e859f9b0ba96f799dca7e895ca1f0c632942faca
GIT binary patch
literal 64
zcmZP*W^iBt0U<ESz+mwIKaj=9$Oz>#Fi4f;6k8cu8tECDS?C#?=ouMXnVFdyL*xPB
Ct_R})

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
new file mode 100644
index 0000000000000000000000000000000000000000..4c7417579ea93e0150ca929e508333f282ecfcf3
GIT binary patch
literal 16
RcmZP*Vh~^e0U<ES0008a06PEx

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
new file mode 100644
index 0000000000000000000000000000000000000000..c92ba97458d846dfd8bf2a18eb5a98b62874d6e8
GIT binary patch
literal 24
acmZRRWRPHh0LE3T7#IYVj9o(0$~yoYDg*HV

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet
new file mode 100644
index 0000000000000000000000000000000000000000..82c99197101e6b404e0f88ee82725e8cdd59a033
GIT binary patch
literal 24
acmZRRV31&d0LE3T7#IYVj9o(0$~yoY69e!7

literal 0
HcmV?d00001

diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
new file mode 100644
index 00000000..d9a74bfe
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
@@ -0,0 +1,22 @@
+{
+    "OFPControllerStatus": {
+        "status": {
+            "OFPControllerStatusStats": {
+                "channel_status": 1,
+                "length": 48,
+                "properties": [
+                    {
+                        "OFPControllerStatusPropUri": {
+                            "length": 26,
+                            "type": 0,
+                            "uri": "tls:192.168.34.23:6653"
+                        }
+                    }
+                ],
+                "reason": 1,
+                "role": 1,
+                "short_id": 65535
+            }
+        }
+    }
+}
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
new file mode 100644
index 00000000..002f0f1d
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
@@ -0,0 +1,26 @@
+{
+    "OFPControllerStatusStatsReply": {
+        "body": [
+            {
+                "OFPControllerStatusStats": {
+                    "channel_status": 1,
+                    "length": 48,
+                    "properties": [
+                        {
+                            "OFPControllerStatusPropUri": {
+                                "length": 26,
+                                "type": 0,
+                                "uri": "tls:192.168.34.23:6653"
+                            }
+                        }
+                    ],
+                    "reason": 1,
+                    "role": 1,
+                    "short_id": 65535
+                }
+            }
+        ],
+        "flags": 0,
+        "type": 18
+    }
+}
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
new file mode 100644
index 00000000..d9a8ef8b
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
@@ -0,0 +1,6 @@
+{
+    "OFPControllerStatusStatsRequest": {
+        "flags": 0,
+        "type": 18
+    }
+}
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
new file mode 100644
index 00000000..e8be5895
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
@@ -0,0 +1,7 @@
+{
+   "OFPRoleReply": {
+      "generation_id": 1234605616436508552,
+      "role": 1,
+      "short_id": 43690
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
new file mode 100644
index 00000000..c0c120f6
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
@@ -0,0 +1,7 @@
+{
+   "OFPRoleRequest": {
+      "generation_id": 1234605616436508552,
+      "role": 1,
+      "short_id": 43690
+   }
+}