Commit 0b277d21 authored by YAMAMOTO Takashi's avatar YAMAMOTO Takashi

ofproto/trace: Fix "unchanged" output for Final flow

Clear actset_output so that it can be compared via flow_equal.
Note: trace->key has actset_output == 0.

Found by OVS flow tests under development for Neutron. [1]

[1] https://review.openstack.org/#/c/235155/10/neutron/tests/functional/agent/test_ovs_flows.py@399Signed-off-by: default avatarYAMAMOTO Takashi <yamamoto@midokura.com>
Acked-by: default avatarBen Pfaff <blp@ovn.org>
parent c770cf37
......@@ -4887,6 +4887,7 @@ ofproto_trace(struct ofproto_dpif *ofproto, struct flow *flow,
xlate_actions(&trace.xin, &trace.xout);
ds_put_char(ds, '\n');
trace.xin.flow.actset_output = 0;
trace_format_flow(ds, 0, "Final flow", &trace);
trace_format_megaflow(ds, 0, "Megaflow", &trace);
......
......@@ -6689,3 +6689,14 @@ recirc_id=0,ip,in_port=1,dl_vlan=10,nw_frag=no, actions: <del>
])
OVS_VSWITCHD_STOP
AT_CLEANUP
AT_SETUP([ofproto-dpif - trace (unchanged)])
OVS_VSWITCHD_START
AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1'], [0], [stdout])
AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: unchanged
])
AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(100)'], [0], [stdout])
AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: unchanged
])
OVS_VSWITCHD_STOP
AT_CLEANUP
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