On Mon, Jul 30, 2012 at 09:54:32PM -0700, Ben Pfaff wrote: > On Mon, Jul 30, 2012 at 11:03:04AM +0900, Simon Horman wrote: > > In the case of Open Flow 1.2, which is currently the only > > time that OXM is be used, there is a 4 byte header before > > the match which needs to be taken into account when calculating > > the pad length. This complicates nx_match pull and put somewhat. > > > > This patch takes an approach suggested by Ben Pfaff to separate the > > encoding of the match and the adding of padding and, in the case of OXM, > > a header. > > > > Signed-off-by: Simon Horman <ho...@verge.net.au> > > With this applied I get a couple of test failures, so I pushed the first > 5 patches to master and stopped applying them for tonight.
Thanks. I thought I had run the testsuite on all the changes. In any case I'll investigate this. > > Here are the failures: > > 147. ovs-ofctl.at:1673: testing ovs-ofctl parse-oxm loose ... > ../../tests/ovs-ofctl.at:1679: ovs-ofctl --strict parse-oxm < oxm.txt > ../../tests/ovs-ofctl.at:1683: ovs-ofctl parse-oxm < oxm.txt > --- - 2012-07-30 21:52:46.074399961 -0700 > +++ /home/blp/nicira/ovs/_build/tests/testsuite.dir/at-groups/147/stdout > 2012-07-30 21:52:46.000000000 -0700 > @@ -1,2 +1,2 @@ > -OXM_OF_IN_PORT(00000001), OXM_OF_ETH_TYPE(0800) > +nx_pull_match() returned error OFPBMC_BAD_FIELD > > 147. ovs-ofctl.at:1673: 147. ovs-ofctl parse-oxm loose (ovs-ofctl.at:1673): > FAILED (ovs-ofctl.at:1683) > > > 148. ovs-ofctl.at:1690: testing ovs-ofctl check-vlan ... > ../../tests/ovs-ofctl.at:1694: ovs-ofctl check-vlan 0000 0000 > ../../tests/ovs-ofctl.at:1703: ovs-ofctl check-vlan 0000 ffff > --- - 2012-07-30 21:52:46.085910728 -0700 > +++ /home/blp/nicira/ovs/_build/tests/testsuite.dir/at-groups/148/stdout > 2012-07-30 21:52:46.000000000 -0700 > @@ -1,6 +1,6 @@ > vlan_tci=0x0000 -> 0000/ffff > NXM: NXM_OF_VLAN_TCI(0000) -> 0000/ffff > -OXM: OXM_OF_VLAN_VID(0000) -> 0000/1fff,-- > +OXM: NXM_OF_VLAN_TCI(0000) -> 0000/1fff,-- > OF1.0: ffff/0,00/1 -> 0000/ffff > OF1.1: ffff/0,00/1 -> 0000/ffff > > 148. ovs-ofctl.at:1690: 148. ovs-ofctl check-vlan (ovs-ofctl.at:1690): FAILED > (ovs-ofctl.at:1703) > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
