From: Ondrej Lichtner <olichtne(a)redhat.com>
Recipes in phase3 were missing the driver alias used to control which
interfaces should be matched for a specific test run. This commit fixes
that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml | 7 +++++++
recipes/regression_tests/phase3/novirt_ovs_vxlan.xml | 7 +++++++
recipes/regression_tests/phase3/simple_macsec.xml | 7 +++++++
recipes/regression_tests/phase3/vxlan_multicast.xml | 10 +++++++++-
recipes/regression_tests/phase3/vxlan_remote.xml | 7 +++++++
5 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
index 009d648..2861acb 100644
--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml
@@ -13,6 +13,7 @@
<alias name="net" value="192.168.2"/>
<alias name="vxlan_net" value="192.168.100"/>
<alias name="vxlan_net6" value="fc00:0:0:0"/>
+ <alias name="driver" value=""/>
</define>
<network>
<host id="h1">
@@ -21,6 +22,9 @@
</params>
<interfaces>
<eth id="if1" label="n1">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.1/24"/>
</addresses>
@@ -83,6 +87,9 @@
</params>
<interfaces>
<eth id="if1" label="n1">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.2/24"/>
</addresses>
diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
index 98f5f1b..bf2d387 100644
--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml
@@ -13,11 +13,15 @@
<alias name="net" value="192.168.2"/>
<alias name="vxlan_net" value="192.168.100"/>
<alias name="vxlan_net6" value="fc00:0:0:0"/>
+ <alias name="driver" value=""/>
</define>
<network>
<host id="test_host1">
<interfaces>
<eth id="if1" label="n1">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.1/24"/>
</addresses>
@@ -51,6 +55,9 @@
<host id="test_host2">
<interfaces>
<eth id="if1" label="n1">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.2/24"/>
</addresses>
diff --git a/recipes/regression_tests/phase3/simple_macsec.xml
b/recipes/regression_tests/phase3/simple_macsec.xml
index 83fbccc..2209af6 100644
--- a/recipes/regression_tests/phase3/simple_macsec.xml
+++ b/recipes/regression_tests/phase3/simple_macsec.xml
@@ -11,11 +11,15 @@
<alias name="nperf_max_dev" value="20%"/>
<alias name="mapping_file" value="simple_macsec.mapping"
/>
<alias name="net" value="192.168.0" />
+ <alias name="driver" value=""/>
</define>
<network>
<host id="machine1">
<interfaces>
<eth id="eth" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address>{$net}.1/24</address>
</addresses>
@@ -25,6 +29,9 @@
<host id="machine2">
<interfaces>
<eth id="eth" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address>{$net}.2/24</address>
</addresses>
diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml
b/recipes/regression_tests/phase3/vxlan_multicast.xml
index 734c854..5021652 100644
--- a/recipes/regression_tests/phase3/vxlan_multicast.xml
+++ b/recipes/regression_tests/phase3/vxlan_multicast.xml
@@ -13,6 +13,7 @@
<alias name="net" value="192.168.0"/>
<alias name="vxlan_net" value="192.168.100"/>
<alias name="vxlan_net6" value="fc00:0:0:0"/>
+ <alias name="driver" value=""/>
</define>
<network>
<host id="testmachine1">
@@ -20,7 +21,11 @@
<param name="machine_type" value="baremetal"/>
</params>
<interfaces>
- <eth id="eth1" label="tnet"/>
+ <eth id="eth1" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
+ </eth>
<eth id="tap1" label="to_guest1"/>
<bridge id="br0">
<slaves>
@@ -74,6 +79,9 @@
</params>
<interfaces>
<eth id="eth1" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.3/24" />
</addresses>
diff --git a/recipes/regression_tests/phase3/vxlan_remote.xml
b/recipes/regression_tests/phase3/vxlan_remote.xml
index 040479e..824c839 100644
--- a/recipes/regression_tests/phase3/vxlan_remote.xml
+++ b/recipes/regression_tests/phase3/vxlan_remote.xml
@@ -13,11 +13,15 @@
<alias name="net" value="192.168.0"/>
<alias name="vxlan_net" value="192.168.100"/>
<alias name="vxlan_net6" value="fc00:0:0:0"/>
+ <alias name="driver" value=""/>
</define>
<network>
<host id="testmachine1">
<interfaces>
<eth id="eth" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.1/24" />
</addresses>
@@ -40,6 +44,9 @@
<host id="testmachine2">
<interfaces>
<eth id="eth" label="tnet">
+ <params>
+ <param name="driver"
value="{$driver}"/>
+ </params>
<addresses>
<address value="{$net}.2/24" />
</addresses>
--
2.10.1
Show replies by date