This includes tests for recently added nicira extensions.

Signed-off-by: IWAMOTO Toshihiro <iwam...@valinux.co.jp>
---
 .../of13/ovs-ofctl-of13-action_conjunction.packet  | Bin 0 -> 144 bytes
 .../of13/ovs-ofctl-of13-action_learn.packet        | Bin 0 -> 256 bytes
 .../of13/ovs-ofctl-of13-action_resubmit.packet     | Bin 0 -> 144 bytes
 .../of13/ovs-ofctl-of13-match_conj.packet          | Bin 0 -> 96 bytes
 .../ovs-ofctl-of13-match_move_nx_register.packet   | Bin 0 -> 104 bytes
 .../of13/ovs-ofctl-of13-match_pkt_mark.packet      | Bin 0 -> 96 bytes
 .../ovs-ofctl-of13-match_pkt_mark_masked.packet    | Bin 0 -> 96 bytes
 .../ovs-ofctl-of13-action_conjunction.packet.json  | 101 +++++++++++
 .../of13/ovs-ofctl-of13-action_learn.packet.json   | 191 +++++++++++++++++++++
 .../ovs-ofctl-of13-action_resubmit.packet.json     | 100 +++++++++++
 .../of13/ovs-ofctl-of13-match_conj.packet.json     |  61 +++++++
 ...s-ofctl-of13-match_move_nx_register.packet.json |  61 +++++++
 .../of13/ovs-ofctl-of13-match_pkt_mark.packet.json |  61 +++++++
 ...vs-ofctl-of13-match_pkt_mark_masked.packet.json |  61 +++++++
 14 files changed, 636 insertions(+)
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet
 create mode 100644 ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet
 create mode 100644 
ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json

