On Wed, Jun 13, 2012 at 10:58:56PM -0700, Ben Pfaff wrote: > On Thu, Jun 14, 2012 at 08:51:49AM +0900, Simon Horman wrote: > > Add OFPUTIL_P_OF12, NXPIF_OPENFLOW12 and NXFF_OPENFLOW12 for Open Flow 1.2 > > > > OFPUTIL_P_OF12_TID and in turn OFPUTIL_P_OF12_ANY is not provided as > > OFPUTIL_P_OF12 supports the use of table ids in modify flow messages. > > > > Signed-off-by: Simon Horman <[email protected]> > > This introduces some new warnings: > > ../lib/ofp-util.c: In function ‘ofputil_encode_flow_mod’: > ../lib/ofp-util.c:1777: error: enumeration value ‘OFPUTIL_P_OF12’ not handled > in switch > ../lib/ofp-util.c: In function ‘ofputil_encode_flow_stats_request’: > ../lib/ofp-util.c:1939: error: enumeration value ‘OFPUTIL_P_OF12’ not handled > in switch > ../lib/ofp-util.c: In function ‘ofputil_encode_flow_removed’: > ../lib/ofp-util.c:2297: error: enumeration value ‘OFPUTIL_P_OF12’ not handled > in switch > > I usually build with -Werror so that's bad...
Also introduces a couple of test failures. The first is trivially fixable: # -*- compilation -*- 128. ofp-errors.at:81: testing decoding OFPBIC_* experimenter errors ... ../../tests/ofp-errors.at:83: ovs-ofctl ofp-print '0201001455555555 00030005 0102000811111111' ../../tests/ofp-errors.at:88: ovs-ofctl ofp-print '0301001455555555 00030005 0102000811111111' --- - 2012-06-13 22:59:33.672642450 -0700 +++ /home/blp/nicira/ovs/_build/tests/testsuite.dir/at-groups/128/stdout 2012-06-13 22:59:33.000000000 -0700 @@ -1,3 +1,3 @@ -OFPT_ERROR (OF 0x03) (xid=0x55555555): OFPBIC_BAD_EXPERIMENTER +OFPT_ERROR (OF1.2) (xid=0x55555555): OFPBIC_BAD_EXPERIMENTER OFPT_ECHO_REQUEST (xid=0x11111111): 0 bytes of payload 128. ofp-errors.at:81: 128. decoding OFPBIC_* experimenter errors (ofp-errors.at:81): FAILED (ofp-errors.at:88) The second is this. I'm not sure that we should really ever allow OpenFlow12 to be chosen at this point, since it's not really complete (this probably comes back to the "top-down" versus "bottom-up" discussion we had on IRC): # -*- compilation -*- 159. learn.at:18: testing learning action - examples ... ../../tests/learn.at:26: ovs-ofctl parse-flows flows.txt --- - 2012-06-13 22:59:36.878200570 -0700 +++ /home/blp/nicira/ovs/_build/tests/testsuite.dir/at-groups/159/stdout 2012-06-13 22:59:36.000000000 -0700 @@ -1,4 +1,4 @@ -usable protocols: OpenFlow10+table_id,NXM+table_id +usable protocols: OpenFlow10+table_id,NXM+table_id,OpenFlow12 chosen protocol: OpenFlow10+table_id OFPT_FLOW_MOD (xid=0x1): ADD table:255 actions=learn(table=1,in_port=99,NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG1[16..31]) OFPT_FLOW_MOD (xid=0x2): ADD table:255 actions=learn(table=1,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],output:NXM_OF_IN_PORT[]) 159. learn.at:18: 159. learning action - examples (learn.at:18): FAILED (learn.at:26) _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
