commit 0a371d8cb40230151d2608bb887cdf05002ed75a
Author: Jiri Prochazka <jprochaz(a)redhat.com>
Date: Mon Feb 23 11:18:56 2015 +0100
Change prefix in early network regression tests.
Due to weird behaviour with ping6 and VLANs, we have to change the prefix of IPv6
subnets to /64 (instead of /112).
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
recipes/regression_tests/phase1/3_vlans.xml | 12 ++++++------
.../phase1/3_vlans_over_active_backup_bond.xml | 16 ++++++++--------
.../phase1/3_vlans_over_round_robin_bond.xml | 12 ++++++------
.../regression_tests/phase1/active_backup_bond.xml | 4 ++--
.../phase1/active_backup_double_bond.xml | 4 ++--
recipes/regression_tests/phase1/ping_flood.xml | 4 ++--
.../regression_tests/phase1/round_robin_bond.xml | 4 ++--
.../phase1/round_robin_double_bond.xml | 4 ++--
...tual_bridge_2_vlans_over_active_backup_bond.xml | 8 ++++----
.../phase1/virtual_bridge_vlan_in_guest.xml | 4 ++--
.../phase1/virtual_bridge_vlan_in_host.xml | 4 ++--
.../phase2/3_vlans_over_active_backup_team.xml | 12 ++++++------
.../phase2/3_vlans_over_round_robin_team.xml | 12 ++++++------
.../phase2/active_backup_double_team.xml | 8 ++------
.../regression_tests/phase2/active_backup_team.xml | 4 ++--
.../active_backup_team_vs_active_backup_bond.xml | 4 ++--
.../active_backup_team_vs_round_robin_bond.xml | 4 ++--
.../phase2/round_robin_double_team.xml | 4 ++--
.../regression_tests/phase2/round_robin_team.xml | 4 ++--
.../round_robin_team_vs_active_backup_bond.xml | 4 ++--
.../round_robin_team_vs_round_robin_bond.xml | 8 ++------
..._ovs_bridge_2_vlans_over_active_backup_bond.xml | 8 ++++----
.../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 4 ++--
.../phase2/virtual_ovs_bridge_vlan_in_host.xml | 4 ++--
24 files changed, 74 insertions(+), 82 deletions(-)
---
diff --git a/recipes/regression_tests/phase1/3_vlans.xml
b/recipes/regression_tests/phase1/3_vlans.xml
index a5c47fb..2262b6d 100644
--- a/recipes/regression_tests/phase1/3_vlans.xml
+++ b/recipes/regression_tests/phase1/3_vlans.xml
@@ -15,7 +15,7 @@
</slaves>
<addresses>
<address value="192.168.10.1/24" />
- <address value="2002::10:1/112" />
+ <address value="2002::10:1/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -27,7 +27,7 @@
</slaves>
<addresses>
<address value="192.168.20.1/24" />
- <address value="2002::20:1/112" />
+ <address value="2002::20:1/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -39,7 +39,7 @@
</slaves>
<addresses>
<address value="192.168.30.1/24" />
- <address value="2002::30:1/112" />
+ <address value="2002::30:1/64" />
</addresses>
</vlan>
</interfaces>
@@ -56,7 +56,7 @@
</slaves>
<addresses>
<address value="192.168.10.2/24" />
- <address value="2002::10:2/112" />
+ <address value="2002::10:2/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -68,7 +68,7 @@
</slaves>
<addresses>
<address value="192.168.20.2/24" />
- <address value="2002::20:2/112" />
+ <address value="2002::20:2/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -80,7 +80,7 @@
</slaves>
<addresses>
<address value="192.168.30.2/24" />
- <address value="2002::30:2/112" />
+ <address value="2002::30:2/64" />
</addresses>
</vlan>
</interfaces>
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 ce12030..1b8d0c9 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,7 +17,7 @@
<slave id="eth2" />
</slaves>
<addresses>
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</bond>
<vlan id="vlan10">
@@ -29,7 +29,7 @@
</slaves>
<addresses>
<address value="192.168.10.1/24" />
- <address value="2002::10:1/112" />
+ <address value="2002::10:1/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -41,7 +41,7 @@
</slaves>
<addresses>
<address value="192.168.20.1/24" />
- <address value="2002::20:1/112" />
+ <address value="2002::20:1/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -53,7 +53,7 @@
</slaves>
<addresses>
<address value="192.168.30.1/24" />
- <address value="2002::30:1/112" />
+ <address value="2002::30:1/64" />
</addresses>
</vlan>
</interfaces>
@@ -63,7 +63,7 @@
<eth id="eth1" label="tnet" />
<eth id="eth2" label="tnet">
<addresses>
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</eth>
<vlan id="vlan10">
@@ -75,7 +75,7 @@
</slaves>
<addresses>
<address value="192.168.10.2/24" />
- <address value="2002::10:2/112" />
+ <address value="2002::10:2/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -87,7 +87,7 @@
</slaves>
<addresses>
<address value="192.168.20.2/24" />
- <address value="2002::20:2/112" />
+ <address value="2002::20:2/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -99,7 +99,7 @@
</slaves>
<addresses>
<address value="192.168.30.2/24" />
- <address value="2002::30:2/112" />
+ <address value="2002::30:2/64" />
</addresses>
</vlan>
</interfaces>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
index a0a290b..d8b2f6a 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
@@ -29,7 +29,7 @@
</slaves>
<addresses>
<address value="192.168.10.1/24" />
- <address value="2002::10:1/112" />
+ <address value="2002::10:1/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -41,7 +41,7 @@
</slaves>
<addresses>
<address value="192.168.20.1/24" />
- <address value="2002::20:1/112" />
+ <address value="2002::20:1/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -53,7 +53,7 @@
</slaves>
<addresses>
<address value="192.168.30.1/24" />
- <address value="2002::30:1/112" />
+ <address value="2002::30:1/64" />
</addresses>
</vlan>
</interfaces>
@@ -70,7 +70,7 @@
</slaves>
<addresses>
<address value="192.168.10.2/24" />
- <address value="2002::10:2/112" />
+ <address value="2002::10:2/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -82,7 +82,7 @@
</slaves>
<addresses>
<address value="192.168.20.2/24" />
- <address value="2002::20:2/112" />
+ <address value="2002::20:2/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -94,7 +94,7 @@
</slaves>
<addresses>
<address value="192.168.30.2/24" />
- <address value="2002::30:2/112" />
+ <address value="2002::30:2/64" />
</addresses>
</vlan>
</interfaces>
diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml
b/recipes/regression_tests/phase1/active_backup_bond.xml
index bfe05c5..9121af7 100644
--- a/recipes/regression_tests/phase1/active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_bond.xml
@@ -18,7 +18,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112"/>
+ <address value="2002::1/64"/>
</addresses>
</bond>
</interfaces>
@@ -28,7 +28,7 @@
<eth id="test_if" label="tnet">
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112"/>
+ <address value="2002::2/64"/>
</addresses>
</eth>
</interfaces>
diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml
b/recipes/regression_tests/phase1/active_backup_double_bond.xml
index a09163e..a3d89d9 100644
--- a/recipes/regression_tests/phase1/active_backup_double_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml
@@ -18,7 +18,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112"/>
+ <address value="2002::1/64"/>
</addresses>
</bond>
</interfaces>
@@ -38,7 +38,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112"/>
+ <address value="2002::2/64"/>
</addresses>
</bond>
</interfaces>
diff --git a/recipes/regression_tests/phase1/ping_flood.xml
b/recipes/regression_tests/phase1/ping_flood.xml
index 881f5a5..3423a22 100644
--- a/recipes/regression_tests/phase1/ping_flood.xml
+++ b/recipes/regression_tests/phase1/ping_flood.xml
@@ -8,7 +8,7 @@
<eth id="testiface" label="testnet">
<addresses>
<address>192.168.101.10/24</address>
- <address>2002::1/112</address>
+ <address>2002::1/64</address>
</addresses>
</eth>
</interfaces>
@@ -18,7 +18,7 @@
<eth id="testiface" label="testnet">
<addresses>
<address>192.168.101.11/24</address>
- <address>2002::2/112</address>
+ <address>2002::2/64</address>
</addresses>
</eth>
</interfaces>
diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml
b/recipes/regression_tests/phase1/round_robin_bond.xml
index 63b0f26..a33f2ca 100644
--- a/recipes/regression_tests/phase1/round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_bond.xml
@@ -18,7 +18,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112"/>
+ <address value="2002::1/64"/>
</addresses>
</bond>
</interfaces>
@@ -28,7 +28,7 @@
<eth id="test_if" label="tnet">
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112"/>
+ <address value="2002::2/64"/>
</addresses>
</eth>
</interfaces>
diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml
b/recipes/regression_tests/phase1/round_robin_double_bond.xml
index 0e27fcf..c3313c6 100644
--- a/recipes/regression_tests/phase1/round_robin_double_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml
@@ -18,7 +18,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112"/>
+ <address value="2002::1/64"/>
</addresses>
</bond>
</interfaces>
@@ -38,7 +38,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112"/>
+ <address value="2002::2/64"/>
</addresses>
</bond>
</interfaces>
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 695a544..6877739 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
@@ -63,7 +63,7 @@
<eth id="guestnic" label="to_guest1">
<addresses>
<address>192.168.10.100/24</address>
- <address value="2002::10:100/112"/>
+ <address value="2002::10:100/64"/>
</addresses>
</eth>
</interfaces>
@@ -73,7 +73,7 @@
<eth id="guestnic" label="to_guest2">
<addresses>
<address>192.168.20.100/24</address>
- <address value="2002::20:100/112"/>
+ <address value="2002::20:100/64"/>
</addresses>
</eth>
</interfaces>
@@ -139,7 +139,7 @@
<eth id="guestnic" label="to_guest3">
<addresses>
<address>192.168.10.101/24</address>
- <address value="2002::10:101/112"/>
+ <address value="2002::10:101/64"/>
</addresses>
</eth>
</interfaces>
@@ -149,7 +149,7 @@
<eth id="guestnic" label="to_guest4">
<addresses>
<address>192.168.20.101/24</address>
- <address value="2002::20:101/112"/>
+ <address value="2002::20:101/64"/>
</addresses>
</eth>
</interfaces>
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 26347b8..fb5bf61 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
@@ -30,7 +30,7 @@
</slaves>
<addresses>
<address>192.168.10.10/24</address>
- <address>2002::10:10/112</address>
+ <address>2002::10:10/64</address>
</addresses>
</vlan>
</interfaces>
@@ -47,7 +47,7 @@
</slaves>
<addresses>
<address>192.168.10.11/24</address>
- <address>2002::10:11/112</address>
+ <address>2002::10:11/64</address>
</addresses>
</vlan>
</interfaces>
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 e2b23d1..8636ce0 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
@@ -31,7 +31,7 @@
<eth id="guestnic" label="to_guest">
<addresses>
<address>192.168.10.10/24</address>
- <address>2002::10:10/112</address>
+ <address>2002::10:10/64</address>
</addresses>
</eth>
</interfaces>
@@ -48,7 +48,7 @@
</slaves>
<addresses>
<address>192.168.10.11/24</address>
- <address>2002::10:11/112</address>
+ <address>2002::10:11/64</address>
</addresses>
</vlan>
</interfaces>
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 225f76d..12910fd 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
@@ -35,7 +35,7 @@
</slaves>
<addresses>
<address value="192.168.10.1/24" />
- <address value="2002::10:1/112" />
+ <address value="2002::10:1/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -47,7 +47,7 @@
</slaves>
<addresses>
<address value="192.168.20.1/24" />
- <address value="2002::20:1/112" />
+ <address value="2002::20:1/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -59,7 +59,7 @@
</slaves>
<addresses>
<address value="192.168.30.1/24" />
- <address value="2002::30:1/112" />
+ <address value="2002::30:1/64" />
</addresses>
</vlan>
</interfaces>
@@ -76,7 +76,7 @@
</slaves>
<addresses>
<address value="192.168.10.2/24" />
- <address value="2002::10:2/112" />
+ <address value="2002::10:2/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -88,7 +88,7 @@
</slaves>
<addresses>
<address value="192.168.20.2/24" />
- <address value="2002::20:2/112" />
+ <address value="2002::20:2/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -100,7 +100,7 @@
</slaves>
<addresses>
<address value="192.168.30.2/24" />
- <address value="2002::30:2/112" />
+ <address value="2002::30:2/64" />
</addresses>
</vlan>
</interfaces>
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 cdcec31..aaab95e 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
@@ -35,7 +35,7 @@
</slaves>
<addresses>
<address value="192.168.10.1/24" />
- <address value="2002::10:1/112" />
+ <address value="2002::10:1/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -47,7 +47,7 @@
</slaves>
<addresses>
<address value="192.168.20.1/24" />
- <address value="2002::20:1/112" />
+ <address value="2002::20:1/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -59,7 +59,7 @@
</slaves>
<addresses>
<address value="192.168.30.1/24" />
- <address value="2002::30:1/112" />
+ <address value="2002::30:1/64" />
</addresses>
</vlan>
</interfaces>
@@ -76,7 +76,7 @@
</slaves>
<addresses>
<address value="192.168.10.2/24" />
- <address value="2002::10:2/112" />
+ <address value="2002::10:2/64" />
</addresses>
</vlan>
<vlan id="vlan20">
@@ -88,7 +88,7 @@
</slaves>
<addresses>
<address value="192.168.20.2/24" />
- <address value="2002::20:2/112" />
+ <address value="2002::20:2/64" />
</addresses>
</vlan>
<vlan id="vlan30">
@@ -100,7 +100,7 @@
</slaves>
<addresses>
<address value="192.168.30.2/24" />
- <address value="2002::30:2/112" />
+ <address value="2002::30:2/64" />
</addresses>
</vlan>
</interfaces>
diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml
b/recipes/regression_tests/phase2/active_backup_double_team.xml
index 02c6bf6..f7b76c4 100644
--- a/recipes/regression_tests/phase2/active_backup_double_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_double_team.xml
@@ -7,7 +7,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">
@@ -20,11 +19,10 @@
<slaves>
<slave id="eth1" />
<slave id="eth2" />
- <slave id="eth3" />
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -33,7 +31,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">
@@ -46,11 +43,10 @@
<slaves>
<slave id="eth1" />
<slave id="eth2" />
- <slave id="eth3" />
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</team>
</interfaces>
diff --git a/recipes/regression_tests/phase2/active_backup_team.xml
b/recipes/regression_tests/phase2/active_backup_team.xml
index c476c67..ade4a4c 100644
--- a/recipes/regression_tests/phase2/active_backup_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_team.xml
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -34,7 +34,7 @@
<eth id="test_if" label="tnet">
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</eth>
</interfaces>
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 90cf9ef..cf2359d 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
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -46,7 +46,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</bond>
</interfaces>
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 6d3d1b6..830ee74 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
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -46,7 +46,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</bond>
</interfaces>
diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml
b/recipes/regression_tests/phase2/round_robin_double_team.xml
index 94eb6b5..0642acc 100644
--- a/recipes/regression_tests/phase2/round_robin_double_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_double_team.xml
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</team>
</interfaces>
@@ -50,7 +50,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</team>
</interfaces>
diff --git a/recipes/regression_tests/phase2/round_robin_team.xml
b/recipes/regression_tests/phase2/round_robin_team.xml
index f85a1b0..a3a1031 100644
--- a/recipes/regression_tests/phase2/round_robin_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_team.xml
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -34,7 +34,7 @@
<eth id="test_if" label="tnet">
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</eth>
</interfaces>
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 5562006..fae0d9f 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
@@ -24,7 +24,7 @@
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -46,7 +46,7 @@
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</bond>
</interfaces>
diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
index 8ac5e69..3c406da 100644
--- a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
+++ b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
@@ -7,7 +7,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">
@@ -20,11 +19,10 @@
<slaves>
<slave id="eth1" />
<slave id="eth2" />
- <slave id="eth3" />
</slaves>
<addresses>
<address value="192.168.0.1/24" />
- <address value="2002::1/112" />
+ <address value="2002::1/64" />
</addresses>
</team>
</interfaces>
@@ -33,7 +31,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"
/>
@@ -42,11 +39,10 @@
<slaves>
<slave id="eth1" />
<slave id="eth2" />
- <slave id="eth3" />
</slaves>
<addresses>
<address value="192.168.0.2/24" />
- <address value="2002::2/112" />
+ <address value="2002::2/64" />
</addresses>
</bond>
</interfaces>
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 1347e38..5e54823 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
@@ -44,7 +44,7 @@
<eth id="guestnic" label="to_guest1">
<addresses>
<address>192.168.10.100/24</address>
- <address>2002::10:100/112</address>
+ <address>2002::10:100/64</address>
</addresses>
</eth>
</interfaces>
@@ -54,7 +54,7 @@
<eth id="guestnic" label="to_guest2">
<addresses>
<address>192.168.20.100/24</address>
- <address>2002::20:100/112</address>
+ <address>2002::20:100/64</address>
</addresses>
</eth>
</interfaces>
@@ -101,7 +101,7 @@
<eth id="guestnic" label="to_guest3">
<addresses>
<address>192.168.10.101/24</address>
- <address>2002::10:101/112</address>
+ <address>2002::10:101/64</address>
</addresses>
</eth>
</interfaces>
@@ -111,7 +111,7 @@
<eth id="guestnic" label="to_guest4">
<addresses>
<address>192.168.20.101/24</address>
- <address>2002::20:100/112</address>
+ <address>2002::20:100/64</address>
</addresses>
</eth>
</interfaces>
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 dfab509..c262cab 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
@@ -27,7 +27,7 @@
</slaves>
<addresses>
<address>192.168.10.10/24</address>
- <address>2002::10:10/112</address>
+ <address>2002::10:10/64</address>
</addresses>
</vlan>
</interfaces>
@@ -44,7 +44,7 @@
</slaves>
<addresses>
<address>192.168.10.11/24</address>
- <address>2002::10:11/112</address>
+ <address>2002::10:11/64</address>
</addresses>
</vlan>
</interfaces>
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 13a71cd..e941c4e 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
@@ -25,7 +25,7 @@
<eth id="guestnic" label="to_guest">
<addresses>
<address>192.168.10.10/24</address>
- <address>2002::10:10/112</address>
+ <address>2002::10:10/64</address>
</addresses>
</eth>
</interfaces>
@@ -46,7 +46,7 @@
</slaves>
<addresses>
<address>192.168.10.11/24</address>
- <address>2002::10:11/112</address>
+ <address>2002::10:11/64</address>
</addresses>
</vlan>
</interfaces>