[lnst] team recipes: bug fixes

commit 9fe2cd5c570a2aadaab9f0c704c3b6902038d92b Author: Ondrej Lichtner <olichtne(a)redhat.com&gt; Date: Mon Oct 7 16:48:41 2013 +0200 team recipes: bug fixes This patch fixes a few bugs that prevented some team recipes from working. The labels in "interfaces-team_lb.xml" are obvious- other files used different ones. I increased the wait time for "sequence_iperf.xml" because it sometimes took longer for the iperf server to bind to the address. I moved the information about the "testifc" in the "sequence_pktgen.xml" to be the last one, because for some reason the pktgen won't work properly if that interface is not the last one added for some recipes. There were a few other problems that I've encountered but they were all related to weird race conditions that were probably caused by the fact that I'm using virtual machines. I'm leaving those unchanged, because there isn't really any valid solution for them. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; Signed-off-by: Jiri Pirko <jiri(a)resnulli.us&gt; recipes/team/interfaces-team_lb.xml | 6 +++--- recipes/team/sequence_iperf.xml | 4 ++-- recipes/team/sequence_pktgen.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) --- diff --git a/recipes/team/interfaces-team_lb.xml b/recipes/team/interfaces-team_lb.xml index a2c6407..79e9024 100644 --- a/recipes/team/interfaces-team_lb.xml +++ b/recipes/team/interfaces-team_lb.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" label="1"/> - <eth id="2" label="2"/> - <eth id="3" label="3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> diff --git a/recipes/team/sequence_iperf.xml b/recipes/team/sequence_iperf.xml index f34d47d..e45f307 100644 --- a/recipes/team/sequence_iperf.xml +++ b/recipes/team/sequence_iperf.xml @@ -6,7 +6,7 @@ <option name="bind" value="{ip(2,testiface)}"/> </options> </run> - <ctl_wait seconds="3"/> + <ctl_wait seconds="5"/> <run machine="1" module="Iperf"> <options> <option name="role" value="client"/> @@ -15,4 +15,4 @@ </options> </run> <kill bg_id="1" machine="2"/> -</task> \ No newline at end of file +</task> diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/sequence_pktgen.xml index a5012d9..e09c89c 100644 --- a/recipes/team/sequence_pktgen.xml +++ b/recipes/team/sequence_pktgen.xml @@ -12,10 +12,10 @@ <option name="pktgen_option" value="dst {ip(1,testiface)}"/> <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> <option name="pktgen_option" value="src_min {ip(2,testiface)}"/> - <option name="netdev_name" value="{devname(2,testiface)}"/> <option name="netdev_name" value="{devname(2,2)}"/> <option name="netdev_name" value="{devname(2,3)}"/> + <option name="netdev_name" value="{devname(2,testiface)}"/> </options> </run> <intr bg_id="1" machine="1"/> -</task> \ No newline at end of file +</task>