Set of team recipes to test whether team driver can work with VLANs.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/team/interfaces/interfaces-simple_vlan.xml | 15 ++++++
.../team/interfaces/interfaces-team_ab_vlan.xml | 58 ++++++++++++++++++++++
.../team/interfaces/interfaces-team_bcast_vlan.xml | 32 ++++++++++++
.../interfaces/interfaces-team_lacp_act_vlan.xml | 49 ++++++++++++++++++
.../team/interfaces/interfaces-team_lacp_vlan.xml | 46 +++++++++++++++++
.../interfaces/interfaces-team_lb_act_vlan.xml | 38 ++++++++++++++
.../team/interfaces/interfaces-team_lb_vlan.xml | 36 ++++++++++++++
.../team/interfaces/interfaces-team_rr_vlan.xml | 32 ++++++++++++
recipes/team/recipex_ab_vlan_004.xml | 19 +++++++
recipes/team/recipex_bcast_vlan_004.xml | 19 +++++++
recipes/team/recipex_lacp_act_vlan_004.xml | 19 +++++++
recipes/team/recipex_lacp_vlan_004.xml | 19 +++++++
recipes/team/recipex_lb_act_vlan_004.xml | 19 +++++++
recipes/team/recipex_lb_vlan_004.xml | 19 +++++++
recipes/team/recipex_rr_vlan_004.xml | 19 +++++++
15 files changed, 439 insertions(+)
create mode 100644 recipes/team/interfaces/interfaces-simple_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_ab_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_bcast_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_lacp_act_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_lacp_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_lb_act_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_lb_vlan.xml
create mode 100644 recipes/team/interfaces/interfaces-team_rr_vlan.xml
create mode 100644 recipes/team/recipex_ab_vlan_004.xml
create mode 100644 recipes/team/recipex_bcast_vlan_004.xml
create mode 100644 recipes/team/recipex_lacp_act_vlan_004.xml
create mode 100644 recipes/team/recipex_lacp_vlan_004.xml
create mode 100644 recipes/team/recipex_lb_act_vlan_004.xml
create mode 100644 recipes/team/recipex_lb_vlan_004.xml
create mode 100644 recipes/team/recipex_rr_vlan_004.xml
diff --git a/recipes/team/interfaces/interfaces-simple_vlan.xml
b/recipes/team/interfaces/interfaces-simple_vlan.xml
new file mode 100644
index 0000000..68420c4
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-simple_vlan.xml
@@ -0,0 +1,15 @@
+<interfaces>
+ <eth id="eth" label="net1"/>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="eth"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_ab_vlan.xml
b/recipes/team/interfaces/interfaces-team_ab_vlan.xml
new file mode 100644
index 0000000..47b47ca
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_ab_vlan.xml
@@ -0,0 +1,58 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"},
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10,
+ "sticky": true
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 100
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 50
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_bcast_vlan.xml
b/recipes/team/interfaces/interfaces-team_bcast_vlan.xml
new file mode 100644
index 0000000..89f5d79
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_bcast_vlan.xml
@@ -0,0 +1,32 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <!--"hwaddr": "00:11:22:33:44:55",-->
+ <option name="teamd_config">
+ {
+ "runner": {"name": "broadcast"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_lacp_act_vlan.xml
b/recipes/team/interfaces/interfaces-team_lacp_act_vlan.xml
new file mode 100644
index 0000000..a60e5a8
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_lacp_act_vlan.xml
@@ -0,0 +1,49 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <!--"hwaddr": "00:11:22:33:44:55",-->
+ <option name="teamd_config">
+ {
+ "runner": {
+ "name": "lacp",
+ "active": true,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4",
"ipv6"],
+ "tx_balancer": {
+ "name": "basic"
+ }
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_lacp_vlan.xml
b/recipes/team/interfaces/interfaces-team_lacp_vlan.xml
new file mode 100644
index 0000000..6611cbd
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_lacp_vlan.xml
@@ -0,0 +1,46 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <!--"hwaddr": "00:11:22:33:44:55",-->
+ <option name="teamd_config">
+ {
+ "runner": {
+ "name": "lacp",
+ "active": true,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4",
"ipv6"]
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_lb_act_vlan.xml
b/recipes/team/interfaces/interfaces-team_lb_act_vlan.xml
new file mode 100644
index 0000000..8a2293b
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_lb_act_vlan.xml
@@ -0,0 +1,38 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {
+ "name": "loadbalance",
+ "tx_hash": ["eth", "ipv4",
"ipv6"],
+ "tx_balancer": {
+ "name": "basic"
+ }
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_lb_vlan.xml
b/recipes/team/interfaces/interfaces-team_lb_vlan.xml
new file mode 100644
index 0000000..7eb35c5
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_lb_vlan.xml
@@ -0,0 +1,36 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {
+ "name": "loadbalance",
+ "tx_hash": ["eth", "ipv4",
"ipv6"]
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+
+</interfaces>
diff --git a/recipes/team/interfaces/interfaces-team_rr_vlan.xml
b/recipes/team/interfaces/interfaces-team_rr_vlan.xml
new file mode 100644
index 0000000..cdf51f2
--- /dev/null
+++ b/recipes/team/interfaces/interfaces-team_rr_vlan.xml
@@ -0,0 +1,32 @@
+<interfaces>
+ <eth id="1" label="net1"/>
+ <eth id="2" label="net1"/>
+ <eth id="3" label="net1"/>
+ <team id="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "roundrobin"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ </team>
+ <vlan id="testiface">
+ <options>
+ <option name="vlan_tci" value="100"/>
+ </options>
+ <slaves>
+ <slave id="team"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </vlan>
+</interfaces>
diff --git a/recipes/team/recipex_ab_vlan_004.xml b/recipes/team/recipex_ab_vlan_004.xml
new file mode 100644
index 0000000..ef65ee1
--- /dev/null
+++ b/recipes/team/recipex_ab_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include href="interfaces/interfaces-team_ab_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_bcast_vlan_004.xml
b/recipes/team/recipex_bcast_vlan_004.xml
new file mode 100644
index 0000000..412e14e
--- /dev/null
+++ b/recipes/team/recipex_bcast_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include
href="interfaces/interfaces-team_bcast_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_lacp_act_vlan_004.xml
b/recipes/team/recipex_lacp_act_vlan_004.xml
new file mode 100644
index 0000000..da6e2c7
--- /dev/null
+++ b/recipes/team/recipex_lacp_act_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include
href="interfaces/interfaces-team_lacp_act_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_lacp_vlan_004.xml
b/recipes/team/recipex_lacp_vlan_004.xml
new file mode 100644
index 0000000..606be37
--- /dev/null
+++ b/recipes/team/recipex_lacp_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include
href="interfaces/interfaces-team_lacp_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_lb_act_vlan_004.xml
b/recipes/team/recipex_lb_act_vlan_004.xml
new file mode 100644
index 0000000..faaed33
--- /dev/null
+++ b/recipes/team/recipex_lb_act_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include
href="interfaces/interfaces-team_lb_act_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_lb_vlan_004.xml b/recipes/team/recipex_lb_vlan_004.xml
new file mode 100644
index 0000000..7931776
--- /dev/null
+++ b/recipes/team/recipex_lb_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include href="interfaces/interfaces-team_lb_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_rr_vlan_004.xml b/recipes/team/recipex_rr_vlan_004.xml
new file mode 100644
index 0000000..483e6c2
--- /dev/null
+++ b/recipes/team/recipex_rr_vlan_004.xml
@@ -0,0 +1,19 @@
+<lnstrecipe
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <network>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <host id="1">
+ <xi:include href="interfaces/interfaces-team_rr_vlan.xml"/>
+ </host>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <host id="2">
+ <xi:include href="interfaces/interfaces-simple_vlan.xml"/>
+ </host>
+ </network>
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
--
1.8.1.4