diff --git 
a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..40a91016d86d16178622d29911d8f35e0db02621
GIT binary patch
literal 144
zcmZSKW0=6ez`!JA5>_#5&%F=-p@4}ID9X^l0ONybkO%`KgIfaw0}BJg>az_DY;3D`
zpPAWF-oU`c!~s;z!zBE?fkA@hzzQbD1_mDvunva90St_GATeeJMh6fL)D1L20wfDG
RRe*s(S%E=`feC2jdjPOwE=d3Y

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..387e59ecd5ddbb30bf794904bf90131ff8b3eae4
GIT binary patch
literal 256
zcmYk0F$w}f3`O6J%QDI$i#FN~*jQM20@=#S!XpTJ2iufh!5fGk!A7vvb9jt3nNiqZ
z{4g(*pA<uf%A0kSfzWo8`i`|g0k^kMme>31d^!pP9}p@({s@!eaq&*rgq--?;#S6b
zxW=kZYl6n8M&w^p>fdDFaNDwjS)>NHARTEO_PJEHjkHt2QUgnCc=dVp=b^zx%THcM
MNtf$e3E`mS3)bx>kN^Mx

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..9e8560cf1106a94ae6e90fd2bcc8e01836a9a869
GIT binary patch
literal 144
zcmZSKW0=6ez`z8=D1aHvYhd_~1i(U!3~mh!3@i)`tIswtu(7S$eP(7yc>@C%69+>B
z0}qq%^9BY9mIEu87#kRTI3PwI4q#xk1Bo#+Fgk!}pl+ZE5+K?C{}}`r7?c$l_*gC_
G1Ni`^>>$+u

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..74a1c0ef0acc92c518469d7af74d66d197196ef8
GIT binary patch
literal 96
zcmZSKV@P0NU|<q539Fd3=iZ0^P{7Ox6lG{&fbl^zNQ8lrL5P9Ti-lqJ+4l_$JWL{&
Xz@iKcEDQo*mJkC6m}X?)NC7ecX(b)?

literal 0
HcmV?d00001

diff --git 
a/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..536db74aac26a91c440797d243e618753c934410
GIT binary patch
literal 104
zcmZSKW5{4&U|<q539Fd3=iZ0^P{7Ox6lG{&fbl^zNQ8lrK>~<b7#M_17#O)Z7#LQc
fWdN!IiYS1jfh-9I24w{XHX!5zt7l<gWMTmTUxy#E

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..a9e4cb8ce05e71e1ac0555178e0e8ba393eb087a
GIT binary patch
literal 96
zcmZSKV@P0NU|<q539Fd3=iZ0^P{7Ox6lG{&fbl^zNQ8lrL8yU&he_lT1EUiQ1H%<V
XuqXoq3xfcdCB(o1rWqMHQh*EqH#8iJ

literal 0
HcmV?d00001

diff --git 
a/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet 
b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..993931287371bb14296de561e11ccd3215b39cf2
GIT binary patch
literal 96
zcmZSKV@P0NU|<q539Fd3=iZ0^P{7Ox6lG{&fbl^zNQ8lrL9Bs+he_lT1EVts1H%<V
Z2A~?CI17USSYC($C<+9O3>+yy3IK0m9+Ch6

literal 0
HcmV?d00001

diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
new file mode 100644
index 0000000..7f89c5e
--- /dev/null
+++ 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
@@ -0,0 +1,101 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 1, 
+      "cookie": 1311768467463790320, 
+      "cookie_mask": 18446744073709551615, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "NXActionConjunction": {
+                        "clause": 0, 
+                        "experimenter": 8992, 
+                        "id": 11259375, 
+                        "len": 16, 
+                        "n_clauses": 2, 
+                        "subtype": 34, 
+                        "type": 65535
+                     }
+                  }
+               ], 
+               "len": 24, 
+               "type": 4
+            }
+         }
+      ], 
+      "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
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 2, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
new file mode 100644
index 0000000..aaad64d
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
@@ -0,0 +1,191 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 0, 
+      "cookie": 0, 
+      "cookie_mask": 0, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "OFPActionPopVlan": {
+                        "len": 8, 
+                        "type": 18
+                     }
+                  }, 
+                  {
+                     "OFPActionSetField": {
+                        "field": {
+                           "OXMTlv": {
+                              "field": "ipv4_dst", 
+                              "mask": null, 
+                              "value": "192.168.2.9"
+                           }
+                        }
+                     }
+                  }, 
+                  {
+                     "NXActionLearn": {
+                        "cookie": 0, 
+                        "experimenter": 8992, 
+                        "fin_hard_timeout": 0, 
+                        "fin_idle_timeout": 0, 
+                        "flags": 0, 
+                        "hard_timeout": 300, 
+                        "idle_timeout": 0, 
+                        "len": 96, 
+                        "priority": 1, 
+                        "specs": [
+                           {
+                              "NXFlowSpecMatch": {
+                                 "dst": [
+                                    "vlan_vid", 
+                                    0
+                                 ], 
+                                 "n_bits": 12, 
+                                 "src": [
+                                    "vlan_vid", 
+                                    0
+                                 ]
+                              }
+                           }, 
+                           {
+                              "NXFlowSpecMatch": {
+                                 "dst": [
+                                    "eth_dst_nxm", 
+                                    0
+                                 ], 
+                                 "n_bits": 48, 
+                                 "src": [
+                                    "eth_src_nxm", 
+                                    0
+                                 ]
+                              }
+                           }, 
+                           {
+                              "NXFlowSpecLoad": {
+                                 "dst": [
+                                    "vlan_vid", 
+                                    0
+                                 ], 
+                                 "n_bits": 12, 
+                                 "src": 0
+                              }
+                           }, 
+                           {
+                              "NXFlowSpecLoad": {
+                                 "dst": [
+                                    "tunnel_id_nxm", 
+                                    0
+                                 ], 
+                                 "n_bits": 64, 
+                                 "src": [
+                                    "tunnel_id_nxm", 
+                                    0
+                                 ]
+                              }
+                           }, 
+                           {
+                              "NXFlowSpecOutput": {
+                                 "dst": "", 
+                                 "n_bits": 32, 
+                                 "src": [
+                                    "in_port", 
+                                    0
+                                 ]
+                              }
+                           }
+                        ], 
+                        "subtype": 16, 
+                        "table_id": 99, 
+                        "type": 65535
+                     }
+                  }
+               ], 
+               "len": 128, 
+               "type": 4
+            }
+         }, 
+         {
+            "OFPInstructionGotoTable": {
+               "len": 8, 
+               "table_id": 100, 
+               "type": 1
+            }
+         }
+      ], 
+      "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
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 2, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
new file mode 100644
index 0000000..c040495
--- /dev/null
+++ 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
@@ -0,0 +1,100 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 0, 
+      "cookie": 0, 
+      "cookie_mask": 0, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "NXActionResubmitTable": {
+                        "experimenter": 8992, 
+                        "in_port": 1234, 
+                        "len": 16, 
+                        "subtype": 14, 
+                        "table_id": 99, 
+                        "type": 65535
+                     }
+                  }
+               ], 
+               "len": 24, 
+               "type": 4
+            }
+         }
+      ], 
+      "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
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
new file mode 100644
index 0000000..2b50001
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
@@ -0,0 +1,61 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 1, 
+      "cookie": 1311768467463790320, 
+      "cookie_mask": 18446744073709551615, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "OFPActionPopVlan": {
+                        "len": 8, 
+                        "type": 18
+                     }
+                  }
+               ], 
+               "len": 16, 
+               "type": 4
+            }
+         }, 
+         {
+            "OFPInstructionGotoTable": {
+               "len": 8, 
+               "table_id": 100, 
+               "type": 1
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 18, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "conj_id", 
+                     "mask": null, 
+                     "value": 11259375
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "vlan_vid", 
+                     "mask": null, 
+                     "value": 5330
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
new file mode 100644
index 0000000..5143a3d
--- /dev/null
+++ 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
@@ -0,0 +1,61 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 1, 
+      "cookie": 1311768467463790320, 
+      "cookie_mask": 18446744073709551615, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "NXActionRegMove": {
+                        "dst_field": "reg1", 
+                        "dst_ofs": 0, 
+                        "experimenter": 8992, 
+                        "len": 24, 
+                        "n_bits": 6, 
+                        "src_field": "reg0", 
+                        "src_ofs": 10, 
+                        "subtype": 6, 
+                        "type": 65535
+                     }
+                  }
+               ], 
+               "len": 32, 
+               "type": 4
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 24, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "reg0", 
+                     "mask": null, 
+                     "value": 4660
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "reg5", 
+                     "mask": 65535, 
+                     "value": 43981
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
new file mode 100644
index 0000000..1cba8c6
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
@@ -0,0 +1,61 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 1, 
+      "cookie": 1311768467463790320, 
+      "cookie_mask": 18446744073709551615, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "OFPActionPopVlan": {
+                        "len": 8, 
+                        "type": 18
+                     }
+                  }
+               ], 
+               "len": 16, 
+               "type": 4
+            }
+         }, 
+         {
+            "OFPInstructionGotoTable": {
+               "len": 8, 
+               "table_id": 100, 
+               "type": 1
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 18, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "vlan_vid", 
+                     "mask": null, 
+                     "value": 5330
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "pkt_mark", 
+                     "mask": null, 
+                     "value": 54321
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}
diff --git 
a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
new file mode 100644
index 0000000..8931486
--- /dev/null
+++ 
b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
@@ -0,0 +1,61 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 1, 
+      "cookie": 1311768467463790320, 
+      "cookie_mask": 18446744073709551615, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "OFPActionPopVlan": {
+                        "len": 8, 
+                        "type": 18
+                     }
+                  }
+               ], 
+               "len": 16, 
+               "type": 4
+            }
+         }, 
+         {
+            "OFPInstructionGotoTable": {
+               "len": 8, 
+               "table_id": 100, 
+               "type": 1
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 22, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "vlan_vid", 
+                     "mask": null, 
+                     "value": 5330
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "pkt_mark", 
+                     "mask": 65535, 
+                     "value": 54321
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}
-- 
2.1.4


------------------------------------------------------------------------------
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to