LNST-developers September 2016

lnst-developers@lists.fedorahosted.org

6 participants
23 discussions

[PATCH] test_tools: remove IP_DROP_MEMBERSHIP no device test
by Jan Tluka 06 Sep '16

06 Sep '16

This test is no longer valid as it is. Linux kernel has been patched to do more sanity checks and bypass the device check so this test now returns EADDRNOTAVAIL error. The kernel patch is: 4eba7bb1d72d9bde67d810d09bf62dc207b63c5c ipv4: igmp: Allow removing groups from a removed interface Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- test_tools/multicast/offline/sockopt_membership.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test_tools/multicast/offline/sockopt_membership.c b/test_tools/multicast/offline/sockopt_membership.c index 4f8adc3..2d2f8f1 100644 --- a/test_tools/multicast/offline/sockopt_membership.c +++ b/test_tools/multicast/offline/sockopt_membership.c @@ -47,7 +47,6 @@ void test_drop_membership() struct ip_mreq mreq; mreq.imr_multiaddr.s_addr = inet_addr("127.0.0.1"); mreq.imr_interface.s_addr = inet_addr("127.0.0.1"); - struct ip_mreqn mreqn; test_setsockopt_error("IP_DROP_MEMBERSHIP Bad optlen", IP_DROP_MEMBERSHIP, &mreq, 5, EINVAL); @@ -58,12 +57,6 @@ void test_drop_membership() mreq.imr_interface.s_addr = inet_addr("127.0.0.1"); test_setsockopt_error("IP_DROP_MEMBERSHIP Not a member", IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq), EADDRNOTAVAIL); - - mreqn.imr_multiaddr.s_addr = inet_addr("239.1.2.3"); - mreqn.imr_address.s_addr = inet_addr("255.255.255.255"); - mreqn.imr_ifindex = 500; - test_setsockopt_error("IP_DROP_MEMBERSHIP No device found", - IP_DROP_MEMBERSHIP, &mreqn, sizeof(mreqn), ENODEV); } int main() -- 2.4.11

2 1

[PATCH lnst 0/8] Layer 3 basic Switchdev recipes
by Elad Raz 06 Sep '16

06 Sep '16

This patchset introduce Layer 3 support in LNST. The pacthset add route APIs and introduce route reporisoty for cleanup. The last patchset add basic Layer 3 tests for router interface. Elad Raz (8): README: Adding prerequirement contoller: Removing BridgeCtl class InterfaceAPI: Adding slave IPv6 route support InterfaceAPI: Adding nexthop route support Machine: Adding route repository InterfaceAPI: Export route commands switchdev: Testlib adding UDP router support recipes: Add L3 basic recipe README.md | 23 +++++++++ lnst/Controller/Machine.py | 31 ++++++++++-- lnst/Controller/Task.py | 16 ++++++- lnst/Controller/VirtUtils.py | 74 ----------------------------- lnst/Slave/InterfaceManager.py | 20 ++++++-- lnst/Slave/NetTestSlave.py | 24 ++++++++-- recipes/switchdev/TestLib.py | 1 + recipes/switchdev/l3-000-minimal.py | 54 +++++++++++++++++++++ recipes/switchdev/l3-000-minimal.xml | 24 ++++++++++ recipes/switchdev/l3-001-router-port.py | 51 ++++++++++++++++++++ recipes/switchdev/l3-001-router-port.xml | 24 ++++++++++ recipes/switchdev/l3-002-vlan-interface.py | 54 +++++++++++++++++++++ recipes/switchdev/l3-002-vlan-interface.xml | 24 ++++++++++ recipes/switchdev/l3-003-bond-interface.py | 60 +++++++++++++++++++++++ recipes/switchdev/l3-003-bond-interface.xml | 26 ++++++++++ recipes/switchdev/l3-004-team-interface.py | 60 +++++++++++++++++++++++ recipes/switchdev/l3-004-team-interface.xml | 26 ++++++++++ 17 files changed, 504 insertions(+), 88 deletions(-) create mode 100644 recipes/switchdev/l3-000-minimal.py create mode 100644 recipes/switchdev/l3-000-minimal.xml create mode 100644 recipes/switchdev/l3-001-router-port.py create mode 100644 recipes/switchdev/l3-001-router-port.xml create mode 100644 recipes/switchdev/l3-002-vlan-interface.py create mode 100644 recipes/switchdev/l3-002-vlan-interface.xml create mode 100644 recipes/switchdev/l3-003-bond-interface.py create mode 100644 recipes/switchdev/l3-003-bond-interface.xml create mode 100644 recipes/switchdev/l3-004-team-interface.py create mode 100644 recipes/switchdev/l3-004-team-interface.xml -- 2.4.3

