LNST-developers March 2015

lnst-developers@lists.fedorahosted.org

6 participants
23 discussions

[lnst] XmlTemplates: remove unused skip_reserved_check parameter
by Jiří Pírko 31 Mar '15

31 Mar '15

commit 47d9a49c21243f36954ba10ebda822b5539d45ff Author: Jan Tluka <jtluka(a)redhat.com> Date: Tue Mar 31 11:37:42 2015 +0200 XmlTemplates: remove unused skip_reserved_check parameter Value of skip_reserved_check is nowhere set and default value is used. We can safely remove this. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> lnst/Controller/XmlTemplates.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) --- diff --git a/lnst/Controller/XmlTemplates.py b/lnst/Controller/XmlTemplates.py index 7572b16..8beec9f 100644 --- a/lnst/Controller/XmlTemplates.py +++ b/lnst/Controller/XmlTemplates.py @@ -260,15 +260,14 @@ class XmlTemplates: self._overriden_aliases = overriden - def define_alias(self, name, value, skip_reserved_check=False): + def define_alias(self, name, value): """ Associate an alias name with some value The value can be of an atomic type or an array. The definition is added to the current namespace level. """ - if not name in self._reserved_aliases \ - or skip_reserved_check == True: + if not name in self._reserved_aliases: self._definitions[-1][name] = value else: raise XmlTemplateError("Alias name '%s' is reserved" % name)

1 0

[PATCH] XmlTemplates: remove unused skip_reserved_check parameter
by Jan Tluka 31 Mar '15

31 Mar '15

Value of skip_reserved_check is nowhere set and default value is used. We can safely remove this. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- lnst/Controller/XmlTemplates.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lnst/Controller/XmlTemplates.py b/lnst/Controller/XmlTemplates.py index 7572b16..8beec9f 100644 --- a/lnst/Controller/XmlTemplates.py +++ b/lnst/Controller/XmlTemplates.py @@ -260,15 +260,14 @@ class XmlTemplates: self._overriden_aliases = overriden - def define_alias(self, name, value, skip_reserved_check=False): + def define_alias(self, name, value): """ Associate an alias name with some value The value can be of an atomic type or an array. The definition is added to the current namespace level. """ - if not name in self._reserved_aliases \ - or skip_reserved_check == True: + if not name in self._reserved_aliases: self._definitions[-1][name] = value else: raise XmlTemplateError("Alias name '%s' is reserved" % name) -- 1.9.3

2 1

[lnst] iperf: regexp update
by Jiří Pírko 30 Mar '15

30 Mar '15

