diff options
| author | IWAMOTO Toshihiro <iwamoto@valinux.co.jp> | 2016-02-01 12:30:45 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-02-01 16:49:00 +0900 |
| commit | 1076dfd3b460289eaacae734e9af1ac76fd156f5 (patch) | |
| tree | ec72fbf54111c374f6d24e4415544b1e361931f8 | |
| parent | 135a1cb4cd71c696871b187baac4d7eaf230e7c9 (diff) | |
Update conntrack test json and binary packets
Ovs has changed the definition of conntrack flags in commit
63bc9fb1c69fa81f3b30c2669d25962da3119d0f, and packet_data_generator3
now generates different test data. Update the data and corresponding
json data accordingly.
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet | bin | 104 -> 104 bytes | |||
| -rw-r--r-- | ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet | bin | 120 -> 120 bytes | |||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json | 2 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json | 4 |
4 files changed, 3 insertions, 3 deletions
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 Binary files differindex bad1d2d0..3d802d98 100644 --- a/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet +++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet 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 Binary files differindex 21944b28..88bdf52b 100644 --- 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 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 index 8cff9af6..0c8670f8 100644 --- 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 @@ -45,7 +45,7 @@ { "OXMTlv": { "field": "ct_state", - "mask": 128, + "mask": 32, "value": 0 } } 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 index 1c9e7f30..a1ad1402 100644 --- 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 @@ -57,8 +57,8 @@ { "OXMTlv": { "field": "ct_state", - "mask": 130, - "value": 130 + "mask": 34, + "value": 34 } } ], |