From: Ondrej Lichtner <olichtne(a)redhat.com>
This makes the IP network aliases consistent for all recipes like this:
* 'net' alias configures the IPv4 network between the baremetal hosts
* 'vxlan_net' alias configures the IPv4 overlay VXLAN network
* 'vxlan_net6' alias configures the IPv6 overlay VXLAN network
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
.../regression_tests/phase3/2_virt_ovs_vxlan.xml | 26 +++++++++++-----------
.../regression_tests/phase3/novirt_ovs_vxlan.xml | 18 +++++++--------
.../regression_tests/phase3/vxlan_multicast.xml | 4 +---
recipes/regression_tests/phase3/vxlan_remote.xml | 5 +----
4 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
index f34c67f..05509d8 100644
--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
@@ -10,15 +10,15 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="mapping_file"
value="2_virt_ovs_vxlan.mapping" />
<alias name="net" value="192.168.2"/>
- <alias name="net6" value="fc00:0:0:0"/>
<alias name="vxlan_net" value="192.168.100"/>
+ <alias name="vxlan_net6" value="fc00:0:0:0"/>
</define>
<network>
<host id="h1">
<interfaces>
<eth id="if1" label="n1">
<addresses>
- <address value="{$vxlan_net}.1/24"/>
+ <address value="{$net}.1/24"/>
</addresses>
</eth>
<eth id="if2" label="to_guest1"/>
@@ -38,7 +38,7 @@
</slaves>
<tunnel id="vxlan1" type="vxlan">
<options>
- <option name="option:remote_ip"
value="{$vxlan_net}.2"/>
+ <option name="option:remote_ip"
value="{$net}.2"/>
<option name="option:key"
value="flow"/>
<option name="ofport_request"
value="10"/>
</options>
@@ -57,8 +57,8 @@
<interfaces>
<eth id="if1" label="to_guest1">
<addresses>
- <address value="{$net}.1/24"/>
- <address value="{$net6}::1/64"/>
+ <address value="{$vxlan_net}.1/24"/>
+ <address value="{$vxlan_net6}::1/64"/>
</addresses>
</eth>
</interfaces>
@@ -67,8 +67,8 @@
<interfaces>
<eth id="if1" label="to_guest2">
<addresses>
- <address value="{$net}.2/24"/>
- <address value="{$net6}::2/64"/>
+ <address value="{$vxlan_net}.2/24"/>
+ <address value="{$vxlan_net6}::2/64"/>
</addresses>
</eth>
</interfaces>
@@ -77,7 +77,7 @@
<interfaces>
<eth id="if1" label="n1">
<addresses>
- <address value="{$vxlan_net}.2/24"/>
+ <address value="{$net}.2/24"/>
</addresses>
</eth>
<eth id="if2" label="to_guest3"/>
@@ -97,7 +97,7 @@
</slaves>
<tunnel id="vxlan1" type="vxlan">
<options>
- <option name="option:remote_ip"
value="{$vxlan_net}.1"/>
+ <option name="option:remote_ip"
value="{$net}.1"/>
<option name="option:key"
value="flow"/>
<option name="ofport_request"
value="10"/>
</options>
@@ -116,8 +116,8 @@
<interfaces>
<eth id="if1" label="to_guest3">
<addresses>
- <address value="{$net}.3/24"/>
- <address value="{$net6}::3/64"/>
+ <address value="{$vxlan_net}.3/24"/>
+ <address value="{$vxlan_net6}::3/64"/>
</addresses>
</eth>
</interfaces>
@@ -126,8 +126,8 @@
<interfaces>
<eth id="if1" label="to_guest4">
<addresses>
- <address value="{$net}.4/24"/>
- <address value="{$net6}::4/64"/>
+ <address value="{$vxlan_net}.4/24"/>
+ <address value="{$vxlan_net6}::4/64"/>
</addresses>
</eth>
</interfaces>
diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
index 4f6c98d..1e4ec02 100644
--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
@@ -10,22 +10,22 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="mapping_file"
value="novirt_ovs_vxlan.mapping" />
<alias name="net" value="192.168.2"/>
- <alias name="net6" value="fc00:0:0:0"/>
<alias name="vxlan_net" value="192.168.100"/>
+ <alias name="vxlan_net6" value="fc00:0:0:0"/>
</define>
<network>
<host id="test_host1">
<interfaces>
<eth id="if1" label="n1">
<addresses>
- <address value="{$vxlan_net}.1/24"/>
+ <address value="{$net}.1/24"/>
</addresses>
</eth>
<ovs_bridge id="ovs1">
<internal id="int0">
<addresses>
- <address value="{$net}.1/24"/>
- <address value="{$net6}::1/64"/>
+ <address value="{$vxlan_net}.1/24"/>
+ <address value="{$vxlan_net6}::1/64"/>
</addresses>
<options>
<option name="ofport_request"
value="5"/>
@@ -34,7 +34,7 @@
</internal>
<tunnel id="vxlan1" type="vxlan">
<options>
- <option name="option:remote_ip"
value="{$vxlan_net}.2"/>
+ <option name="option:remote_ip"
value="{$net}.2"/>
<option name="option:key"
value="flow"/>
<option name="ofport_request"
value="10"/>
</options>
@@ -51,7 +51,7 @@
<interfaces>
<eth id="if1" label="n1">
<addresses>
- <address value="{$vxlan_net}.2/24"/>
+ <address value="{$net}.2/24"/>
</addresses>
</eth>
<ovs_bridge id="ovs2">
@@ -61,13 +61,13 @@
<option name="name" value="int0"/>
</options>
<addresses>
- <address value="{$net}.2/24"/>
- <address value="{$net6}::2/24"/>
+ <address value="{$vxlan_net}.2/24"/>
+ <address value="{$vxlan_net6}::2/24"/>
</addresses>
</internal>
<tunnel id="vxlan1" type="vxlan">
<options>
- <option name="option:remote_ip"
value="{$vxlan_net}.1"/>
+ <option name="option:remote_ip"
value="{$net}.1"/>
<option name="option:key"
value="flow"/>
<option name="ofport_request"
value="10"/>
</options>
diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml
b/recipes/regression_tests/phase3/vxlan_multicast.xml
index bb603f1..6b52231 100644
--- a/recipes/regression_tests/phase3/vxlan_multicast.xml
+++ b/recipes/regression_tests/phase3/vxlan_multicast.xml
@@ -11,7 +11,7 @@
<alias name="mapping_file" value="vxlan.mapping" />
<alias name="net" value="192.168.0"/>
<alias name="vxlan_net" value="192.168.100"/>
- <alias name="vxlan_net6" value="fc01:0:0:0"/>
+ <alias name="vxlan_net6" value="fc00:0:0:0"/>
</define>
<network>
<host id="testmachine1">
@@ -19,7 +19,6 @@
<eth id="eth" label="tnet">
<addresses>
<address value="{$net}.1/24" />
- <address value="fc00:0:0:0::1/64"/>
</addresses>
</eth>
<vxlan id="test_if">
@@ -42,7 +41,6 @@
<eth id="eth" label="tnet">
<addresses>
<address value="{$net}.2/24" />
- <address value="fc00:0:0:0::2/64"/>
</addresses>
</eth>
<vxlan id="test_if">
diff --git a/recipes/regression_tests/phase3/vxlan_remote.xml
b/recipes/regression_tests/phase3/vxlan_remote.xml
index d04dee2..38392fb 100644
--- a/recipes/regression_tests/phase3/vxlan_remote.xml
+++ b/recipes/regression_tests/phase3/vxlan_remote.xml
@@ -10,9 +10,8 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="mapping_file" value="vxlan_remote.mapping"
/>
<alias name="net" value="192.168.0"/>
- <alias name="net6" value="fc00:0:0:0"/>
<alias name="vxlan_net" value="192.168.100"/>
- <alias name="vxlan_net6" value="fc01:0:0:0"/>
+ <alias name="vxlan_net6" value="fc00:0:0:0"/>
</define>
<network>
<host id="testmachine1">
@@ -20,7 +19,6 @@
<eth id="eth" label="tnet">
<addresses>
<address value="{$net}.1/24" />
- <address value="{$net6}::1/64"/>
</addresses>
</eth>
<vxlan id="test_if">
@@ -43,7 +41,6 @@
<eth id="eth" label="tnet">
<addresses>
<address value="{$net}.2/24" />
- <address value="fc00:0:0:0::2/64"/>
</addresses>
</eth>
<vxlan id="test_if">
--
2.8.2