[ovs-dev] [port-renumbering 6/8] lacp: Make lacp negotiation test hard-code aggregation keys.

[Ethan Jackson]

FWIW I'm fine with this as well.

Ethan

On Wed, Dec 11, 2013 at 11:13 AM, Ben Pfaff <blp at nicira.com> wrote:
> Great minds think alike, I guess.
>
> I applied patches 1 through 6 to master.
>
> On Wed, Dec 11, 2013 at 10:15:25AM -0800, Jarno Rajahalme wrote:
>> I bumped to this yesterday and had the exact same patch ready to be sent, so:
>>
>> Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>
>>
>>
>> On Dec 10, 2013, at 11:20 PM, Ben Pfaff <blp at nicira.com> wrote:
>>
>> > The lacp implementation takes the aggregation key from the key or portid
>> > of the first slave to be added to the lacp object.  When multiple slaves
>> > are added initially to a lacp object (the most common case), which is the
>> > "first" is arbitrary.  Until now, it seems that the "first" was actually
>> > predictable enough for the tests to (unknowingly) rely on it, but an
>> > upcoming commit will break that.  This commit fixes the test by forcing
>> > a particular aggregation key for each lacp object.
>> >
>> > Signed-off-by: Ben Pfaff <blp at nicira.com>
>> > ---
>> > tests/lacp.at |   12 ++++++++----
>> > 1 file changed, 8 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/tests/lacp.at b/tests/lacp.at
>> > index ffc8996..ede7c8f 100644
>> > --- a/tests/lacp.at
>> > +++ b/tests/lacp.at
>> > @@ -126,8 +126,10 @@ OVS_VSWITCHD_START(
>> >   [add-bond br0 bond0 p0 p1 bond_mode=balance-tcp lacp=active \
>> >                             other-config:lacp-time=fast \
>> >                             other-config:bond-rebalance-interval=0 -- \
>> > -   set interface p0 type=patch options:peer=p2 ofport_request=1 -- \
>> > -   set interface p1 type=patch options:peer=p3 ofport_request=2 -- \
>> > +   set interface p0 type=patch options:peer=p2 ofport_request=1 \
>> > +                    other-config:lacp-aggregation-key=2 -- \
>> > +   set interface p1 type=patch options:peer=p3 ofport_request=2 \
>> > +                    other-config:lacp-aggregation-key=2 -- \
>> >    add-br br1 -- \
>> >    set bridge br1 other-config:hwaddr=aa:66:aa:66:00:00 -- \
>> >    set bridge br1 datapath-type=dummy other-config:datapath-id=1234 \
>> > @@ -135,8 +137,10 @@ OVS_VSWITCHD_START(
>> >    add-bond br1 bond1 p2 p3 bond_mode=balance-tcp lacp=active \
>> >                             other-config:lacp-time=fast \
>> >                             other-config:bond-rebalance-interval=0 -- \
>> > -   set interface p2 type=patch options:peer=p0 ofport_request=3 -- \
>> > -   set interface p3 type=patch options:peer=p1 ofport_request=4 --])
>> > +   set interface p2 type=patch options:peer=p0 ofport_request=3 \
>> > +                    other-config:lacp-aggregation-key=4 -- \
>> > +   set interface p3 type=patch options:peer=p1 ofport_request=4 \
>> > +                    other-config:lacp-aggregation-key=4 --])
>> >
>> > AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
>> > ])
>> > --
>> > 1.7.10.4
>> >
>> > _______________________________________________
>> > dev mailing list
>> > dev at openvswitch.org
>> > http://openvswitch.org/mailman/listinfo/dev
>>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev