This patch adds explicit requirement for baremetal machines. This fixes
problems with matching when a baremetal machine becomes unavailable and
virtual machine from the pool is selected in the match instead.
Note that this requires adding the same parameter to slavemachine pool.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml | 6 ++++++
recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml | 6 ++++++
.../regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml | 6 ++++++
recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml | 6 ++++++
4 files changed, 24 insertions(+)
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 33a1ae7..6aba6f8 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
@@ -15,6 +15,9 @@
</define>
<network>
<host id="host1">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<eth id="tap" label="to_guest" />
@@ -51,6 +54,9 @@
</interfaces>
</host>
<host id="host2">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<vlan id="vlan10">
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 48884d5..27583ac 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
@@ -15,6 +15,9 @@
</define>
<network>
<host id="host1">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<eth id="tap" label="to_guest" />
@@ -51,6 +54,9 @@
</interfaces>
</host>
<host id="host2">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<vlan id="vlan10">
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 28fce58..020b9a3 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
@@ -14,6 +14,9 @@
</define>
<network>
<host id="host1">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<eth id="tap" label="to_guest" />
@@ -47,6 +50,9 @@
</interfaces>
</host>
<host id="host2">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch" />
<vlan id="vlan10">
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 8222f13..2715c0d 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
@@ -14,6 +14,9 @@
</define>
<network>
<host id="host1">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch"/>
<eth id="tap" label="to_guest"/>
@@ -44,6 +47,9 @@
</interfaces>
</host>
<host id="host2">
+ <params>
+ <param name="machine_type" value="baremetal"/>
+ </params>
<interfaces>
<eth id="nic" label="to_switch">
</eth>
--
2.4.11