All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 5d1c8189 authored by Ben Pfaff's avatar Ben Pfaff

ofproto-dpif-xlate: Fix handling of write_actions(group(5),output(10)).

This keeps actset_output as OFPP_UNSET in the special case where a single
write_actions() contains a group action followed by an output action.  The
presumably more common case where instructions in separate action lists
contained output and group actions was already properly handled.

Without the fix added by this commit, the test case as updated by this
commit fails.

Found by inspection.
Signed-off-by: default avatarBen Pfaff <blp@nicira.com>
Acked-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
parent ab645c8e
......@@ -3958,6 +3958,7 @@ xlate_write_actions(struct xlate_ctx *ctx, const struct ofpact *a)
} else if (inner->type == OFPACT_GROUP) {
ctx->xin->flow.actset_output = OFPP_UNSET;
ctx->action_set_has_group = true;
break;
}
}
}
......
......@@ -630,8 +630,9 @@ table=2,priority=10 actions=5,goto_table(3)
table=3,priority=20,xreg0=2 actions=6,goto_table(4)
table=3,priority=10 actions=7,goto_table(4)
# Verify that adding a group action unsets actset_output.
table=4 actions=write_actions(group(5)),goto_table(5)
# Verify that adding a group action unsets actset_output,
# even if output follows group.
table=4 actions=write_actions(group(5),output(10)),goto_table(5)
table=5,priority=20,actset_output=unset actions=8,goto_table(6)
table=5,priority=10 actions=9,goto_table(6)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment