From ec02de8d7a5ffefb52d746c21a1cb637873c570f Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 25 Apr 2014 10:20:08 +0900 Subject: [PATCH] tests/integrated: Match on VLAN tag for flows which set VLAN tags OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above a set-field action for a VLAN tag is considered inconsistent if it the flow does not match on a VLAN tag. This patch add such a match for the flow that has a set-field action for a VLAN tag. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for set-field actions for VLAN tags. Signed-off-by: Simon Horman Signed-off-by: FUJITA Tomonori --- ryu/tests/integrated/test_add_flow_v12_actions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ryu/tests/integrated/test_add_flow_v12_actions.py b/ryu/tests/integrated/test_add_flow_v12_actions.py index ad953c45..99cc1d78 100644 --- a/ryu/tests/integrated/test_add_flow_v12_actions.py +++ b/ryu/tests/integrated/test_add_flow_v12_actions.py @@ -172,7 +172,10 @@ class RunTest(tester.TestFlowBase): field = dp.ofproto.OXM_OF_VLAN_VID value = 0x1e4 - self.add_set_field_action(dp, field, value) + match = dp.ofproto_parser.OFPMatch() + match.set_vlan_vid(1) + + self.add_set_field_action(dp, field, value, match) def test_action_set_field_vlan_pcp(self, dp): field = dp.ofproto.OXM_OF_VLAN_PCP