From 7a9b1be5d6874933fdfbf4e610992dd302915ed9 Mon Sep 17 00:00:00 2001
From: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Date: Thu, 12 Nov 2015 15:53:33 +0900
Subject: [PATCH] test_parser: add conntrack tests

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 .../of13/ovs-ofctl-of13-action_ct.packet      | Bin 0 -> 104 bytes
 .../of13/ovs-ofctl-of13-action_ct_exec.packet | Bin 0 -> 120 bytes
 .../of13/ovs-ofctl-of13-action_ct.packet.json |  62 +++++++++++++++
 .../ovs-ofctl-of13-action_ct_exec.packet.json |  74 ++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet
 create mode 100644 ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet
 create mode 100644 ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
 create mode 100644 ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet
new file mode 100644
index 0000000000000000000000000000000000000000..bad1d2d05948299793091531a5522c5f2963e97e
GIT binary patch
literal 104
zcmZSKW5{4&U|<4b6u=DTH8A`~0$?FV2C)VPE+!5J2FA-k0;-IGfrUW<#Qy)EL4tun
OS%E<rECVE1zzhHg1`(eC

literal 0
HcmV?d00001

diff --git a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet
new file mode 100644
index 0000000000000000000000000000000000000000..21944b283691825f823cdf6abe07bb6c19f06af5
GIT binary patch
literal 120
zcmZSKW2j(YU|<4b6u=DTH8A`~0$?FV2C)VPE+!5J2FA-kf}shDSr`mJ^8f!cXfQA+
cD=;WCFoO6%5eOy8Ai%(QjfElASrH@v0B}SV8~^|S

literal 0
HcmV?d00001

diff --git a/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
new file mode 100644
index 00000000..8cff9af6
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
@@ -0,0 +1,62 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 0, 
+      "cookie": 0, 
+      "cookie_mask": 0, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "NXActionCT": {
+                        "actions": [], 
+                        "alg": 0, 
+                        "experimenter": 8992, 
+                        "flags": 0, 
+                        "len": 24, 
+                        "recirc_table": 4, 
+                        "subtype": 35, 
+                        "type": 65535, 
+                        "zone_ofs_nbits": 0, 
+                        "zone_src": 0
+                     }
+                  }
+               ], 
+               "len": 32, 
+               "type": 4
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 22, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "eth_type", 
+                     "mask": null, 
+                     "value": 2048
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "ct_state", 
+                     "mask": 128, 
+                     "value": 0
+                  }
+               }
+            ], 
+            "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-action_ct_exec.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
new file mode 100644
index 00000000..1c9e7f30
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
@@ -0,0 +1,74 @@
+{
+   "OFPFlowMod": {
+      "buffer_id": 4294967295, 
+      "command": 0, 
+      "cookie": 0, 
+      "cookie_mask": 0, 
+      "flags": 0, 
+      "hard_timeout": 0, 
+      "idle_timeout": 0, 
+      "instructions": [
+         {
+            "OFPInstructionActions": {
+               "actions": [
+                  {
+                     "NXActionCT": {
+                        "actions": [
+                           {
+                              "OFPActionSetField": {
+                                 "field": {
+                                    "OXMTlv": {
+                                       "field": "ct_mark", 
+                                       "mask": null, 
+                                       "value": 6636321
+                                    }
+                                 }
+                              }
+                           }
+                        ], 
+                        "alg": 0, 
+                        "experimenter": 8992, 
+                        "flags": 1, 
+                        "len": 40, 
+                        "recirc_table": 255, 
+                        "subtype": 35, 
+                        "type": 65535, 
+                        "zone_ofs_nbits": 0, 
+                        "zone_src": 0
+                     }
+                  }
+               ], 
+               "len": 48, 
+               "type": 4
+            }
+         }
+      ], 
+      "match": {
+         "OFPMatch": {
+            "length": 22, 
+            "oxm_fields": [
+               {
+                  "OXMTlv": {
+                     "field": "eth_type", 
+                     "mask": null, 
+                     "value": 2048
+                  }
+               }, 
+               {
+                  "OXMTlv": {
+                     "field": "ct_state", 
+                     "mask": 130, 
+                     "value": 130
+                  }
+               }
+            ], 
+            "type": 1
+         }
+      }, 
+      "out_group": 4294967295, 
+      "out_port": 4294967295, 
+      "priority": 32768, 
+      "table_id": 3, 
+      "xid": 2
+   }
+}