summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYusuke Iwase <iwase.yusuke0@gmail.com>2015-08-19 10:25:08 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-08-20 18:22:12 +0900
commit0841ac66edfc1881e877d14830f27e858cc2008e (patch)
tree1675bc5b07a1cdc674151219be69b9f920502beb
parent0d9dfe33de6c001418aa24975874e2ff8471d09b (diff)
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>
-rw-r--r--ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packetbin0 -> 56 bytes
-rw-r--r--ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packetbin0 -> 64 bytes
-rw-r--r--ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packetbin0 -> 16 bytes
-rw-r--r--ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packetbin0 -> 24 bytes
-rw-r--r--ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packetbin0 -> 24 bytes
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json22
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json26
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json6
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json7
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json7
10 files changed, 68 insertions, 0 deletions
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 00000000..9b63794e
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
Binary files differ
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 00000000..e859f9b0
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
Binary files differ
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 00000000..4c741757
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
Binary files differ
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 00000000..c92ba974
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
Binary files differ
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 00000000..82c99197
--- /dev/null
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet
Binary files differ
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
+ }
+}