This patch adds few aliases to use other vlans and ipv4 address networks than hardcoded ones.

For vlan setups aliases are: vlan10_net=192.168.10 vlan10_tag=10 vlan20_net=192.168.20 vlan20_tag=20 vlan30_net=192.168.30 vlan30_tag=30

For baremetal setups: net=192.168.0 this may vary between xmls

To use in lnst-ctl run: lnst-ctl -A vlan10_tag=111 -A vlan20_tag=222 -A vlan30_tag=333 3_vlans.xml

V2: fixed typo vlan10_tag in patch description

Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase1/3_vlans.xml | 30 +++++++++++++--------- .../phase1/3_vlans_over_active_backup_bond.xml | 30 +++++++++++++--------- .../regression_tests/phase1/active_backup_bond.xml | 5 ++-- .../phase1/active_backup_double_bond.xml | 5 ++-- recipes/regression_tests/phase1/ping_flood.xml | 5 ++-- ...tual_bridge_2_vlans_over_active_backup_bond.xml | 28 +++++++++++--------- .../phase1/virtual_bridge_vlan_in_guest.xml | 12 +++++---- .../phase1/virtual_bridge_vlan_in_host.xml | 12 +++++---- .../phase2/3_vlans_over_active_backup_team.xml | 30 +++++++++++++--------- .../phase2/active_backup_double_team.xml | 7 +++-- .../regression_tests/phase2/active_backup_team.xml | 5 ++-- .../active_backup_team_vs_active_backup_bond.xml | 7 +++-- ..._ovs_bridge_2_vlans_over_active_backup_bond.xml | 20 +++++++++------ .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 10 +++++--- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 10 +++++--- 15 files changed, 126 insertions(+), 90 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index 18fc539..318508d 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -7,6 +7,12 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5"/> <alias name="mapping_file" value="3_vlans.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> + <alias name="vlan20_net" value="192.168.20"/> + <alias name="vlan20_tag" value="20"/> + <alias name="vlan30_net" value="192.168.30"/> + <alias name="vlan30_tag" value="30"/> </define> <network> <host id="testmachine1"> @@ -14,37 +20,37 @@ <eth id="eth1" label="tnet" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.10.1/24" /> + <address value="{$vlan10_net}.1/24" /> <address value="2002::10:1/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.20.1/24" /> + <address value="{$vlan20_net}.1/24" /> <address value="2002::20:1/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.30.1/24" /> + <address value="{$vlan30_net}.1/24" /> <address value="2002::30:1/64" /> </addresses> </vlan> @@ -55,37 +61,37 @@ <eth id="eth1" label="tnet" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.10.2/24" /> + <address value="{$vlan10_net}.2/24" /> <address value="2002::10:2/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.20.2/24" /> + <address value="{$vlan20_net}.2/24" /> <address value="2002::20:2/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.30.2/24" /> + <address value="{$vlan30_net}.2/24" /> <address value="2002::30:2/64" /> </addresses> </vlan> diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml index a412adc..36a3659 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml @@ -7,6 +7,12 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5"/> <alias name="mapping_file" value="3_vlans_over_active_backup_bond.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> + <alias name="vlan20_net" value="192.168.20"/> + <alias name="vlan20_tag" value="20"/> + <alias name="vlan30_net" value="192.168.30"/> + <alias name="vlan30_tag" value="30"/> </define> <network> <host id="testmachine1"> @@ -28,37 +34,37 @@ </bond> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="test_bond" /> </slaves> <addresses> - <address value="192.168.10.1/24" /> + <address value="{$vlan10_net}.1/24" /> <address value="2002::10:1/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="test_bond" /> </slaves> <addresses> - <address value="192.168.20.1/24" /> + <address value="{$vlan20_net}.1/24" /> <address value="2002::20:1/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="test_bond" /> </slaves> <addresses> - <address value="192.168.30.1/24" /> + <address value="{$vlan30_net}.1/24" /> <address value="2002::30:1/64" /> </addresses> </vlan> @@ -69,37 +75,37 @@ <eth id="eth1" label="tnet" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.10.2/24" /> + <address value="{$vlan10_net}.2/24" /> <address value="2002::10:2/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.20.2/24" /> + <address value="{$vlan20_net}.2/24" /> <address value="2002::20:2/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.30.2/24" /> + <address value="{$vlan30_net}.2/24" /> <address value="2002::30:2/64" /> </addresses> </vlan> diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index c9b3883..26e338d 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -7,6 +7,7 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5"/> <alias name="mapping_file" value="active_backup_bond.mapping" /> + <alias name="net" value="192.168.0"/> </define> <network> <host id="testmachine1"> @@ -23,7 +24,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.1/24" /> + <address value="{$net}.1/24" /> <address value="2002::1/64"/> </addresses> </bond> @@ -33,7 +34,7 @@ <interfaces> <eth id="test_if" label="tnet"> <addresses> - <address value="192.168.0.2/24" /> + <address value="{$net}.2/24" /> <address value="2002::2/64"/> </addresses> </eth> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index 45258e9..044510a 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -7,6 +7,7 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5"/> <alias name="mapping_file" value="active_backup_double_bond.mapping" /> + <alias name="net" value="192.168.0"/> </define> <network> <host id="testmachine1"> @@ -23,7 +24,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.1/24" /> + <address value="{$net}.1/24" /> <address value="2002::1/64"/> </addresses> </bond> @@ -43,7 +44,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.2/24" /> + <address value="{$net}.2/24" /> <address value="2002::2/64"/> </addresses> </bond> diff --git a/recipes/regression_tests/phase1/ping_flood.xml b/recipes/regression_tests/phase1/ping_flood.xml index 9409227..29aa3ac 100644 --- a/recipes/regression_tests/phase1/ping_flood.xml +++ b/recipes/regression_tests/phase1/ping_flood.xml @@ -2,13 +2,14 @@ <define> <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> + <alias name="net" value="192.168.101" /> </define> <network> <host id="machine1"> <interfaces> <eth id="testiface" label="testnet"> <addresses> - <address>192.168.101.10/24</address> + <address>{$net}.10/24</address> <address>2002::1/64</address> </addresses> </eth> @@ -18,7 +19,7 @@ <interfaces> <eth id="testiface" label="testnet"> <addresses> - <address>192.168.101.11/24</address> + <address>{$net}.11/24</address> <address>2002::2/64</address> </addresses> </eth> diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml index 04de618..e4c648e 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml @@ -7,6 +7,10 @@ <alias name="nperf_max_runs" value="5"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> + <alias name="vlan20_net" value="192.168.20"/> + <alias name="vlan20_tag" value="20"/> </define> <network> <host id="host1"> @@ -30,7 +34,7 @@ </bond> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="bond" /> @@ -38,7 +42,7 @@ </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="bond" /> @@ -50,7 +54,7 @@ <slave id="vlan10" /> </slaves> <addresses> - <address>192.168.10.10/24</address> + <address>{$vlan10_net}.10/24</address> </addresses> </bridge> <bridge id="br2"> @@ -59,7 +63,7 @@ <slave id="vlan20" /> </slaves> <addresses> - <address>192.168.20.10/24</address> + <address>{$vlan20_net}.10/24</address> </addresses> </bridge> </interfaces> @@ -68,7 +72,7 @@ <interfaces> <eth id="guestnic" label="to_guest1"> <addresses> - <address>192.168.10.100/24</address> + <address>{$vlan10_net}.100/24</address> <address value="2002::10:100/64"/> </addresses> </eth> @@ -78,7 +82,7 @@ <interfaces> <eth id="guestnic" label="to_guest2"> <addresses> - <address>192.168.20.100/24</address> + <address>{$vlan20_net}.100/24</address> <address value="2002::20:100/64"/> </addresses> </eth> @@ -106,7 +110,7 @@ </bond> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="bond" /> @@ -114,7 +118,7 @@ </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="bond" /> @@ -126,7 +130,7 @@ <slave id="tap1"/> </slaves> <addresses> - <address>192.168.10.11/24</address> + <address>{$vlan10_net}.11/24</address> </addresses> </bridge> <bridge id="br2"> @@ -135,7 +139,7 @@ <slave id="tap2"/> </slaves> <addresses> - <address>192.168.20.11/24</address> + <address>{$vlan20_net}.11/24</address> </addresses> </bridge> </interfaces> @@ -144,7 +148,7 @@ <interfaces> <eth id="guestnic" label="to_guest3"> <addresses> - <address>192.168.10.101/24</address> + <address>{$vlan10_net}.101/24</address> <address value="2002::10:101/64"/> </addresses> </eth> @@ -154,7 +158,7 @@ <interfaces> <eth id="guestnic" label="to_guest4"> <addresses> - <address>192.168.20.101/24</address> + <address>{$vlan20_net}.101/24</address> <address value="2002::20:101/64"/> </addresses> </eth> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml index 7d36ba5..b8ec826 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -7,6 +7,8 @@ <alias name="nperf_max_runs" value="5"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_guest.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> </define> <network> <host id="host1"> @@ -19,7 +21,7 @@ <slave id="nic" /> </slaves> <addresses> - <address>192.168.10.1/24</address> + <address>{$vlan10_net}.1/24</address> </addresses> </bridge> </interfaces> @@ -33,13 +35,13 @@ </eth> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="guestnic" /> </slaves> <addresses> - <address>192.168.10.10/24</address> + <address>{$vlan10_net}.10/24</address> <address>2002::10:10/64</address> </addresses> </vlan> @@ -50,13 +52,13 @@ <eth id="nic" label="to_switch" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="nic" /> </slaves> <addresses> - <address>192.168.10.11/24</address> + <address>{$vlan10_net}.11/24</address> <address>2002::10:11/64</address> </addresses> </vlan> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml index ae351b2..9c867a9 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -7,6 +7,8 @@ <alias name="nperf_max_runs" value="5"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_host.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> </define> <network> <host id="host1"> @@ -15,7 +17,7 @@ <eth id="tap" label="to_guest" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="nic" /> @@ -27,7 +29,7 @@ <slave id="vlan10" /> </slaves> <addresses> - <address>192.168.10.1/24</address> + <address>{$vlan10_net}.1/24</address> </addresses> </bridge> </interfaces> @@ -39,7 +41,7 @@ <param name="driver" value="virtio" /> </params> <addresses> - <address>192.168.10.10/24</address> + <address>{$vlan10_net}.10/24</address> <address>2002::10:10/64</address> </addresses> </eth> @@ -50,13 +52,13 @@ <eth id="nic" label="to_switch" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="nic" /> </slaves> <addresses> - <address>192.168.10.11/24</address> + <address>{$vlan10_net}.11/24</address> <address>2002::10:11/64</address> </addresses> </vlan> 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 2d2d6bf..1eb5a3a 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 @@ -7,6 +7,12 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="3_vlans_over_active_backup_team.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> + <alias name="vlan20_net" value="192.168.20"/> + <alias name="vlan20_tag" value="20"/> + <alias name="vlan30_net" value="192.168.30"/> + <alias name="vlan30_tag" value="30"/> </define> <network> <host id="testmachine1"> @@ -32,37 +38,37 @@ </team> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="test_if" /> </slaves> <addresses> - <address value="192.168.10.1/24" /> + <address value="{$vlan10_net}.1/24" /> <address value="2002::10:1/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="test_if" /> </slaves> <addresses> - <address value="192.168.20.1/24" /> + <address value="{$vlan20_net}.1/24" /> <address value="2002::20:1/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="test_if" /> </slaves> <addresses> - <address value="192.168.30.1/24" /> + <address value="{$vlan30_net}.1/24" /> <address value="2002::30:1/64" /> </addresses> </vlan> @@ -73,37 +79,37 @@ <eth id="eth1" label="tnet" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.10.2/24" /> + <address value="{$vlan10_net}.2/24" /> <address value="2002::10:2/64" /> </addresses> </vlan> <vlan id="vlan20"> <options> - <option name="vlan_tci" value="20" /> + <option name="vlan_tci" value="{$vlan20_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.20.2/24" /> + <address value="{$vlan20_net}.2/24" /> <address value="2002::20:2/64" /> </addresses> </vlan> <vlan id="vlan30"> <options> - <option name="vlan_tci" value="30" /> + <option name="vlan_tci" value="{$vlan30_tag}" /> </options> <slaves> <slave id="eth1" /> </slaves> <addresses> - <address value="192.168.30.2/24" /> + <address value="{$vlan30_net}.2/24" /> <address value="2002::30:2/64" /> </addresses> </vlan> diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index 34ed65e..8c2d5b7 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -7,6 +7,7 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="active_backup_double_team.mapping" /> + <alias name="net" value="192.168.0"/> </define> <network> <host id="testmachine1"> @@ -27,7 +28,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.1/24" /> + <address value="{$net}.1/24" /> <address value="2002::1/64" /> </addresses> </team> @@ -51,7 +52,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.2/24" /> + <address value="{$net}.2/24" /> <address value="2002::2/64" /> </addresses> </team> @@ -61,5 +62,3 @@

