On Wed, Jul 18, 2012 at 12:02:19PM +0900, Simon Horman wrote: > Signed-off-by: Simon Horman <ho...@verge.net.au>
When I apply this to master (currently 333be161abe78), I get the following test failure. It isn't immediately obvious to me why this change should have an effect on dl_vlan_pcp, so I'll leave it to you to take a look and let me know. Thanks, Ben. # -*- compilation -*- 453. ofproto.at:740: testing ofproto - flow monitoring ... ../../tests/ofproto.at:742: ovsdb-tool create openvswitch/conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema ../../tests/ofproto.at:742: ovsdb-server --detach --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock stderr: 2012-07-18T17:13:19Z|00001|vlog|INFO|opened log file /home/blp/ovs/_build/tests/testsuite.dir/0453/ovsdb-server.log ../../tests/ofproto.at:742: sed < stderr ' /vlog|INFO|opened log file/d /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d' ../../tests/ofproto.at:742: ovs-vsctl --no-wait init ../../tests/ofproto.at:742: ovs-vswitchd --detach --pidfile --enable-dummy --disable-system --log-file stderr: 2012-07-18T17:13:19Z|00001|vlog|INFO|opened log file /home/blp/ovs/_build/tests/testsuite.dir/0453/ovs-vswitchd.log 2012-07-18T17:13:19Z|00002|reconnect|INFO|unix:/home/blp/ovs/_build/tests/testsuite.dir/0453/db.sock: connecting... 2012-07-18T17:13:19Z|00003|reconnect|INFO|unix:/home/blp/ovs/_build/tests/testsuite.dir/0453/db.sock: connected ../../tests/ofproto.at:742: sed < stderr ' /vlog|INFO|opened log file/d /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d /reconnect|INFO|/d /ofproto|INFO|using datapath ID/d /ofproto|INFO|datapath ID changed to fedcba9876543210/d' ../../tests/ofproto.at:742: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 fail-mode=secure -- ../../tests/ofproto.at:750: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log ../../tests/ofproto.at:782: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log --- - 2012-07-18 10:13:19.716295506 -0700 +++ /home/blp/ovs/_build/tests/testsuite.dir/at-groups/453/stdout 2012-07-18 10:13:19.000000000 -0700 @@ -47,16 +47,16 @@ event=DELETED reason=delete table=0 cookie=0x5 in_port=0,dl_vlan=123,dl_vlan_pcp=0 actions=output:3 event=DELETED reason=delete table=0 cookie=0x5 in_port=0,dl_vlan=123,dl_vlan_pcp=1 actions=output:3 NXST_FLOW_MONITOR reply (xid=0x0): - event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=0 actions=output:21 - event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=1 actions=output:22 + event=DELETED reason=delete table=0 cookie=0 in_port=0 actions=output:23 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=0 actions=output:20 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=124 actions=output:2 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=4095 actions=output:14 + event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=0 actions=output:21 + event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=1 actions=output:22 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=4095,dl_vlan_pcp=1 actions=output:13 event=DELETED reason=delete table=0 cookie=0 in_port=0,vlan_tci=0x0000 actions=output:11 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=0 actions=output:18 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=4095,dl_vlan_pcp=0 actions=output:12 event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=1 actions=output:19 - event=DELETED reason=delete table=0 cookie=0 in_port=0 actions=output:23 OFPT_BARRIER_REPLY: ovsdb-server.log: > 2012-07-18T17:13:19Z|00001|vlog|INFO|opened log file > /home/blp/ovs/_build/tests/testsuite.dir/0453/ovsdb-server.log > 2012-07-18T17:13:19Z|00002|ovsdb_server|INFO|ovsdb-server (Open vSwitch) > 1.8.90 ovs-vswitchd.log: > 2012-07-18T17:13:19Z|00001|vlog|INFO|opened log file > /home/blp/ovs/_build/tests/testsuite.dir/0453/ovs-vswitchd.log > 2012-07-18T17:13:19Z|00002|reconnect|INFO|unix:/home/blp/ovs/_build/tests/testsuite.dir/0453/db.sock: > connecting... > 2012-07-18T17:13:19Z|00003|reconnect|INFO|unix:/home/blp/ovs/_build/tests/testsuite.dir/0453/db.sock: > connected > 2012-07-18T17:13:19Z|00004|bridge|INFO|ovs-vswitchd (Open vSwitch) 1.8.90 > 2012-07-18T17:13:19Z|00005|netlink_socket|WARN|setting 1048576-byte socket > receive buffer failed (Operation not permitted) > 2012-07-18T17:13:19Z|00006|bridge|INFO|bridge br0: using datapath ID > fedcba9876543210 > 2012-07-18T17:13:19Z|00007|connmgr|INFO|br0: added service controller > "punix:/home/blp/ovs/_build/tests/testsuite.dir/0453/br0.mgmt" > 2012-07-18T17:13:19Z|00008|bridge|INFO|ovs-vswitchd (Open vSwitch) 1.8.90 monitor.log: > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=124 actions=output:2 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=123 actions=output:5 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=123,dl_vlan_pcp=0 > actions=output:6 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=123,dl_vlan_pcp=1 > actions=output:7 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=123 actions=output:8 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=0 > actions=output:9 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=1 > actions=output:10 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,vlan_tci=0x0000 actions=output:11 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=4095,dl_vlan_pcp=0 > actions=output:12 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=4095,dl_vlan_pcp=1 > actions=output:13 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=4095 actions=output:14 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=0 > actions=output:15 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=1 > actions=output:16 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0 actions=output:17 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=0 > actions=output:18 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0,dl_vlan_pcp=1 > actions=output:19 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan=0 actions=output:20 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan_pcp=0 actions=output:21 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0,dl_vlan_pcp=1 actions=output:22 > NXST_FLOW_MONITOR reply (xid=0x0): > event=ADDED table=0 cookie=0 in_port=0 actions=output:23 > NXST_FLOW_MONITOR reply (xid=0x0): > event=MODIFIED table=0 cookie=0x5 in_port=0,dl_vlan=123 actions=output:3 > event=MODIFIED table=0 cookie=0x5 in_port=0,dl_vlan=123,dl_vlan_pcp=0 > actions=output:3 > event=MODIFIED table=0 cookie=0x5 in_port=0,dl_vlan=123,dl_vlan_pcp=1 > actions=output:3 > NXST_FLOW_MONITOR reply (xid=0x0): > event=DELETED reason=delete table=0 cookie=0x5 in_port=0,dl_vlan=123 > actions=output:3 > event=DELETED reason=delete table=0 cookie=0x5 > in_port=0,dl_vlan=123,dl_vlan_pcp=0 actions=output:3 > event=DELETED reason=delete table=0 cookie=0x5 > in_port=0,dl_vlan=123,dl_vlan_pcp=1 actions=output:3 > NXST_FLOW_MONITOR reply (xid=0x0): > event=DELETED reason=delete table=0 cookie=0 in_port=0 actions=output:23 > event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=0 > actions=output:20 > event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=124 > actions=output:2 > event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan=4095 > actions=output:14 > event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=0 > actions=output:21 > event=DELETED reason=delete table=0 cookie=0 in_port=0,dl_vlan_pcp=1 > actions=output:22 > event=DELETED reason=delete table=0 cookie=0 > in_port=0,dl_vlan=4095,dl_vlan_pcp=1 actions=output:13 > event=DELETED reason=delete table=0 cookie=0 in_port=0,vlan_tci=0x0000 > actions=output:11 > event=DELETED reason=delete table=0 cookie=0 > in_port=0,dl_vlan=0,dl_vlan_pcp=0 actions=output:18 > event=DELETED reason=delete table=0 cookie=0 > in_port=0,dl_vlan=4095,dl_vlan_pcp=0 actions=output:12 > event=DELETED reason=delete table=0 cookie=0 > in_port=0,dl_vlan=0,dl_vlan_pcp=1 actions=output:19 > OFPT_BARRIER_REPLY (xid=0x6): 453. ofproto.at:740: 453. ofproto - flow monitoring (ofproto.at:740): FAILED (ofproto.at:782) _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
