On 23 September 2016 at 12:16, Eric Garver <e...@erig.me> wrote: > Add macros OVS_CHECK_8021AD(), ADD_SVLAN() and ADD_CVLAN(). > > Signed-off-by: Eric Garver <e...@erig.me>
<skip> > # ADD_OVS_TUNNEL([type], [bridge], [port], [remote-addr], [overlay-addr]) > # > # Add an ovs-based tunnel device in the root namespace, with name 'port' and > @@ -213,3 +236,10 @@ m4_define([OVS_CHECK_GRE], > # OVS_CHECK_GENEVE() > m4_define([OVS_CHECK_GENEVE], > [AT_SKIP_IF([! ip link add foo type geneve help 2>&1 | grep geneve > >/dev/null])]) > + > +# OVS_CHECK_8021AD() > +m4_define([OVS_CHECK_8021AD], > + [AT_SKIP_IF([! grep "VLAN label stack" ovs-vswitchd.log]) > + AT_SKIP_IF([test `sed -n 's/.*VLAN label stack length probed as > \(\d*\)/\1/p' ovs-vswitchd.log` -lt 2]) > + AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:vlan-limit=0]) > + ]) This last hunk is only used by patches 4-7, which it only makes sense to apply when the full functionality is added. I suggest that I drop this and apply the rest of the patch to master (along with patches 1 and 3), then you spin this as a separate patch when reposting the series with the implementation. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