<task python="team_test.py" /> </lnstrecipe> - - diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index ac3eb6f..4e7d419 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -7,6 +7,7 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="active_backup_team.mapping" /> + <alias name="net" value="192.168.0"/> </define> <network> <host id="testmachine1"> @@ -27,7 +28,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.1/24" /> + <address value="{$net}.1/24" /> <address value="2002::1/64" /> </addresses> </team> @@ -37,7 +38,7 @@ <interfaces> <eth id="test_if" label="tnet"> <addresses> - <address value="192.168.0.2/24" /> + <address value="{$net}.2/24" /> <address value="2002::2/64" /> </addresses> </eth> 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 d20348e..e421d2c 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 @@ -7,6 +7,7 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="active_backup_team_vs_active_backup_bond.mapping" /> + <alias name="net" value="192.168.0"/> </define> <network> <host id="testmachine1"> @@ -27,7 +28,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.1/24" /> + <address value="{$net}.1/24" /> <address value="2002::1/64" /> </addresses> </team> @@ -47,7 +48,7 @@ <slave id="eth2" /> </slaves> <addresses> - <address value="192.168.0.2/24" /> + <address value="{$net}.2/24" /> <address value="2002::2/64" /> </addresses> </bond> @@ -57,5 +58,3 @@

<task python="team_test.py" /> </lnstrecipe> - - diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml index 97f9b6e..0d5fcf1 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml @@ -6,6 +6,10 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> + <alias name="vlan20_net" value="192.168.20"/> + <alias name="vlan20_tag" value="20"/> </define> <network> <host id="host1"> @@ -21,12 +25,12 @@ <slave id="tap1"/> <slave id="tap2"/> </slaves> - <vlan tag="10"> + <vlan tag="{$vlan10_tag}"> <slaves> <slave id="tap1"/> </slaves> </vlan> - <vlan tag="20"> + <vlan tag="{$vlan20_tag}"> <slaves> <slave id="tap2"/> </slaves> @@ -48,7 +52,7 @@ <interfaces> <eth id="guestnic" label="to_guest1"> <addresses> - <address>192.168.10.100/24</address> + <address>{$vlan10_net}.100/24</address> <address>2002::10:100/64</address> </addresses> </eth> @@ -58,7 +62,7 @@ <interfaces> <eth id="guestnic" label="to_guest2"> <addresses> - <address>192.168.20.100/24</address> + <address>{$vlan20_net}.100/24</address> <address>2002::20:100/64</address> </addresses> </eth> @@ -78,12 +82,12 @@ <slave id="tap1"/> <slave id="tap2"/> </slaves> - <vlan tag="10"> + <vlan tag="{$vlan10_tag}"> <slaves> <slave id="tap1"/> </slaves> </vlan> - <vlan tag="20"> + <vlan tag="{$vlan20_tag}"> <slaves> <slave id="tap2"/> </slaves> @@ -105,7 +109,7 @@ <interfaces> <eth id="guestnic" label="to_guest3"> <addresses> - <address>192.168.10.101/24</address> + <address>{$vlan10_net}.101/24</address> <address>2002::10:101/64</address> </addresses> </eth> @@ -115,7 +119,7 @@ <interfaces> <eth id="guestnic" label="to_guest4"> <addresses> - <address>192.168.20.101/24</address> + <address>{$vlan20_net}.101/24</address> <address>2002::20:100/64</address> </addresses> </eth> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml index 80ad328..890e808 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml @@ -6,6 +6,8 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_guest.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> </define> <network> <host id="host1"> @@ -29,13 +31,13 @@ </eth> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="guestnic" /> </slaves> <addresses> - <address>192.168.10.10/24</address> + <address>{$vlan10_net}.10/24</address> <address>2002::10:10/64</address> </addresses> </vlan> @@ -46,13 +48,13 @@ <eth id="nic" label="to_switch" /> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="nic" /> </slaves> <addresses> - <address>192.168.10.11/24</address> + <address>{$vlan10_net}.11/24</address> <address>2002::10:11/64</address> </addresses> </vlan> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml index 9995891..f6c5b28 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml @@ -6,6 +6,8 @@ <alias name="nperf_confidence" value="99,5" /> <alias name="nperf_max_runs" value="5" /> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_host.mapping" /> + <alias name="vlan10_net" value="192.168.10"/> + <alias name="vlan10_tag" value="10"/> </define> <network> <host id="host1"> @@ -17,7 +19,7 @@ <slave id="tap" /> <slave id="nic" /> </slaves> - <vlan tag="10"> + <vlan tag="{$vlan10_tag}"> <slaves> <slave id="tap"/> </slaves> @@ -32,7 +34,7 @@ <param name="driver" value="virtio"/> </params> <addresses> - <address>192.168.10.10/24</address> + <address>{$vlan10_net}.10/24</address> <address>2002::10:10/64</address> </addresses> </eth> @@ -44,13 +46,13 @@ </eth> <vlan id="vlan10"> <options> - <option name="vlan_tci" value="10" /> + <option name="vlan_tci" value="{$vlan10_tag}" /> </options> <slaves> <slave id="nic" /> </slaves> <addresses> - <address>192.168.10.11/24</address> + <address>{$vlan10_net}.11/24</address> <address>2002::10:11/64</address> </addresses> </vlan>