From 1076dfd3b460289eaacae734e9af1ac76fd156f5 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Mon, 1 Feb 2016 12:30:45 +0900 Subject: [PATCH] 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 Signed-off-by: FUJITA Tomonori --- .../of13/ovs-ofctl-of13-action_ct.packet | Bin 104 -> 104 bytes .../of13/ovs-ofctl-of13-action_ct_exec.packet | Bin 120 -> 120 bytes .../of13/ovs-ofctl-of13-action_ct.packet.json | 2 +- .../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 index bad1d2d05948299793091531a5522c5f2963e97e..3d802d984deac71b9ee031cad4fb70ace8a200ff 100644 GIT binary patch delta 9 Qcmd1EnBdB&Fwsp301ssXzyJUM delta 9 Qcmd1EnBdCTFwsp301)K^AOHXW 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 index 21944b283691825f823cdf6abe07bb6c19f06af5..88bdf52b65b438d2d2008abfd35652d31f451d0b 100644 GIT binary patch delta 13 Ucmb=ZnBd5&#K6FyG||ln02s9c6aWAK delta 13 Ucmb=ZnBd6T#K6GNG||ln039_0)Bpeg 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 } } ],