9:52 a.m.
commit b4c14c99b518ffa66f18db18effe4c6b4dc41d6e
Author: Radek Pazdera <rpazdera(a)redhat.com>
Date: Wed Aug 22 13:57:29 2012 +0200
multicast: Move from example_recipes to recipes
Multicast tests were moved from exmaples to more appropriate location
in the newly created recipes directory.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
.../multicast/cmd_sequences}/block_source.xml | 0
.../multicast/cmd_sequences}/if.xml | 0
.../multicast/cmd_sequences}/loop.xml | 0
.../multicast/cmd_sequences}/max_groups.xml | 0
.../multicast/cmd_sequences}/membership.xml | 0
.../multicast/cmd_sequences}/simple.xml | 0
.../multicast/cmd_sequences}/source_membership.xml | 0
.../multicast/cmd_sequences}/ttl.xml | 0
.../multicast/multicast-all.xml | 36 +++++++++++++++-----
9 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/example_recipes/cmd_sequences/multicast/block_source.xml
b/recipes/multicast/cmd_sequences/block_source.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/block_source.xml
rename to recipes/multicast/cmd_sequences/block_source.xml
diff --git a/example_recipes/cmd_sequences/multicast/if.xml
b/recipes/multicast/cmd_sequences/if.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/if.xml
rename to recipes/multicast/cmd_sequences/if.xml
diff --git a/example_recipes/cmd_sequences/multicast/loop.xml
b/recipes/multicast/cmd_sequences/loop.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/loop.xml
rename to recipes/multicast/cmd_sequences/loop.xml
diff --git a/example_recipes/cmd_sequences/multicast/max_groups.xml
b/recipes/multicast/cmd_sequences/max_groups.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/max_groups.xml
rename to recipes/multicast/cmd_sequences/max_groups.xml
diff --git a/example_recipes/cmd_sequences/multicast/membership.xml
b/recipes/multicast/cmd_sequences/membership.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/membership.xml
rename to recipes/multicast/cmd_sequences/membership.xml
diff --git a/example_recipes/cmd_sequences/multicast/simple.xml
b/recipes/multicast/cmd_sequences/simple.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/simple.xml
rename to recipes/multicast/cmd_sequences/simple.xml
diff --git a/example_recipes/cmd_sequences/multicast/source_membership.xml
b/recipes/multicast/cmd_sequences/source_membership.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/source_membership.xml
rename to recipes/multicast/cmd_sequences/source_membership.xml
diff --git a/example_recipes/cmd_sequences/multicast/ttl.xml
b/recipes/multicast/cmd_sequences/ttl.xml
similarity index 100%
rename from example_recipes/cmd_sequences/multicast/ttl.xml
rename to recipes/multicast/cmd_sequences/ttl.xml
diff --git a/example_recipes/rpazdera-multicast.xml b/recipes/multicast/multicast-all.xml
similarity index 56%
rename from example_recipes/rpazdera-multicast.xml
rename to recipes/multicast/multicast-all.xml
index 9f1d68c..f4dc82c 100644
--- a/example_recipes/rpazdera-multicast.xml
+++ b/recipes/multicast/multicast-all.xml
@@ -1,34 +1,52 @@
-<!-- Example test scenario using multicast test tools -->
+<!-- Execute all tests for multicast -->
<nettestrecipe>
+ <!-- Change these parameters to match your test environment setup -->
+ <define>
+ <alias name="hostname1" value="192.168.122.11"/>
+ <alias name="virtdomain1" value="RHEL6"/>
+
+ <alias name="hostname2" value="192.168.122.10"/>
+ <alias name="virtdomain2" value="Fedora16-clone"/>
+ </define>
<machines>
<machine id="1">
<netmachineconfig>
- <info hostname="10.34.1.120"
rootpass="redhat"/>
- <netdevice hwaddr="52:54:00:2E:D5:A8" id="1"
phys_id="1" type="eth"/>
- <netdevice hwaddr="52:54:00:90:23:0B" id="2"
phys_id="2" type="eth"/>
+ <info hostname="{$hostname1}"
libvirt_domain="{$virtdomain1}"
+ rootpass="redhat"/>
+ <netdevices>
+ <libvirt_create>
+ <netdevice network="tnet" phys_id="1"
type="eth"/>
+ <netdevice network="tnet" phys_id="2"
type="eth"/>
+ </libvirt_create>
+ </netdevices>
</netmachineconfig>
<netconfig>
<interface id="1" phys_id="1"
type="eth">
<addresses>
- <address value="192.168.122.225/24"/>
+ <address value="192.168.100.226/24"/>
</addresses>
</interface>
<interface id="2" phys_id="2"
type="eth">
<addresses>
- <address value="192.168.122.239/24"/>
+ <address value="192.168.100.240/24"/>
</addresses>
</interface>
</netconfig>
</machine>
<machine id="2">
<netmachineconfig>
- <info hostname="10.34.1.171"
rootpass="redhat"/>
- <netdevice hwaddr="52:54:00:12:DF:5A" id="1"
phys_id="1" type="eth"/>
+ <info hostname="{$hostname2}"
libvirt_domain="{$virtdomain2}"
+ rootpass="redhat"/>
+ <netdevices>
+ <libvirt_create>
+ <netdevice network="tnet" phys_id="1"
type="eth"/>
+ </libvirt_create>
+ </netdevices>
</netmachineconfig>
<netconfig>
<interface id="1" phys_id="1"
type="eth">
<addresses>
- <address value="192.168.122.200/24"/>
+ <address value="192.168.100.215/24"/>
</addresses>
</interface>
</netconfig>