Logs enabled by 'appctl vlog/set' are commonly only used for 'check_logs' at the end of the test. No need to enable any other logs except for file.
Patch made automatically by sed replace. Signed-off-by: Ilya Maximets <[email protected]> Acked-by: Aaron Conole <[email protected]> --- tests/dpif-netdev.at | 10 ++-- tests/learn.at | 6 +-- tests/mpls-xlate.at | 4 +- tests/ofproto-dpif.at | 106 +++++++++++++++++++++--------------------- tests/ofproto.at | 4 +- tests/ovs-ofctl.at | 4 +- tests/pmd.at | 20 ++++---- tests/stp.at | 6 +-- tests/system-traffic.at | 4 +- tests/tunnel-push-pop-ipv6.at | 2 +- tests/tunnel-push-pop.at | 2 +- 11 files changed, 84 insertions(+), 84 deletions(-) diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index fff395d..d850350 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -50,7 +50,7 @@ m4_divert_pop([PREPARE_TESTS]) AT_SETUP([dpif-netdev - netdev-dummy/receive]) # Create br0 with interfaces p0 OVS_VSWITCHD_START([add-port br0 p1 -- set interface p1 type=dummy ofport_request=1 -- ]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) ovs-appctl time/stop @@ -83,7 +83,7 @@ m4_define([DPIF_NETDEV_DUMMY_IFACE], add-port br1 p2 -- set interface p2 type=$1 options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \ add-port br1 p8 -- set interface p8 ofport_request=8 type=$1 --], [], [], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-ofctl add-flow br1 action=normal]) @@ -113,7 +113,7 @@ m4_define([DPIF_NETDEV_MISS_FLOW_INSTALL], [add-port br0 p1 -- set interface p1 type=$1 options:pstream=punix:$OVS_RUNDIR/p0.sock set bridge br0 datapath-type=dummy other-config:datapath-id=1234 fail-mode=secure], [], [], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) @@ -155,7 +155,7 @@ m4_define([DPIF_NETDEV_MISS_FLOW_DUMP], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using UFID disabled ], []) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) @@ -203,7 +203,7 @@ OVS_VSWITCHD_START( fail-mode=secure -- \ add-port br1 p2 -- set interface p2 type=dummy options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \ add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps burst stats bands=type=drop rate=1 burst_size=1']) AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=2 kbps burst stats bands=type=drop rate=1 burst_size=2']) diff --git a/tests/learn.at b/tests/learn.at index 5f1d6df..ab38d8a 100644 --- a/tests/learn.at +++ b/tests/learn.at @@ -665,7 +665,7 @@ AT_CLEANUP AT_SETUP([learning action - limit]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 actions=learn(table=1,dl_dst=dl_src,cookie=0x1,limit=1),2 @@ -704,7 +704,7 @@ AT_CLEANUP AT_SETUP([learning action - limit result_dst]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 AT_DATA([flows.txt], [dnl table=0 in_port=1 actions=learn(table=1,dl_dst=dl_src,cookie=0x1,limit=1,result_dst=reg0[[0]]),controller @@ -737,7 +737,7 @@ AT_CLEANUP AT_SETUP([learning action - different limits]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 3 AT_DATA([flows.txt], [dnl table=0 in_port=1 udp,actions=learn(table=11,dl_type=0x0800,nw_proto=17,udp_src=udp_dst,limit=1,result_dst=reg0[[0]]),resubmit(,1) diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at index e335b7f..c09ccbc 100644 --- a/tests/mpls-xlate.at +++ b/tests/mpls-xlate.at @@ -158,7 +158,7 @@ OVS_VSWITCHD_START( options:peer=p1 -- \ add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg ofproto_dpif_upcall:file:dbg]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 @@ -193,7 +193,7 @@ AT_SETUP([MPLS xlate action - group bucket]) OVS_VSWITCHD_START add_of_ports br0 1 -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg ofproto_dpif_upcall:file:dbg]) AT_CHECK([ovs-ofctl del-flows br0]) AT_CHECK([ovs-ofctl -O OpenFlow13 add-group br0 'group_id=1234,type=all,bucket=push_mpls:0x8847,output:1']) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index caa9b43..f0fca22 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -23,7 +23,7 @@ OVS_VSWITCHD_START( add-port br1 p4 -- set interface p4 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=4 -- \ add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --]) WAIT_FOR_DUMMY_PORTS([p3], [p4]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-ofctl add-flow br1 action=normal]) @@ -4399,7 +4399,7 @@ no_flow="$base_flow,frag=no),tcp(src=12345,dst=80)" first_flow="$base_flow,frag=first),tcp(src=12345,dst=80)" later_flow="$base_flow,frag=later)" -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) mode=normal @@ -4508,7 +4508,7 @@ priority=75 tcp actions=load:42->OXM_OF_TCP_SRC[[0..7]],output:1 ]) AT_CHECK([ovs-ofctl -O OpenFlow12 replace-flows br0 flows.txt]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) mode=normal @@ -6661,7 +6661,7 @@ AT_CAPTURE_FILE([sflow.log]) PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT]) ovs-appctl time/stop -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy], [0]) AT_CHECK([ovs-vsctl -- add-port int-br t1 -- set Interface t1 type=gre \ options:remote_ip=1.1.2.92 options:key=456 ofport_request=4\ @@ -6755,7 +6755,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif - sFlow packet sampling - MPLS]) AT_XFAIL_IF([test "$IS_WIN32" = "yes"]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 dl_src=50:54:00:00:00:09 actions=push_mpls:0x8847,set_mpls_label:789,set_mpls_tc:4,set_mpls_ttl:32,2 @@ -7842,7 +7842,7 @@ AT_SETUP([ofproto-dpif - MPLS actions that result in a userspace action]) OVS_VSWITCHD_START([dnl add-port br0 p1 -- set Interface p1 type=dummy ]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) on_exit 'kill `cat ovs-ofctl.pid`' AT_CAPTURE_FILE([ofctl_monitor.log]) @@ -7878,7 +7878,7 @@ AT_SETUP([ofproto-dpif - MPLS actions that result in a drop]) OVS_VSWITCHD_START([dnl add-port br0 p1 -- set Interface p1 type=dummy ]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) on_exit 'kill `cat ovs-ofctl.pid`' AT_CAPTURE_FILE([ofctl_monitor.log]) @@ -7924,7 +7924,7 @@ add_of_ports br1 3 AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using UFID disabled ], []) AT_CHECK([ovs-appctl time/stop]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2]) AT_CHECK([ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3]) @@ -7999,7 +7999,7 @@ add_of_ports br1 3 AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using UFID disabled ], []) AT_CHECK([ovs-appctl time/stop]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 "ip actions=push:OXM_OF_IN_PORT[[0..31]],output:1,pop:OXM_OF_IPV4_SRC[[0..31]],output:2"]) # Try to pop from empty stack, and push and leave data to stack. @@ -8058,7 +8058,7 @@ AT_BANNER([ofproto-dpif -- megaflows]) AT_SETUP([ofproto-dpif megaflow - port classification]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 actions=output(2) @@ -8076,7 +8076,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - L2 classification]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1,dl_src=50:54:00:00:00:09 actions=output(2) @@ -8094,7 +8094,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - L3 classification]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_CHECK([ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src], [0], [ignore], []) AT_DATA([flows.txt], [dnl @@ -8113,7 +8113,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - IPv6 classification]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_CHECK([ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=ipv6_dst,ipv6_src], [0], [ignore], []) AT_DATA([flows.txt], [dnl @@ -8132,7 +8132,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - L4 classification]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1,icmp,icmp_type=8 actions=output(2) @@ -8151,7 +8151,7 @@ AT_CLEANUP m4_define([OFPROTO_DPIF_MEGAFLOW_NORMAL], [AT_SETUP([ofproto-dpif megaflow - normal$1]) OVS_VSWITCHD_START([], [], [], [m4_if([$1], [], [], [--dummy-numa="0,0,0,0,1,1,1,1"])]) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) func=`printf '%s_' "$1" | cut -c 4-` add_${func}of_ports br0 1 2 AT_CHECK([ovs-ofctl add-flow br0 action=normal]) @@ -8170,7 +8170,7 @@ OFPROTO_DPIF_MEGAFLOW_NORMAL([ - pmd]) AT_SETUP([ofproto-dpif megaflow - mpls]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 dl_src=50:54:00:00:00:09 actions=push_mpls:0x8847,2 @@ -8190,7 +8190,7 @@ AT_CLEANUP # CHECK_MEGAFLOW_NETFLOW(LOOPBACK_ADDR) m4_define([CHECK_MEGAFLOW_NETFLOW], [OVS_VSWITCHD_START - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 dnl NetFlow configuration disables wildcarding relevant fields @@ -8233,7 +8233,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_NORMAL_ACB_BOND], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK ]) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) @@ -8257,7 +8257,7 @@ OVS_VSWITCHD_START( set interface p3 type=dummy ofport_request=3]) AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK ]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) @@ -8292,7 +8292,7 @@ OVS_VSWITCHD_START( AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK ]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 7 AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-ofctl add-flow br1 action=normal]) @@ -8310,7 +8310,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - resubmit port action]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1,ip actions=resubmit(90) @@ -8329,7 +8329,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - resubmit table action]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1,ip actions=resubmit(,1) @@ -8349,7 +8349,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - goto_table action]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1,ip actions=goto_table(1) @@ -8369,7 +8369,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - mirroring, select_all]) AT_KEYWORDS([mirror mirrors mirroring]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 3 ovs-vsctl \ set Bridge br0 mirrors=@m --\ @@ -8392,7 +8392,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - mirroring, select_vlan]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 3 ovs-vsctl \ set Bridge br0 mirrors=@m --\ @@ -8415,7 +8415,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - move action]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 ip,actions=move:NXM_OF_IP_SRC[[]]->NXM_NX_REG0[[]],resubmit(90) @@ -8435,7 +8435,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - push action]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 ip,actions=push:NXM_OF_IP_SRC[[]],output(2) @@ -8453,7 +8453,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - learning]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 actions=load:2->NXM_NX_REG0[[0..15]],learn(table=1,priority=65535,NXM_OF_ETH_SRC[[]],NXM_OF_VLAN_TCI[[0..11]],output:NXM_NX_REG0[[0..15]]),output:2 @@ -8481,7 +8481,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - tunnels]) OVS_VSWITCHD_START( [add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-vsctl add-port br0 p2 -- set Interface p2 type=gre \ options:remote_ip=1.1.1.1 ofport_request=2 options:key=flow]) AT_CHECK([ovs-vsctl add-port br0 p3 -- set Interface p3 type=dummy \ @@ -8513,7 +8513,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - dec_ttl]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_CHECK([ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src], [0], [ignore], []) AT_DATA([flows.txt], [dnl @@ -8532,7 +8532,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif megaflow - set dl_dst]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 2 AT_DATA([flows.txt], [dnl table=0 in_port=1 actions=mod_dl_dst(50:54:00:00:00:0a),output(2) @@ -8554,7 +8554,7 @@ AT_CLEANUP m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], [AT_SETUP([ofproto-dpif megaflow - disabled$1]) OVS_VSWITCHD_START([], [], [], [m4_if([$1], [], [], [--dummy-numa="0,0,0,0,1,1,1,1"])]) - AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) func=`printf '%s_' "$1" | cut -c 4-` add_${func}of_ports br0 1 2 AT_DATA([flows.txt], [dnl @@ -8565,7 +8565,7 @@ table=0 in_port=1,ip,nw_dst=10.0.0.3 actions=drop ], []) AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using UFID disabled ], []) - AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg], [0], [], []) + AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg], [0], [], []) AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) for i in 1 2 3 4; do AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) @@ -9165,7 +9165,7 @@ add_of_ports br0 1 2 3 AT_CHECK([ovs-ofctl add-flow br0 'icmp6,icmp_type=128,actions=2']) AT_CHECK([ovs-ofctl add-flow br0 'icmp6,icmp_type=129,actions=3']) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'recirc_id(0),in_port(1),eth(src=f2:49:6e:52:49:0b,dst=02:b7:d7:17:ff:72),eth_type(0x86dd),ipv6(proto=58,frag=no),icmpv6(type=128)']) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'recirc_id(0),in_port(1),eth(src=f2:49:6e:52:49:0b,dst=02:b7:d7:17:ff:72),eth_type(0x86dd),ipv6(proto=58,frag=no),icmpv6(type=128)']) @@ -9213,7 +9213,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif - vlan matching]) OVS_VSWITCHD_START( [add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl del-flows br0]) AT_CHECK([ovs-ofctl add-flow br0 "vlan_tci=0x000a/0x0fff,action=output:local"]) @@ -9231,7 +9231,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif - in place modification]) OVS_VSWITCHD_START( [add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl del-flows br0]) AT_CHECK([ovs-ofctl add-flow br0 in_port=1,actions=mod_vlan_vid:3,output:local]) @@ -9276,7 +9276,7 @@ AT_CLEANUP AT_SETUP([ofproto-dpif - in place modification (vlan)]) OVS_VSWITCHD_START( [add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) # Always drop misses AT_CHECK([ovs-ofctl -O OpenFlow11 mod-table br0 all drop]) @@ -9372,7 +9372,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new UDP connections on p1 for dst port 2, drop everything else. AT_DATA([flows.txt], [dnl @@ -9498,7 +9498,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2, but not on p2->p1. AT_DATA([flows.txt], [dnl @@ -9580,7 +9580,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2, but not on p2->p1. AT_DATA([flows.txt], [dnl @@ -9630,7 +9630,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -9689,7 +9689,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -9743,7 +9743,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) AT_DATA([flows.txt], [dnl ipv6,ct_state=-trk,action=ct(table=0,zone=0) @@ -9775,7 +9775,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 3 4 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2 or p3->p4. dnl Allow only established connections p2->p1 and p4->p3 @@ -9840,7 +9840,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -9940,7 +9940,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10001,7 +10001,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10049,7 +10049,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10097,7 +10097,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10121,7 +10121,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10185,7 +10185,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2. Allow only established connections p2->p1 AT_DATA([flows.txt], [dnl @@ -10273,7 +10273,7 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg vconn:info ofproto_dpif:info]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg vconn:file:info ofproto_dpif:file:info]) dnl Allow new connections on p1->p2, but not on p2->p1. AT_DATA([flows.txt], [dnl @@ -10436,7 +10436,7 @@ AT_CLEANUP AT_SETUP([ofproto - fragment prerequisites]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) add_of_ports br0 1 diff --git a/tests/ofproto.at b/tests/ofproto.at index 9819bc5..d6c6e9a 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -5211,7 +5211,7 @@ AT_CLEANUP AT_SETUP([ofproto - bundle with multiple flow mods (OpenFlow 1.4)]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set vconn:dbg]) +AT_CHECK([ovs-appctl vlog/set vconn:file:dbg]) AT_CHECK([ovs-ofctl --no-names del-flows br0]) @@ -5893,7 +5893,7 @@ AT_CLEANUP AT_SETUP([ofproto - bundle with multiple flow mods (OpenFlow 1.3)]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set vconn:dbg]) +AT_CHECK([ovs-appctl vlog/set vconn:file:dbg]) AT_CHECK([ovs-ofctl --no-names del-flows br0]) diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index fef6aa4..17b4d64 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -3048,7 +3048,7 @@ AT_CLEANUP AT_SETUP([ovs-ofctl replace-flows with --bundle]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set vconn:dbg]) +AT_CHECK([ovs-appctl vlog/set vconn:file:dbg]) dnl Add flows to br0 with importance via OF1.4+, using an OF1.4+ bundle. For more details refer "ovs-ofctl rule with importance" test case. for i in 1 2 3 4 5 6 7 8; do echo "table=$i,dl_vlan=$i,importance=$i,actions=drop"; done > add-flows.txt @@ -3176,7 +3176,7 @@ AT_CLEANUP AT_SETUP([ovs-ofctl ct-flush-zone]) OVS_VSWITCHD_START -AT_CHECK([ovs-appctl vlog/set ct_dpif:dbg]) +AT_CHECK([ovs-appctl vlog/set ct_dpif:file:dbg]) AT_CHECK([ovs-ofctl ct-flush-zone br0 123]) OVS_WAIT_UNTIL([grep -q "|ct_dpif|DBG|.*ct_flush:" ovs-vswitchd.log]) diff --git a/tests/pmd.at b/tests/pmd.at index 4cae6c8..8915b5e 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -182,7 +182,7 @@ OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 ofport_request=7 type=du CHECK_CPU_DISCOVERED() CHECK_PMD_THREADS_CREATED() -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:emc-insert-inv-prob=1]) AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:smc-enable=true]) @@ -250,7 +250,7 @@ OVS_VSWITCHD_START( [add-port br0 p1 -- set Interface p1 type=dummy-pmd ofport_request=1 options:n_rxq=2 -- \ add-port br0 p2 -- set Interface p2 type=dummy-pmd ofport_request=2 ], [], [], [--dummy-numa 0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=controller]) @@ -313,7 +313,7 @@ OVS_VSWITCHD_START( [add-port br0 p1 -- set Interface p1 type=dummy-pmd ofport_request=1 options:n_rxq=2 -- \ set Open_vSwitch . other_config:pmd-cpu-mask=3 ], [], [], [--dummy-numa 0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=controller]) @@ -357,7 +357,7 @@ OVS_VSWITCHD_START( add-port br0 p2 -- set Interface p2 type=dummy-pmd ofport_request=2 options:n_rxq=2 -- \ set Open_vSwitch . other_config:pmd-cpu-mask=3 ], [], [], [--dummy-numa 0,1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=controller]) @@ -436,7 +436,7 @@ OVS_VSWITCHD_START( set Interface br0 options:tx_pcap=br0.pcap -- \ set Open_vSwitch . other_config:pmd-cpu-mask=1 ], [], [], [--dummy-numa 0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL]) @@ -482,7 +482,7 @@ AT_CLEANUP AT_SETUP([PMD - add remove ports]) OVS_VSWITCHD_START( [], [], [], [--dummy-numa 0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 actions=controller]) @@ -526,7 +526,7 @@ AT_CLEANUP AT_SETUP([PMD - rxq affinity]) OVS_VSWITCHD_START( [], [], [], [--dummy-numa 0,0,0,0,0,0,0,0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 actions=controller]) @@ -579,7 +579,7 @@ AT_CLEANUP AT_SETUP([PMD - rxq affinity - NUMA]) OVS_VSWITCHD_START( [], [], [], [--dummy-numa 0,0,0,1,1]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 actions=controller]) @@ -635,7 +635,7 @@ AT_CLEANUP AT_SETUP([PMD - monitor threads]) OVS_VSWITCHD_START( [], [], [], [--dummy-numa 0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) dnl The two devices are connected together externally using net.sock AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=dummy-pmd ofport_request=1 options:n_rxq=1 options:pstream=punix:$OVS_RUNDIR/net.sock]) @@ -672,7 +672,7 @@ AT_CLEANUP AT_SETUP([PMD - dpctl]) OVS_VSWITCHD_START( [del-br br0], [], [], [--dummy-numa 0,0]) -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg]) AT_CHECK([ovs-appctl dpctl/add-dp dummy@dp0]) AT_CHECK([ovs-appctl dpctl/add-if dummy@dp0 p1,type=dummy-pmd]) diff --git a/tests/stp.at b/tests/stp.at index 7ddacfc..cc423b7 100644 --- a/tests/stp.at +++ b/tests/stp.at @@ -401,7 +401,7 @@ OVS_VSWITCHD_START( set port br1 other_config:stp-enable=false -- \ set bridge br1 stp_enable=true --]) -AT_CHECK([ovs-appctl vlog/set ofproto_dpif:dbg]) +AT_CHECK([ovs-appctl vlog/set ofproto_dpif:file:dbg]) AT_CHECK([ovs-vsctl add-port br0 p1 -- \ set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock ofport_request=1 -- \ @@ -486,8 +486,8 @@ AT_CHECK([ other-config:hwaddr=aa:66:aa:66:00:02 ], [0]) -AT_CHECK([ovs-appctl vlog/set ofproto_dpif:dbg]) -AT_CHECK([ovs-appctl vlog/set ofproto_dpif_xlate:dbg]) +AT_CHECK([ovs-appctl vlog/set ofproto_dpif:file:dbg]) +AT_CHECK([ovs-appctl vlog/set ofproto_dpif_xlate:file:dbg]) AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-ofctl add-flow br1 action=normal]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index cbd9542..7eebdf3 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -877,7 +877,7 @@ AT_BANNER([conntrack]) AT_SETUP([conntrack - controller]) CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg ofproto_dpif_upcall:file:dbg]) ADD_NAMESPACES(at_ns0, at_ns1) @@ -921,7 +921,7 @@ AT_CLEANUP AT_SETUP([conntrack - force commit]) CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() -AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif:file:dbg dpif_netdev:file:dbg ofproto_dpif_upcall:file:dbg]) ADD_NAMESPACES(at_ns0, at_ns1) diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index cbdd5a3..bf89223 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -92,7 +92,7 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: clone(tnl_push(tnl_port(6),header(size=74,type=108,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x86dd),ipv6(src=2001:cafe::88,dst=2001:cafe::93,label=0,proto=47,tclass=0x0,hlimit=64),erspan(ver=2,sid=0x237,dir=1,hwid=0x7)),out_port(100)),1) ]) -ovs-appctl vlog/set dbg +ovs-appctl vlog/set file:dbg dnl Check decapsulation of ERSPAN v1 dnl Hex dump: GRE:(100088be) dnl ERSPAN: v1, session id = 0x7b (1000007b), index=3 (00000003) diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index f717243..4a56ff2 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -516,7 +516,7 @@ AT_CLEANUP AT_SETUP([tunnel_push_pop - packet_out]) OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00]) -AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg]) +AT_CHECK([ovs-appctl vlog/set dpif_netdev:file:dbg]) AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy]) AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=geneve \ options:remote_ip=1.1.2.92 options:key=123 ofport_request=2 \ -- 2.7.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