commit 2d168635858b60503dedd1c924f5bedaff0a1f2c Author: Artem Savkov <asavkov(a)redhat.com> Date: Fri Mar 27 17:21:00 2015 +0100 iperf: regexp update Updating iperf output parsing regexp to a slightly more flexible version. This still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option which can be added through iperf_options) Signed-off-by: Artem Savkov <asavkov(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> test_modules/Iperf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py index 8e5bd67..1d8735b 100644 --- a/test_modules/Iperf.py +++ b/test_modules/Iperf.py @@ -90,7 +90,7 @@ class Iperf(TestGeneric): logging.info("Iperf connection failed!") return (False, "Iperf connection failed!") - m = re.search("\[[^0-9]*[0-9]*\]\s*0.0-\s*\d*\.\d sec\s*\d*(\.\d*){0,1}\s*[ kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE) + m = re.search("\[[^0-9]*[0-9]*\]\s*0.0+-\s*\d*\.\d+\s*sec\s*\d*(\.\d*){0,1}\s*[ kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE) if m is None: logging.info("Could not get performance throughput!") return (False, "Could not get performance throughput!")

1 0

[PATCH] iperf: regexp update
by Artem Savkov 30 Mar '15

30 Mar '15

Updating iperf output parsing regexp to a slightly more flexible version. This still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option which can be added through iperf_options) --- test_modules/Iperf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py index 8e5bd67..1d8735b 100644 --- a/test_modules/Iperf.py +++ b/test_modules/Iperf.py @@ -90,7 +90,7 @@ class Iperf(TestGeneric): logging.info("Iperf connection failed!") return (False, "Iperf connection failed!") - m = re.search("\[[^0-9]*[0-9]*\]\s*0.0-\s*\d*\.\d sec\s*\d*(\.\d*){0,1}\s*[ kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE) + m = re.search("\[[^0-9]*[0-9]*\]\s*0.0+-\s*\d*\.\d+\s*sec\s*\d*(\.\d*){0,1}\s*[ kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE) if m is None: logging.info("Could not get performance throughput!") return (False, "Could not get performance throughput!") -- 2.1.0

2 2

Current status of command timeout handling in LNST
by Jan Tluka 13 Mar '15

13 Mar '15

Hi everyone, while discussing recent signal handling issues in LNST we also came across timeout handling that seems a bit non clear atm. Any command or test has timeout attribute that defines how much time it takes for command to finish. E.g. <run command="sleep 9" timeout="10"/> Internally we use SIGALRM, to notify the controller about "time is up". The simplest case is a command/test that's run in foreground (not having bg_id attribute). For such command the SIGALRM handler is set to raise an exception and SIGALRM is scheduled based on timeout attribute. If the command does not finish on time it will be killed. Another case is a command that is put in background. In that case the scheduled SIGALRM is immediately reset. Therefore any timeout set for the command in background does not make sense since the SIGALRM is not scheduled anymore (actually it will be scheduled again since there are other commands in the queue, but now irrelevant). For the background commands there are two variants of scenario: a. intr()/kill() is called, here we actually don't care about command timeout, since recipe is written in a way to terminate the process in background b. wait() is called, in this case, the SIGALRM is scheduled for the wait command based on remaining time of the command running in background, so in this case timeout is properly handled and valid All of the above is kind of summary and things are working reliably but I'd still like to start a discussion on the whole subject and also following. If a user specifies timeout for command on background and it has intr() or kill() accompanied, should we restrict it? Should we just notify the user that the timeout specified does not make any difference? Should we implement it so that timeout works also in this case? Ondrej also mentioned, that if the bg command runs for too long it can be killed because of socket timeout. So it might be unexpected behavior. Let me know what you think or if you have more ideas. -Jan

2 1

[lnst] Created tag v7
by Jiří Pírko 11 Mar '15

11 Mar '15

The lightweight tag 'v7' was created pointing to: 5e04316... 7 release

1 0

[lnst] 7 release
by Jiří Pírko 11 Mar '15

11 Mar '15

commit 5e04316d9e4c4b2b00d6be7b021c2f9a88e849ad Author: Jiri Pirko <jiri(a)resnulli.us> Date: Wed Mar 11 13:12:52 2015 +0100 7 release Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/setup.py b/setup.py index 466ed76..a7d0948 100755 --- a/setup.py +++ b/setup.py @@ -171,7 +171,7 @@ DATA_FILES = CONFIG + TEST_MODULES + MULTICAST_TEST_TOOLS + MAN_PAGES + \ SCHEMAS + BASH_COMP + RECIPE_FILES setup(name="lnst", - version="6", + version="7", description="Linux Network Stack Test", author="LNST Team", author_email="lnst-developers(a)lists.fedorahosted.org",

1 0

[lnst] regression_tests: add set of tests for timeout handling
by Jiří Pírko 11 Mar '15

11 Mar '15

commit 64ac633c4ccc7cb3569666dd4ff7857973e8b4a5 Author: Jan Tluka <jtluka(a)redhat.com> Date: Tue Mar 10 15:21:52 2015 +0100 regression_tests: add set of tests for timeout handling Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> regression-tests/tests/27/desc | 10 +++++++ regression-tests/tests/27/recipe1.xml | 32 ++++++++++++++++++++++ regression-tests/tests/27/recipe2.xml | 32 ++++++++++++++++++++++ regression-tests/tests/27/recipe3.xml | 31 +++++++++++++++++++++ regression-tests/tests/27/recipe4.xml | 31 +++++++++++++++++++++ regression-tests/tests/27/recipe5.xml | 32 ++++++++++++++++++++++ regression-tests/tests/27/recipe6.xml | 30 ++++++++++++++++++++ regression-tests/tests/27/recipe7.xml | 30 ++++++++++++++++++++ regression-tests/tests/27/recipe8.xml | 32 ++++++++++++++++++++++ regression-tests/tests/27/run.sh | 48 +++++++++++++++++++++++++++++++++ 10 files changed, 308 insertions(+), 0 deletions(-) --- diff --git a/regression-tests/tests/27/desc b/regression-tests/tests/27/desc new file mode 100644 index 0000000..fb66011 --- /dev/null +++ b/regression-tests/tests/27/desc @@ -0,0 +1,10 @@ +Check timeout handling for commands run in background and foreground. + +1. put a command on bg and intr() it before desired timeout +2. put a command on bg and intr() it after desired timeout +3. put a command on bg and immediately wait for it's completion before timeout +4. put a command on bg and immediately wait for it's completion after timeout +5. put a command on bg and wait for it not earlier after it's completed +6. put a command on fg and set timeout longer than expected completion +7. put a command on fg and set timeout shorter than expected completion + diff --git a/regression-tests/tests/27/recipe1.xml b/regression-tests/tests/27/recipe1.xml new file mode 100644 index 0000000..56b1ff6 --- /dev/null +++ b/regression-tests/tests/27/recipe1.xml @@ -0,0 +1,32 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 10" host="testmachine1" bg_id="1" timeout="15"/> + <ctl_wait seconds="2"/> + <intr host="testmachine1" bg_id="1"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe2.xml b/regression-tests/tests/27/recipe2.xml new file mode 100644 index 0000000..c7a60dc --- /dev/null +++ b/regression-tests/tests/27/recipe2.xml @@ -0,0 +1,32 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 5" host="testmachine1" bg_id="2" timeout="5"/> + <ctl_wait seconds="7"/> + <intr host="testmachine1" bg_id="2"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe3.xml b/regression-tests/tests/27/recipe3.xml new file mode 100644 index 0000000..83510a1 --- /dev/null +++ b/regression-tests/tests/27/recipe3.xml @@ -0,0 +1,31 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 5" host="testmachine1" bg_id="3" timeout="3"/> + <wait host="testmachine1" bg_id="3"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe4.xml b/regression-tests/tests/27/recipe4.xml new file mode 100644 index 0000000..b9f1fe2 --- /dev/null +++ b/regression-tests/tests/27/recipe4.xml @@ -0,0 +1,31 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 5" host="testmachine1" bg_id="4" timeout="7"/> + <wait host="testmachine1" bg_id="4"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe5.xml b/regression-tests/tests/27/recipe5.xml new file mode 100644 index 0000000..f7ac10c --- /dev/null +++ b/regression-tests/tests/27/recipe5.xml @@ -0,0 +1,32 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 10" host="testmachine1" bg_id="1"/> + <ctl_wait seconds="15"/> + <wait host="testmachine1" bg_id="1"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe6.xml b/regression-tests/tests/27/recipe6.xml new file mode 100644 index 0000000..0dac603 --- /dev/null +++ b/regression-tests/tests/27/recipe6.xml @@ -0,0 +1,30 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 5" host="testmachine1" timeout="10"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe7.xml b/regression-tests/tests/27/recipe7.xml new file mode 100644 index 0000000..bcc8c2c --- /dev/null +++ b/regression-tests/tests/27/recipe7.xml @@ -0,0 +1,30 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 5" host="testmachine1" timeout="3"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/recipe8.xml b/regression-tests/tests/27/recipe8.xml new file mode 100644 index 0000000..9809b17 --- /dev/null +++ b/regression-tests/tests/27/recipe8.xml @@ -0,0 +1,32 @@ +<lnstrecipe> + <network> + <host id="testmachine1"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.2/24</address> + <address>fe01::1/64</address> + </addresses> + </eth> + </interfaces> + </host> + <host id="testmachine2"> + <params/> + <interfaces> + <eth id="phy1" label="testnet"> + <addresses> + <address>192.168.100.3/24</address> + <address>fe01::2/64</address> + </addresses> + </eth> + </interfaces> + </host> + </network> + + <task> + <run command="sleep 10" host="testmachine1" bg_id="1"/> + <ctl_wait seconds="2"/> + <intr host="testmachine1" bg_id="1"/> + </task> +</lnstrecipe> diff --git a/regression-tests/tests/27/run.sh b/regression-tests/tests/27/run.sh new file mode 100755 index 0000000..e61da3f --- /dev/null +++ b/regression-tests/tests/27/run.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +. ../lib.sh + +init_test + +lnst-ctl -d run recipe1.xml | tee test.log +rv1=${PIPESTATUS[0]} +log1=`cat test.log` + +lnst-ctl -d run recipe2.xml | tee test.log +rv2=${PIPESTATUS[0]} +log2=`cat test.log` + +lnst-ctl -d run recipe3.xml | tee test.log +rv3=${PIPESTATUS[0]} +log3=`cat test.log` + +lnst-ctl -d run recipe4.xml | tee test.log +rv4=${PIPESTATUS[0]} +log4=`cat test.log` + +lnst-ctl -d run recipe5.xml | tee test.log +rv5=${PIPESTATUS[0]} +log5=`cat test.log` + +lnst-ctl -d run recipe6.xml | tee test.log +rv6=${PIPESTATUS[0]} +log6=`cat test.log` + +lnst-ctl -d run recipe7.xml | tee test.log +rv7=${PIPESTATUS[0]} +log7=`cat test.log` + +print_separator +assert_status "pass" "$rv1" +assert_status "pass" "$rv2" +assert_status "fail" "$rv3" +assert_log "INFO" "RPC connection to machine testmachine1 timed out" "$log3" +assert_status "pass" "$rv4" +assert_status "pass" "$rv5" +assert_status "pass" "$rv6" +assert_status "fail" "$rv7" +assert_log "INFO" "RPC connection to machine testmachine1 timed out" "$log7" + +rm -f test.log + +end_test

1 0

[lnst] recipes: fix ipv6 address retrieval
by Jiří Pírko 11 Mar '15

11 Mar '15

commit c5be259a990c0cb82bbb6b8c84ed58051d300d50 Author: Jan Tluka <jtluka(a)redhat.com> Date: Tue Mar 10 14:37:55 2015 +0100 recipes: fix ipv6 address retrieval Bunch of recipes was using ipv4 address of the interface instead of ipv6 address for Icmp6Ping test module. This made these recipes failing. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> recipes/regression_tests/phase1/3_vlans.py | 2 +- .../regression_tests/phase1/3_vlans_over_bond.py | 2 +- recipes/regression_tests/phase1/simple_ping.py | 2 +- .../phase1/virtual_bridge_vlan_in_guest.py | 2 +- .../phase1/virtual_bridge_vlan_in_host.py | 2 +- .../regression_tests/phase2/3_vlans_over_team.py | 2 +- recipes/regression_tests/phase2/team_test.py | 2 +- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 +- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) --- diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index f59e941..1625b97 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 0ea489b..f511bad 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index 74fd026..2fd48d1 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -19,7 +19,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", "addr": hostB.get_ip("testiface", 1), "count": 100, "interval": 0.2, - "iface" : hostA.get_ip("testiface"), + "iface" : hostA.get_ip("testiface", 1), "limit_rate": 90}) if ctl.get_alias('ipv') == 'ipv6': diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index 8334d6e..4782389 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("vlan10"), + "iface" : g1.get_ip("vlan10", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index e4d3810..bc50b18 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("guestnic"), + "iface" : g1.get_ip("guestnic", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 3deb7f4..a6ef2a2 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index ae6e164..64047de 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -30,7 +30,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : m2.get_ip("test_if", 1), "count" : 100, - "iface" : m1.get_ip("test_if"), + "iface" : m1.get_ip("test_if, 1"), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index 63b5ed4..eae14db 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("vlan10"), + "iface" : g1.get_ip("vlan10", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index e4d3810..bc50b18 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("guestnic"), + "iface" : g1.get_ip("guestnic", 1), "interval" : 0.1 })

1 0

[PATCH] recipes: fix ipv6 address retrieval
by Jan Tluka 11 Mar '15

11 Mar '15

Bunch of recipes was using ipv4 address of the interface instead of ipv6 address for Icmp6Ping test module. This made these recipes failing. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- recipes/regression_tests/phase1/3_vlans.py | 2 +- recipes/regression_tests/phase1/3_vlans_over_bond.py | 2 +- recipes/regression_tests/phase1/simple_ping.py | 2 +- recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 2 +- recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py | 2 +- recipes/regression_tests/phase2/3_vlans_over_team.py | 2 +- recipes/regression_tests/phase2/team_test.py | 2 +- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 +- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index f59e941..1625b97 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 0ea489b..f511bad 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/simple_ping.py b/recipes/regression_tests/phase1/simple_ping.py index 74fd026..2fd48d1 100644 --- a/recipes/regression_tests/phase1/simple_ping.py +++ b/recipes/regression_tests/phase1/simple_ping.py @@ -19,7 +19,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", "addr": hostB.get_ip("testiface", 1), "count": 100, "interval": 0.2, - "iface" : hostA.get_ip("testiface"), + "iface" : hostA.get_ip("testiface", 1), "limit_rate": 90}) if ctl.get_alias('ipv') == 'ipv6': diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index 8334d6e..4782389 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("vlan10"), + "iface" : g1.get_ip("vlan10", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index e4d3810..bc50b18 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("guestnic"), + "iface" : g1.get_ip("guestnic", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 3deb7f4..a6ef2a2 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -33,7 +33,7 @@ for vlan1 in vlans: options={ "addr" : m2.get_ip(vlan2, 1), "count" : 100, - "iface" : m1.get_ip(vlan1), + "iface" : m1.get_ip(vlan1, 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index ae6e164..64047de 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -30,7 +30,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : m2.get_ip("test_if", 1), "count" : 100, - "iface" : m1.get_ip("test_if"), + "iface" : m1.get_ip("test_if, 1"), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index 63b5ed4..eae14db 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("vlan10"), + "iface" : g1.get_ip("vlan10", 1), "interval" : 0.1 }) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index e4d3810..bc50b18 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -32,7 +32,7 @@ ping_mod6 = ctl.get_module("Icmp6Ping", options={ "addr" : h2.get_ip("vlan10", 1), "count" : 100, - "iface" : g1.get_ip("guestnic"), + "iface" : g1.get_ip("guestnic", 1), "interval" : 0.1 }) -- 1.9.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers March 2015