[lnst] Change prefix in early network regression tests.
by Jiří Pírko
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>
9 years, 1 month
[lnst] regression-tests: detect slave machines in nonstandard pool directories
by Jiří Pírko
commit 3ad0f508dce8970ae094719be2d821244a8431a2
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:30 2015 +0100
regression-tests: detect slave machines in nonstandard pool directories
You can now run regression tests without setting up your slave machines.
The run-test.sh script will detect what machine pools will lnst-ctl be
configured with and set them up automatically for you, before running
any tests.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
regression-tests/run-test.sh | 75 ++++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 31 deletions(-)
---
diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 400802e..329491e 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -56,6 +56,15 @@ function usage
exit 0
}
+function get_pool_dirs
+{
+ if [ "$use_user_conf" = "true" ]; then
+ command lnst-ctl --dump-config | grep 'machine_pool_dirs' | cut -d = -f2
+ else
+ command lnst-ctl -c $repo/lnst-ctl.conf --dump-config | grep 'machine_pool_dirs' | cut -d = -f2
+ fi
+}
+
# ---
#default repository url
@@ -121,38 +130,42 @@ fi
#cp -r env ~/.lnst
cp -r env/* $repo/
+pool_dirs=`PATH="$repo:$PATH" get_pool_dirs`
+
# Scan the pool and prepare the machines in it
-for machine in `ls -1 env/pool/`; do
- hostname=`get_hostname env/pool/$machine`
+for pool_dir in "$pool_dirs"; do
+ for machine in `ls -1 $pool_dir`; do
+ hostname=`get_hostname $pool_dir/$machine`
- # In case this script was killed and there are any slave processes
- # left hanging on the machine.
- ssh "root@$hostname" 'for p in `pgrep lnst-slave`; do kill -9 $p; done'
+ # In case this script was killed and there are any slave processes
+ # left hanging on the machine.
+ ssh "root@$hostname" 'for p in `pgrep lnst-slave`; do kill -9 $p; done'
- # Create a temporary dir for the git tree to be tested
- remote_repo=`ssh "root@$hostname" "mktemp -d"`
+ # Create a temporary dir for the git tree to be tested
+ remote_repo=`ssh "root@$hostname" "mktemp -d"`
- # Transfer the repo to the machine
- rsync -r --exclude "Logs" --exclude ".git" "$repo/" \
- "root@$hostname:$remote_repo"
+ # Transfer the repo to the machine
+ rsync -r --exclude "Logs" --exclude ".git" "$repo/" \
+ "root@$hostname:$remote_repo"
- if [ ! -z $nm_off ]; then
- ssh "root@$hostname" "cd $remote_repo && echo \"use_nm = false\" >> lnst-slave.conf"
- fi
+ if [ ! -z $nm_off ]; then
+ ssh "root@$hostname" "cd $remote_repo && echo \"use_nm = false\" >> lnst-slave.conf"
+ fi
- # Start the slave process
- ssh -n -t -t "root@$hostname" "cd $remote_repo && ./lnst-slave" >/dev/null \
- 2>/dev/null &
- pid=$!
+ # Start the slave process
+ ssh -n -t -t "root@$hostname" "cd $remote_repo && ./lnst-slave" >/dev/null \
+ 2>/dev/null &
+ pid=$!
- # Save the status (hostname, pid of the ssh session, repo path)
- # so we can cleanup things properly after the tests.
- if [ -z "$slave_status" ]; then
- slave_status="$hostname $pid $remote_repo"
- else
- slave_status="$hostname $pid $remote_repo
- $slave_status"
- fi
+ # Save the status (hostname, pid of the ssh session, repo path)
+ # so we can cleanup things properly after the tests.
+ if [ -z "$slave_status" ]; then
+ slave_status="$hostname $pid $remote_repo"
+ else
+ slave_status="$hostname $pid $remote_repo
+ $slave_status"
+ fi
+ done
done
sleep 1
9 years, 1 month
[lnst] regression-tests: don't use user conf by default
by Jiří Pírko
commit 1300e4d718f2d286e3611f9403260438b24025c5
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:29 2015 +0100
regression-tests: don't use user conf by default
This commit changes the default behaviour of running regression tests to
use the configuration present in the regression-tests/env/ directory -
this means that you need to properly create a pool in the env/pool/
directory before running these regression tests.
The option -c was added for situation when you want to use your own
local LNST configuration.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
regression-tests/run-test.sh | 9 ++++++---
regression-tests/tests/lib.sh | 9 +++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 0ccb4db..400802e 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -41,7 +41,7 @@ function print_separator
function usage
{
- echo "Usage: $0 [-r revision] [-l logdir] [-t list_of_tests] [-u url] [-n]"
+ echo "Usage: $0 [-c] [-r revision] [-l logdir] [-t list_of_tests] [-u url] [-n]"
echo " -r revision Test a specific git branch/rev/tag"
echo " Note: ignored when -s is used"
echo " -l logdir Save test results to a directory"
@@ -52,6 +52,7 @@ function usage
echo " -u url URL pointing to LNST repository that should be used"
echo " Note: git clone and checkout by default"
echo " -s use rsync instead of git"
+ echo " -c use user configuration"
exit 0
}
@@ -60,10 +61,12 @@ function usage
#default repository url
url="../"
use_git=true
+export use_user_conf="false"
-while getopts "hlr:t:g:ns" OPTION
+while getopts "chlr:t:g:ns" OPTION
do
case $OPTION in
+ c) use_user_conf="true" ;;
h) usage ;;
l) log_dir_name="results-`date "+%Y-%m-%d-%I-%M-%S"`"
mkdir -p $log_dir_name
@@ -93,7 +96,7 @@ fi
echo "$$" >.lock
# Clone the repo
-repo=`mktemp -d`
+export repo=`mktemp -d`
if $use_git ; then
git clone $url $repo
else
diff --git a/regression-tests/tests/lib.sh b/regression-tests/tests/lib.sh
index df83ab1..5286534 100644
--- a/regression-tests/tests/lib.sh
+++ b/regression-tests/tests/lib.sh
@@ -56,3 +56,12 @@ function print_separator
{
echo "--------------------------------------------------------------------------------"
}
+
+function lnst-ctl
+{
+ if [ "$use_user_conf" = "true" ]; then
+ command lnst-ctl $@
+ else
+ command lnst-ctl -c $repo/lnst-ctl.conf $@
+ fi
+}
9 years, 1 month
[lnst] regression-tests: fix killing lnst-slaves after testing
by Jiří Pírko
commit c9ea9d22338e4894d5813ebb8320be3030855e81
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:28 2015 +0100
regression-tests: fix killing lnst-slaves after testing
The if test was wrong so lnst-slave processes weren't being killed
properly.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
regression-tests/run-test.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 1c9c657..0ccb4db 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -219,7 +219,7 @@ print_separator
sleep 1
# Cleanup
-if [ $slave_status ]; then
+if [ -n "$slave_status" ]; then
while read line; do
hostname=`awk '{print $1}' <<<"$line"`
pid=`awk '{print $2}' <<<"$line"`
9 years, 1 month
[lnst] lnst-ctl: accept multiple -c options
by Jiří Pírko
commit 36a1a0fe7e384cca642c3e7e3f6e8f52ff8a09df
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:27 2015 +0100
lnst-ctl: accept multiple -c options
The option -c (--config) can now be specified multiple times. This is
usefull when running lnst-ctl from a script.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst-ctl | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/lnst-ctl b/lnst-ctl
index e715bb8..9a321b6 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -226,7 +226,6 @@ def main():
result_path = None
html_result_path = None
xslt_url = None
- config_path = None
packet_capture = False
pool_checks = True
coloured_output = True
@@ -241,7 +240,11 @@ def main():
elif opt in ("-h", "--help"):
usage(RETVAL_PASS)
elif opt in ("-c", "--config"):
- config_path = arg
+ if not os.path.isfile(arg):
+ print "File '%s' doesn't exist!" % arg
+ usage(RETVAL_ERR)
+ else:
+ lnst_config.load_config(arg)
elif opt in ("-x", "--result"):
result_path = arg
elif opt in ("-t", "--html"):
@@ -265,12 +268,6 @@ def main():
elif opt in ("--dump-config"):
dump_config = True
- if config_path is not None:
- if not os.path.isfile(config_path):
- print "File '%s' doesn't exist!" % config_path
- usage(RETVAL_ERR)
- else:
- lnst_config.load_config(config_path)
if xslt_url != None:
lnst_config.set_option("environment", "xslt_url", xslt_url)
9 years, 1 month
[lnst] lnst-ctl: add option --dump-config
by Jiří Pírko
commit 4ef884db3bfc92cd6032feae34f6222f63de741e
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:26 2015 +0100
lnst-ctl: add option --dump-config
This commit adds a new option for the LNST controller - --dump-config.
When this option is specified, lnst-ctl will run until all configuration
files are loaded and then dump the resulting configuration on stdout.
This is useful for debugging purposes, or when including lnst in
scripts.
Since this commit the message "Loading config file ..." is printed on
stderr so that it doesn't get mixed with the dumped configuration.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst-ctl | 10 ++++++++++
lnst/Common/Config.py | 2 +-
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/lnst-ctl b/lnst-ctl
index 128b6df..e715bb8 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -43,6 +43,8 @@ def usage(retval=0):
print " -a, --define-alias name=value define top-level alias"
print " -c, --config=FILE load additional config file"
print " -d, --debug emit debugging messages"
+ print " --dump-config dumps the join of all loaded " \
+ "configuration files on stdout and exits"
print " -h, --help print this message"
print " -m, --no-colours disable coloured terminal output"
print " -o, --disable-pool-checks don't check the availability of " \
@@ -183,6 +185,7 @@ def main():
"define_alias=",
"config=",
"debug",
+ "dump-config",
"help",
"no-colours",
"disable-pool-checks",
@@ -231,6 +234,7 @@ def main():
overriden_aliases = {}
reduce_sync = False
multi_match = False
+ dump_config = False
for opt, arg in opts:
if opt in ("-d", "--debug"):
debug += 1
@@ -258,6 +262,8 @@ def main():
xslt_url = arg
elif opt in ("-u", "--multi-match"):
multi_match = True
+ elif opt in ("--dump-config"):
+ dump_config = True
if config_path is not None:
if not os.path.isfile(config_path):
@@ -269,6 +275,10 @@ def main():
if xslt_url != None:
lnst_config.set_option("environment", "xslt_url", xslt_url)
+ if dump_config:
+ print lnst_config.dump_config()
+ return RETVAL_PASS
+
if coloured_output:
coloured_output = not lnst_config.get_option("colours",
"disable_colours")
diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py
index 2e982bf..f9c4b39 100644
--- a/lnst/Common/Config.py
+++ b/lnst/Common/Config.py
@@ -151,7 +151,7 @@ class Config():
exp_path = os.path.expanduser(path)
abs_path = os.path.abspath(exp_path)
parser = ConfigParser(dict_type=dict)
- print "Loading config file '%s'" % abs_path
+ print >> sys.stderr, "Loading config file '%s'" % abs_path
parser.read(abs_path)
sections = parser._sections
9 years, 1 month
[lnst] NetTestResultSerializer: fix seconds calculation for time remaining
by Jiří Pírko
commit 3dc4bfa09136faf6ce72432731824d926c6ddcdc
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Feb 20 16:48:25 2015 +0100
NetTestResultSerializer: fix seconds calculation for time remaining
When calculating the remaining seconds of the total test time I didn't
subtract seconds for the hours. This commit fixes that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst/Controller/NetTestResultSerializer.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/lnst/Controller/NetTestResultSerializer.py b/lnst/Controller/NetTestResultSerializer.py
index 62d4e43..515ead7 100644
--- a/lnst/Controller/NetTestResultSerializer.py
+++ b/lnst/Controller/NetTestResultSerializer.py
@@ -129,7 +129,7 @@ class NetTestResultSerializer:
days = dif_time.days
hours = dif_time.seconds/3600
minutes = dif_time.seconds/60 - hours*60
- seconds = dif_time.seconds - minutes*60
+ seconds = dif_time.seconds - hours*3600 - minutes*60
logging.info("Total test time: %d days, %d hours, %d minutes, "\
"%d seconds" % (days, hours, minutes, seconds))
9 years, 1 month
[lnst] Fixed long parameters parsing in lnst-slave
by Jiří Pírko
commit b48ca7782c73e205678db271e47258155120f5ba
Author: Jiri Prochazka <jprochaz(a)redhat.com>
Date: Wed Jan 28 15:04:34 2015 +0100
Fixed long parameters parsing in lnst-slave
--port and --pidfile didn't have '=' in getopt options.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst-slave | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/lnst-slave b/lnst-slave
index ce6c390..d4345c3 100755
--- a/lnst-slave
+++ b/lnst-slave
@@ -43,7 +43,7 @@ def main():
opts = getopt.getopt(
sys.argv[1:],
"dhei:p:m",
- ["debug", "help", "daemonize", "pidfile", "port", "no-colours"]
+ ["debug", "help", "daemonize", "pidfile=", "port=", "no-colours"]
)[0]
except getopt.GetoptError as err:
print str(err)
9 years, 1 month
[PATCH] Change prefix in early network regression tests.
by Jiri Prochazka
From: Jiri Prochazka <jprochaz(a)redhat.com>
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>
---
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 ++++++------
recipes/regression_tests/phase1/active_backup_bond.xml | 4 ++--
.../phase1/active_backup_double_bond.xml | 4 ++--
recipes/regression_tests/phase1/ping_flood.xml | 4 ++--
recipes/regression_tests/phase1/round_robin_bond.xml | 4 ++--
.../regression_tests/phase1/round_robin_double_bond.xml | 4 ++--
.../virtual_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 ++------
recipes/regression_tests/phase2/active_backup_team.xml | 4 ++--
.../phase2/active_backup_team_vs_active_backup_bond.xml | 4 ++--
.../phase2/active_backup_team_vs_round_robin_bond.xml | 4 ++--
.../regression_tests/phase2/round_robin_double_team.xml | 4 ++--
recipes/regression_tests/phase2/round_robin_team.xml | 4 ++--
.../phase2/round_robin_team_vs_active_backup_bond.xml | 4 ++--
.../phase2/round_robin_team_vs_round_robin_bond.xml | 8 ++------
...irtual_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>
--
2.1.0
9 years, 1 month
[PATCH v2 1/6] NetTestResultSerializer: fix seconds calculation for time remaining
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
When calculating the remaining seconds of the total test time I didn't
subtract seconds for the hours. This commit fixes that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Controller/NetTestResultSerializer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lnst/Controller/NetTestResultSerializer.py b/lnst/Controller/NetTestResultSerializer.py
index 62d4e43..515ead7 100644
--- a/lnst/Controller/NetTestResultSerializer.py
+++ b/lnst/Controller/NetTestResultSerializer.py
@@ -129,7 +129,7 @@ class NetTestResultSerializer:
days = dif_time.days
hours = dif_time.seconds/3600
minutes = dif_time.seconds/60 - hours*60
- seconds = dif_time.seconds - minutes*60
+ seconds = dif_time.seconds - hours*3600 - minutes*60
logging.info("Total test time: %d days, %d hours, %d minutes, "\
"%d seconds" % (days, hours, minutes, seconds))
--
2.1.0
9 years, 1 month