The patch changes the IPv6 addresses used in phase1 and phase2 tests. Instead of 2002: prefix that is used for documentation purposes the tests now use local IPv6 unicast addresses as described in RFC 4193.

Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase1/3_vlans.xml | 12 ++++++------ .../phase1/3_vlans_over_active_backup_bond.xml | 12 ++++++------ .../virtual_bridge_2_vlans_over_active_backup_bond.xml | 8 ++++---- .../regression_tests/phase1/virtual_bridge_vlan_in_guest.xml | 4 ++-- .../regression_tests/phase1/virtual_bridge_vlan_in_host.xml | 4 ++-- .../phase2/3_vlans_over_active_backup_team.xml | 12 ++++++------ .../virtual_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 ++-- 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index 064475e..b530269 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -29,7 +29,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.1/24" /> - <address value="2002::10:1/64" /> + <address value="fc00:0:0:10::1/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -41,7 +41,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.1/24" /> - <address value="2002::20:1/64" /> + <address value="fc00:0:0:20::1/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -53,7 +53,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.1/24" /> - <address value="2002::30:1/64" /> + <address value="fc00:0:0:30::1/64" /> </addresses> </vlan> </interfaces> @@ -70,7 +70,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.2/24" /> - <address value="2002::10:2/64" /> + <address value="fc00:0:0:10::2/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -82,7 +82,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.2/24" /> - <address value="2002::20:2/64" /> + <address value="fc00:0:0:20::2/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -94,7 +94,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.2/24" /> - <address value="2002::30:2/64" /> + <address value="fc00:0:0: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 ca63ddb..4ecb507 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 @@ -43,7 +43,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.1/24" /> - <address value="2002::10:1/64" /> + <address value="fc00:0:0:10::1/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -55,7 +55,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.1/24" /> - <address value="2002::20:1/64" /> + <address value="fc00:0:0:20::1/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -67,7 +67,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.1/24" /> - <address value="2002::30:1/64" /> + <address value="fc00:0:0:30::1/64" /> </addresses> </vlan> </interfaces> @@ -84,7 +84,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.2/24" /> - <address value="2002::10:2/64" /> + <address value="fc00:0:0:10::2/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -96,7 +96,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.2/24" /> - <address value="2002::20:2/64" /> + <address value="fc00:0:0:20::2/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -108,7 +108,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.2/24" /> - <address value="2002::30:2/64" /> + <address value="fc00:0:0:30::2/64" /> </addresses> </vlan> </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 7af6b2b..1cdd708 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 @@ -75,7 +75,7 @@ <eth id="guestnic" label="to_guest1"> <addresses> <address>{$vlan10_net}.100/24</address> - <address value="2002::10:100/64"/> + <address value="fc00:0:0:10::100/64"/> </addresses> </eth> </interfaces> @@ -85,7 +85,7 @@ <eth id="guestnic" label="to_guest2"> <addresses> <address>{$vlan20_net}.100/24</address> - <address value="2002::20:100/64"/> + <address value="fc00:0:0:20::100/64"/> </addresses> </eth> </interfaces> @@ -151,7 +151,7 @@ <eth id="guestnic" label="to_guest3"> <addresses> <address>{$vlan10_net}.101/24</address> - <address value="2002::10:101/64"/> + <address value="fc00:0:0:10::101/64"/> </addresses> </eth> </interfaces> @@ -161,7 +161,7 @@ <eth id="guestnic" label="to_guest4"> <addresses> <address>{$vlan20_net}.101/24</address> - <address value="2002::20:101/64"/> + <address value="fc00:0:0: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 f710d0a..a483e3b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -44,7 +44,7 @@ </slaves> <addresses> <address>{$vlan10_net}.10/24</address> - <address>2002::10:10/64</address> + <address>fc00:0:0:10::10/64</address> </addresses> </vlan> </interfaces> @@ -61,7 +61,7 @@ </slaves> <addresses> <address>{$vlan10_net}.11/24</address> - <address>2002::10:11/64</address> + <address>fc00:0:0: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 5d403b2..2318cfb 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -44,7 +44,7 @@ </params> <addresses> <address>{$vlan10_net}.10/24</address> - <address>2002::10:10/64</address> + <address>fc00:0:0:10::10/64</address> </addresses> </eth> </interfaces> @@ -61,7 +61,7 @@ </slaves> <addresses> <address>{$vlan10_net}.11/24</address> - <address>2002::10:11/64</address> + <address>fc00:0:0: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 9adac61..d323141 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 @@ -47,7 +47,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.1/24" /> - <address value="2002::10:1/64" /> + <address value="fc00:0:0:10::1/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -59,7 +59,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.1/24" /> - <address value="2002::20:1/64" /> + <address value="fc00:0:0:20::1/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -71,7 +71,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.1/24" /> - <address value="2002::30:1/64" /> + <address value="fc00:0:0:30::1/64" /> </addresses> </vlan> </interfaces> @@ -88,7 +88,7 @@ </slaves> <addresses> <address value="{$vlan10_net}.2/24" /> - <address value="2002::10:2/64" /> + <address value="fc00:0:0:10::2/64" /> </addresses> </vlan> <vlan id="vlan20"> @@ -100,7 +100,7 @@ </slaves> <addresses> <address value="{$vlan20_net}.2/24" /> - <address value="2002::20:2/64" /> + <address value="fc00:0:0:20::2/64" /> </addresses> </vlan> <vlan id="vlan30"> @@ -112,7 +112,7 @@ </slaves> <addresses> <address value="{$vlan30_net}.2/24" /> - <address value="2002::30:2/64" /> + <address value="fc00:0:0:30::2/64" /> </addresses> </vlan> </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 58f0a9f..b692461 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 @@ -55,7 +55,7 @@ <eth id="guestnic" label="to_guest1"> <addresses> <address>{$vlan10_net}.100/24</address> - <address>2002::10:100/64</address> + <address>fc00:0:0:10::100/64</address> </addresses> </eth> </interfaces> @@ -65,7 +65,7 @@ <eth id="guestnic" label="to_guest2"> <addresses> <address>{$vlan20_net}.100/24</address> - <address>2002::20:100/64</address> + <address>fc00:0:0:20::100/64</address> </addresses> </eth> </interfaces> @@ -112,7 +112,7 @@ <eth id="guestnic" label="to_guest3"> <addresses> <address>{$vlan10_net}.101/24</address> - <address>2002::10:101/64</address> + <address>fc00:0:0:10::101/64</address> </addresses> </eth> </interfaces> @@ -122,7 +122,7 @@ <eth id="guestnic" label="to_guest4"> <addresses> <address>{$vlan20_net}.101/24</address> - <address>2002::20:100/64</address> + <address>fc00:0:0:20::101/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 30bac5f..5dad461 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 @@ -40,7 +40,7 @@ </slaves> <addresses> <address>{$vlan10_net}.10/24</address> - <address>2002::10:10/64</address> + <address>fc00:0:0:10::10/64</address> </addresses> </vlan> </interfaces> @@ -57,7 +57,7 @@ </slaves> <addresses> <address>{$vlan10_net}.11/24</address> - <address>2002::10:11/64</address> + <address>fc00:0:0: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 02f5c6d..5398d93 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 @@ -37,7 +37,7 @@ </params> <addresses> <address>{$vlan10_net}.10/24</address> - <address>2002::10:10/64</address> + <address>fc00:0:0:10::10/64</address> </addresses> </eth> </interfaces> @@ -55,7 +55,7 @@ </slaves> <addresses> <address>{$vlan10_net}.11/24</address> - <address>2002::10:11/64</address> + <address>fc00:0:0:10::11/64</address> </addresses> </vlan> </interfaces>