The phase1 tests use two ethernet devices for bond setups. Most of the machines in our lab have 2 devices available for testing. This patch modifies phase2 team recipes so that team device is grouping two devices instead of original three.
Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml | 2 -- recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml | 2 -- recipes/regression_tests/phase2/3_vlans_over_team.py | 2 -- recipes/regression_tests/phase2/active_backup_team.xml | 2 -- .../phase2/active_backup_team_vs_active_backup_bond.xml | 4 ---- .../phase2/active_backup_team_vs_round_robin_bond.xml | 4 ---- recipes/regression_tests/phase2/round_robin_double_team.xml | 4 ---- recipes/regression_tests/phase2/round_robin_team.xml | 2 -- .../phase2/round_robin_team_vs_active_backup_bond.xml | 4 ---- 9 files changed, 26 deletions(-)
diff --git a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml index 87a056a..de4738f 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="1.2.3.4/24" /> diff --git a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml index 612fe01..bf1bcf9 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="1.2.3.4/24" /> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index fc04b29..0913d27 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -119,8 +119,6 @@ for vlan1 in vlans: offload, state)) m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth2"), offload, state)) - m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth3"), - offload, state)) m2.run("ethtool -K %s %s %s" % (m2.get_devname("eth1"), offload, state))
diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index 1897d4f..fa91239 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml index 21b5463..7ce28d2 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> @@ -35,7 +33,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> @@ -44,7 +41,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.2/24" /> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml index a949c07..30f95ca 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> @@ -35,7 +33,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <bond id="test_if"> <options> <option name="mode" value="balance-rr" /> @@ -44,7 +41,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.2/24" /> diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml b/recipes/regression_tests/phase2/round_robin_double_team.xml index 450bad8..e553b43 100644 --- a/recipes/regression_tests/phase2/round_robin_double_team.xml +++ b/recipes/regression_tests/phase2/round_robin_double_team.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> @@ -35,7 +33,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -48,7 +45,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.2/24" /> diff --git a/recipes/regression_tests/phase2/round_robin_team.xml b/recipes/regression_tests/phase2/round_robin_team.xml index ba1b8fc..df91816 100644 --- a/recipes/regression_tests/phase2/round_robin_team.xml +++ b/recipes/regression_tests/phase2/round_robin_team.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml index e389126..19fad3e 100644 --- a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml @@ -9,7 +9,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <team id="test_if"> <options> <option name="teamd_config"> @@ -22,7 +21,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.1/24" /> @@ -35,7 +33,6 @@ <interfaces> <eth id="eth1" label="tnet" /> <eth id="eth2" label="tnet" /> - <eth id="eth3" label="tnet" /> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> @@ -44,7 +41,6 @@ <slaves> <slave id="eth1" /> <slave id="eth2" /> - <slave id="eth3" /> </slaves> <addresses> <address value="192.168.0.2/24" />
lnst-developers@lists.fedorahosted.org