2 9

[PATCH] recipes: add driver alias to regression tests
by Jan Tluka 06 Sep '16

06 Sep '16

All recipes in phase1 and phase2 directory now take alias named 'driver'. By default it's value is 'ixgbe'. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- recipes/regression_tests/phase1/3_vlans.xml | 12 ++++++++-- .../phase1/3_vlans_over_active_backup_bond.xml | 19 +++++++++++++--- .../regression_tests/phase1/active_backup_bond.xml | 16 +++++++++++-- .../phase1/active_backup_double_bond.xml | 25 +++++++++++++++++---- recipes/regression_tests/phase1/ping_flood.xml | 7 ++++++ recipes/regression_tests/phase1/simple_netperf.xml | 7 ++++++ ...tual_bridge_2_vlans_over_active_backup_bond.xml | 25 +++++++++++++++++---- .../phase1/virtual_bridge_vlan_in_guest.xml | 13 +++++++++-- .../phase1/virtual_bridge_vlan_in_host.xml | 13 +++++++++-- .../phase2/3_vlans_over_active_backup_team.xml | 19 +++++++++++++--- .../phase2/active_backup_double_team.xml | 26 ++++++++++++++++++---- .../regression_tests/phase2/active_backup_team.xml | 16 +++++++++++-- .../active_backup_team_vs_active_backup_bond.xml | 25 +++++++++++++++++---- ..._ovs_bridge_2_vlans_over_active_backup_bond.xml | 25 +++++++++++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 13 +++++++++-- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 10 ++++++++- 16 files changed, 232 insertions(+), 39 deletions(-) diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index 5c0f1fe..1b3fc6e 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -21,7 +21,11 @@ <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> @@ -62,7 +66,11 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> 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 26300b1..431202b 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 @@ -17,12 +17,21 @@ <alias name="vlan20_tag" value="20"/> <alias name="vlan30_net" value="192.168.30"/> <alias name="vlan30_tag" value="30"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <bond id="test_bond"> <options> <option name="mode" value="active-backup" /> @@ -73,7 +82,11 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index 0b79f4c..ce2e610 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -12,12 +12,21 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> @@ -37,6 +46,9 @@ <host id="testmachine2"> <interfaces> <eth id="test_if" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address value="{$net}.2/24" /> <address value="fc00:0:0:0::2/64"/> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index bc39db8..5154504 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -12,12 +12,21 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_double_bond.mapping" /> <alias name="net" value="192.168.0"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> @@ -36,8 +45,16 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> diff --git a/recipes/regression_tests/phase1/ping_flood.xml b/recipes/regression_tests/phase1/ping_flood.xml index 5ccac21..68b6d57 100644 --- a/recipes/regression_tests/phase1/ping_flood.xml +++ b/recipes/regression_tests/phase1/ping_flood.xml @@ -3,11 +3,15 @@ <alias name="ipv" value="both" /> <alias name="mtu" value="1500" /> <alias name="net" value="192.168.101" /> + <alias name="driver" value="ixgbe" /> </define> <network> <host id="machine1"> <interfaces> <eth id="testiface" label="testnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address>{$net}.10/24</address> <address>fc00:0:0:0::1/64</address> @@ -18,6 +22,9 @@ <host id="machine2"> <interfaces> <eth id="testiface" label="testnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address>{$net}.11/24</address> <address>fc00:0:0:0::2/64</address> diff --git a/recipes/regression_tests/phase1/simple_netperf.xml b/recipes/regression_tests/phase1/simple_netperf.xml index 0f106aa..a202852 100644 --- a/recipes/regression_tests/phase1/simple_netperf.xml +++ b/recipes/regression_tests/phase1/simple_netperf.xml @@ -12,11 +12,15 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="simple_netperf.mapping" /> <alias name="net" value="192.168.101" /> + <alias name="driver" value="ixgbe" /> </define> <network> <host id="machine1"> <interfaces> <eth id="testiface" label="testnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address>{$net}.10/24</address> <address>fc00:0:0:0::1/64</address> @@ -27,6 +31,9 @@ <host id="machine2"> <interfaces> <eth id="testiface" label="testnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address>{$net}.11/24</address> <address>fc00:0:0:0::2/64</address> 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 5b5223e..9a2b3f4 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 @@ -15,12 +15,21 @@ <alias name="vlan10_tag" value="10"/> <alias name="vlan20_net" value="192.168.20"/> <alias name="vlan20_tag" value="20"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> <interfaces> - <eth id="nic1" label="to_switch" /> - <eth id="nic2" label="to_switch" /> + <eth id="nic1" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> + <eth id="nic2" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap1" label="to_guest1" /> <eth id="tap2" label="to_guest2" /> <bond id="bond"> @@ -95,8 +104,16 @@ <host id="host2"> <interfaces> - <eth id="nic1" label="to_switch"/> - <eth id="nic2" label="to_switch"/> + <eth id="nic1" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> + <eth id="nic2" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap1" label="to_guest3"/> <eth id="tap2" label="to_guest4"/> <bond id="bond"> 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 7768542..dd33be1 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -13,6 +13,7 @@ <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"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> @@ -20,7 +21,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap" label="to_guest" /> <bridge id="br"> <slaves> @@ -59,7 +64,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> 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 a38848b..382d9c6 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -13,6 +13,7 @@ <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"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> @@ -20,7 +21,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap" label="to_guest" /> <vlan id="vlan10"> <options> @@ -59,7 +64,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> 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 c2a5117..683675f 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 @@ -17,12 +17,21 @@ <alias name="vlan20_tag" value="20"/> <alias name="vlan30_net" value="192.168.30"/> <alias name="vlan30_tag" value="30"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <team id="test_if"> <options> <option name="teamd_config"> @@ -80,7 +89,11 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index 3825fb0..420992f 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -12,12 +12,22 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_double_team.mapping" /> <alias name="net" value="192.168.0"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <team id="test_if"> <options> <option name="teamd_config"> @@ -40,8 +50,16 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <team id="test_if"> <options> <option name="teamd_config"> diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index abf4451..7a1f059 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -12,12 +12,21 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_team.mapping" /> <alias name="net" value="192.168.0"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <team id="test_if"> <options> <option name="teamd_config"> @@ -41,6 +50,9 @@ <host id="testmachine2"> <interfaces> <eth id="test_if" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> <addresses> <address value="{$net}.2/24" /> <address value="fc00:0:0:0::2/64" /> 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 e0cb9c1..37e0d02 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 @@ -12,12 +12,21 @@ <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_team_vs_active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="testmachine1"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <team id="test_if"> <options> <option name="teamd_config"> @@ -40,8 +49,16 @@ </host> <host id="testmachine2"> <interfaces> - <eth id="eth1" label="tnet" /> - <eth id="eth2" label="tnet" /> + <eth id="eth1" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> + <eth id="eth2" label="tnet"> + <params> + <param name="driver" value="{$driver}"/> + </params> + </eth> <bond id="test_if"> <options> <option name="mode" value="active-backup" /> 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 4f34ac5..32b4c06 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 @@ -14,12 +14,21 @@ <alias name="vlan10_tag" value="10"/> <alias name="vlan20_net" value="192.168.20"/> <alias name="vlan20_tag" value="20"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> <interfaces> - <eth id="nic1" label="to_switch" /> - <eth id="nic2" label="to_switch" /> + <eth id="nic1" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> + <eth id="nic2" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap1" label="to_guest1" /> <eth id="tap2" label="to_guest2" /> <ovs_bridge id="bridge"> @@ -75,8 +84,16 @@ <host id="host2"> <interfaces> - <eth id="nic1" label="to_switch"/> - <eth id="nic2" label="to_switch"/> + <eth id="nic1" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> + <eth id="nic2" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap1" label="to_guest3"/> <eth id="tap2" label="to_guest4"/> <ovs_bridge id="bridge"> 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 bfea7a0..ae85997 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 @@ -12,6 +12,7 @@ <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"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> @@ -19,7 +20,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap" label="to_guest" /> <ovs_bridge id="br"> <slaves> @@ -55,7 +60,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch" /> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <vlan id="vlan10"> <options> <option name="vlan_tci" value="{$vlan10_tag}" /> 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 ea8f41a..6b2a271 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 @@ -12,6 +12,7 @@ <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"/> + <alias name="driver" value="ixgbe"/> </define> <network> <host id="host1"> @@ -19,7 +20,11 @@ <param name="machine_type" value="baremetal"/> </params> <interfaces> - <eth id="nic" label="to_switch"/> + <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> + </eth> <eth id="tap" label="to_guest"/> <ovs_bridge id="ovs_br"> <slaves> @@ -53,6 +58,9 @@ </params> <interfaces> <eth id="nic" label="to_switch"> + <params> + <param name="driver" value="{$driver}" /> + </params> </eth> <vlan id="vlan10"> <options> -- 2.4.11

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers September 2016