test_parser: Add expected json for OFP13/15 Messages

Add expected json for the following messages.

 - OFP13/15 Symmetric Messages
 - OFP13/15 Asynchronous Messages
 - OFP15 Multipart Messages
 - OFP13/15 TableMod Message
 - OFP13 PortMod Message
 - OFP13/15 MeterMod Message

Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

18 files changed, 232 insertions, 146 deletions

diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json
new file mode 100644
index 00000000..011bd6de
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json
@@ -0,0 +1,5 @@
+{
+   "OFPEchoReply": {
+      "data": ""
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json
new file mode 100644
index 00000000..501a8479
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json
@@ -0,0 +1,5 @@
+{
+   "OFPEchoRequest": {
+      "data": ""
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json
new file mode 100644
index 00000000..b12d0d9a
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json
@@ -0,0 +1,7 @@
+{
+   "OFPErrorMsg": {
+      "code": 6, 
+      "data": "BA4ACAAAAAA=", 
+      "type": 4
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json
new file mode 100644
index 00000000..63ec9424
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json
@@ -0,0 +1,78 @@
+{
+   "OFPFlowRemoved": {
+      "byte_count": 100, 
+      "cookie": 1311768467463790320, 
+      "duration_nsec": 500, 
+      "duration_sec": 600, 
+      "hard_timeout": 300, 
+      "idle_timeout": 400, 
+      "match": {
+         "OFPMatch": {
+            "length": 70, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "in_port", 
+                     "mask": null, 
+                     "value": 43981
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "eth_dst", 
+                     "mask": null, 
+                     "value": "aa:bb:cc:99:88:77"
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "eth_type", 
+                     "mask": null, 
+                     "value": 2048
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "vlan_vid", 
+                     "mask": null, 
+                     "value": 5095
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "ipv4_dst", 
+                     "mask": null, 
+                     "value": "192.168.2.1"
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "tunnel_id", 
+                     "mask": null, 
+                     "value": 50000
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "tun_ipv4_src", 
+                     "mask": null, 
+                     "value": "192.168.2.3"
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "tun_ipv4_dst", 
+                     "mask": null, 
+                     "value": "192.168.2.4"
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "packet_count": 200, 
+      "priority": 100, 
+      "reason": 0, 
+      "table_id": 1
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json
new file mode 100644
index 00000000..5a116313
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json
@@ -0,0 +1,15 @@
+{
+   "OFPHello": {
+      "elements": [
+         {
+            "OFPHelloElemVersionBitmap": {
+               "length": 8, 
+               "type": 1, 
+               "versions": [
+                  4
+               ]
+            }
+         }
+      ]
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json
new file mode 100644
index 00000000..5bb43719
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json
@@ -0,0 +1,26 @@
+{
+   "OFPMeterMod": {
+      "bands": [
+         {
+            "OFPMeterBandDrop": {
+               "burst_size": 10, 
+               "len": 16, 
+               "rate": 1000, 
+               "type": 1
+            }
+         }, 
+         {
+            "OFPMeterBandDscpRemark": {
+               "burst_size": 10, 
+               "len": 16, 
+               "prec_level": 1, 
+               "rate": 1000, 
+               "type": 2
+            }
+         }
+      ], 
+      "command": 0, 
+      "flags": 14, 
+      "meter_id": 100
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json
new file mode 100644
index 00000000..5c6c29a0
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json
@@ -0,0 +1,9 @@
+{
+   "OFPPortMod": {
+      "advertise": 10248, 
+      "config": 1, 
+      "hw_addr": "aa:bb:cc:99:88:77", 
+      "mask": 1, 
+      "port_no": 1
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json
new file mode 100644
index 00000000..b82d10ee
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json
@@ -0,0 +1,20 @@
+{
+   "OFPPortStatus": {
+      "desc": {
+         "OFPPort": {
+            "advertised": 10248, 
+            "config": 0, 
+            "curr": 10248, 
+            "curr_speed": 50000, 
+            "hw_addr": "ff:ff:ff:ff:ff:ff", 
+            "max_speed": 100000, 
+            "name": "eth0", 
+            "peer": 10248, 
+            "port_no": 1, 
+            "state": 4, 
+            "supported": 10248
+         }
+      }, 
+      "reason": 2
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json
new file mode 100644
index 00000000..5019c29b
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json
@@ -0,0 +1,6 @@
+{
+   "OFPTableMod": {
+      "config": 0, 
+      "table_id": 255
+   }
+}
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
index 2a573634..011bd6de 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
@@ -1,5 +1,5 @@
 {
    "OFPEchoReply": {
-      "data": "aG9nZQ=="
+      "data": ""
    }
 }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
index e1f2af42..501a8479 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
@@ -1,5 +1,5 @@
 {
    "OFPEchoRequest": {
-      "data": "aG9nZQ=="
+      "data": ""
    }
 }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
index e9ab2b5e..b76f05c7 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
@@ -1,7 +1,7 @@
 {
    "OFPErrorMsg": {
-      "code": 11, 
-      "data": "ZnVnYWZ1Z2E=", 
-      "type": 2
+      "code": 6, 
+      "data": "Bg4ACAAAAAA=", 
+      "type": 4
    }
 }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
index d03ff84b..3c01f80b 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
@@ -6,12 +6,7 @@
                "length": 8, 
                "type": 1, 
                "versions": [
-                  1, 
-                  2, 
-                  3, 
-                  9, 
-                  10, 
-                  30
+                  6
                ]
             }
          }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
index eba4540a..5bb43719 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
@@ -17,15 +17,6 @@
                "rate": 1000, 
                "type": 2
             }
-         }, 
-         {
-            "OFPMeterBandExperimenter": {
-               "burst_size": 10, 
-               "experimenter": 999, 
-               "len": 16, 
-               "rate": 1000, 
-               "type": 65535
-            }
          }
       ], 
       "command": 0, 
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
index 7a12acc3..99d8505d 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
@@ -1,8 +1,8 @@
 {
    "OFPQueueStatsRequest": {
-      "flags": 0, 
-      "port_no": 4294967295, 
-      "queue_id": 4294967295, 
+      "flags": 0,
+      "port_no": 43981,
+      "queue_id": 4294967295,
       "type": 5
    }
 }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
index 81b09f13..aab3acda 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
@@ -2,60 +2,63 @@
    "OFPRequestForward": {
       "request": {
          "OFPGroupMod": {
+            "bucket_array_len": 56, 
             "buckets": [
                {
-                "OFPBucket": {
-                    "action_array_len": 24,
-                    "actions": [
+                  "OFPBucket": {
+                     "action_array_len": 24, 
+                     "actions": [
                         {
-                            "OFPActionPopVlan": {
-                                "len": 8,
-                                "type": 18
-                            }
-                        },
+                           "OFPActionPopVlan": {
+                              "len": 8, 
+                              "type": 18
+                           }
+                        }, 
                         {
-                            "OFPActionSetField": {
-                                "field": {
-                                    "OXMTlv": {
-                                        "field": "ipv4_dst",
-                                        "mask": null,
-                                        "value": "192.168.2.9"
-                                    }
-                                }
-                            }
+                           "OFPActionSetField": {
+                              "field": {
+                                 "OXMTlv": {
+                                    "field": "ipv4_dst", 
+                                    "mask": null, 
+                                    "value": "192.168.2.9"
+                                 }
+                              }
+                           }
                         }
-                    ],
-                    "bucket_id": 305419896,
-                    "len": 56,
-                    "properties": [
+                     ], 
+                     "bucket_id": 305419896, 
+                     "len": 56, 
+                     "properties": [
                         {
-                            "OFPGroupBucketPropWeight": {
-                                "length": 8,
-                                "type": 0,
-                                "weight": 52428
-                            }
-                        },
+                           "OFPGroupBucketPropWeight": {
+                              "length": 8, 
+                              "type": 0, 
+                              "weight": 52428
+                           }
+                        }, 
                         {
-                            "OFPGroupBucketPropWatch": {
-                                "length": 8,
-                                "type": 1,
-                                "watch": 56797
-                            }
-                        },
+                           "OFPGroupBucketPropWatch": {
+                              "length": 8, 
+                              "type": 1, 
+                              "watch": 56797
+                           }
+                        }, 
                         {
-                            "OFPGroupBucketPropWatch": {
-                                "length": 8,
-                                "type": 2,
-                                "watch": 4008636142
-                            }
+                           "OFPGroupBucketPropWatch": {
+                              "length": 8, 
+                              "type": 2, 
+                              "watch": 4008636142
+                           }
                         }
-                    ]
-                }
+                     ]
+                  }
                }
-            ],
-            "command": 0,
-            "group_id": 1,
-            "type": 0
+            ], 
+            "command": 3, 
+            "command_bucket_id": 3149642683, 
+            "group_id": 2863311530, 
+            "properties": [], 
+            "type": 1
          }
       }
    }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
index 08e46df3..c88d3bfa 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
@@ -1,41 +1,8 @@
 {
    "OFPRoleStatus": {
-      "generation_id": 7, 
-      "properties": [
-         {
-            "OFPRolePropExperimenter": {
-               "data": [], 
-               "exp_type": 0, 
-               "experimenter": 101, 
-               "length": 12, 
-               "type": 65535
-            }
-         }, 
-         {
-            "OFPRolePropExperimenter": {
-               "data": [
-                  1
-               ], 
-               "exp_type": 1, 
-               "experimenter": 101, 
-               "length": 16, 
-               "type": 65535
-            }
-         }, 
-         {
-            "OFPRolePropExperimenter": {
-               "data": [
-                  1, 
-                  2
-               ], 
-               "exp_type": 2, 
-               "experimenter": 101, 
-               "length": 20, 
-               "type": 65535
-            }
-         }
-      ], 
+      "generation_id": 17356517385562371090, 
+      "properties": [], 
       "reason": 0, 
-      "role": 2
+      "role": 3
    }
 }
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
index 97acd144..5adf812f 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
@@ -1,54 +1,13 @@
 {
    "OFPTableMod": {
-      "config": 0, 
+      "config": 4, 
       "properties": [
          {
             "OFPTableModPropEviction": {
-               "flags": 0, 
+               "flags": 2, 
                "length": 8, 
                "type": 2
             }
-         }, 
-         {
-            "OFPTableModPropVacancy": {
-               "length": 8, 
-               "type": 3, 
-               "vacancy": 0, 
-               "vacancy_down": 0, 
-               "vacancy_up": 0
-            }
-         }, 
-         {
-            "OFPTableModPropExperimenter": {
-               "data": [], 
-               "exp_type": 0, 
-               "experimenter": 101, 
-               "length": 12, 
-               "type": 65535
-            }
-         }, 
-         {
-            "OFPTableModPropExperimenter": {
-               "data": [
-                  1
-               ], 
-               "exp_type": 1, 
-               "experimenter": 101, 
-               "length": 16, 
-               "type": 65535
-            }
-         }, 
-         {
-            "OFPTableModPropExperimenter": {
-               "data": [
-                  1, 
-                  2
-               ], 
-               "exp_type": 2, 
-               "experimenter": 101, 
-               "length": 20, 
-               "type": 65535
-            }
          }
       ], 
       "table_id": 255