[PATCH 4/5] multicast: Convert recipe_eval to newer convention

[Radek Pazdera]

From: Radek Pazdera <rpazdera(a)redhat.com&gt;


Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com&gt;
---
 .../cmd_sequences/multicast/block_source.xml       |   10 ++--
 example_recipes/cmd_sequences/multicast/if.xml     |   38 +++++++-------
 example_recipes/cmd_sequences/multicast/loop.xml   |   36 +++++++-------
 .../cmd_sequences/multicast/max_groups.xml         |    9 ++--
 .../cmd_sequences/multicast/membership.xml         |   18 +++---
 example_recipes/cmd_sequences/multicast/simple.xml |   19 +++----
 .../cmd_sequences/multicast/source_membership.xml  |   38 +++++++-------
 example_recipes/cmd_sequences/multicast/ttl.xml    |   54 ++++++++++----------
 example_recipes/rpazdera-multicast.xml             |   22 +++++++-
 9 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/example_recipes/cmd_sequences/multicast/block_source.xml
b/example_recipes/cmd_sequences/multicast/block_source.xml
index a9a3712..72d0fd2 100644
--- a/example_recipes/cmd_sequences/multicast/block_source.xml
+++ b/example_recipes/cmd_sequences/multicast/block_source.xml
@@ -25,7 +25,7 @@
             <option name="duration" value="10" />
             <option name="delay" value="0.1" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
@@ -35,8 +35,8 @@
             <option name="address" value="238.0.0.1" />
             <option name="port" value="1337" />
             <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
-            <option type="recipe_eval" name="source"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(2,1)}" />
+            <option name="source" value="{ip(1,1)}" />
 
             <option name="condition" value="packets_received >
0" />
             <option name="condition"
value="packets_received_while_blocking == 0" />
@@ -56,7 +56,7 @@
             <option name="duration" value="10" />
             <option name="delay" value="0.1" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
@@ -66,7 +66,7 @@
             <option name="address" value="238.0.0.1" />
             <option name="port" value="1337" />
             <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(2,1)}" />
             <option name="source" value="127.0.0.200" />
 
             <option name="condition" value="packets_received >
0" />
diff --git a/example_recipes/cmd_sequences/multicast/if.xml
b/example_recipes/cmd_sequences/multicast/if.xml
index c7fec3f..a81557c 100644
--- a/example_recipes/cmd_sequences/multicast/if.xml
+++ b/example_recipes/cmd_sequences/multicast/if.xml
@@ -1,4 +1,4 @@
-<!-- Offline IP_MULTICAST_IF test -->
+<!-- IP_MULTICAST_IF test -->
 <!-- Requires: 2 hosts
    -    [1] with one interface
    -    [2] with one interface
@@ -23,22 +23,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
-            <option name="ttl" value="0" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
+            <option name="ttl" value="1" />
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
@@ -52,21 +52,21 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
             <option name="interface" value="127.0.0.1" />
 
             <option name="condition" value="packets_received == 0"
/>
diff --git a/example_recipes/cmd_sequences/multicast/loop.xml
b/example_recipes/cmd_sequences/multicast/loop.xml
index 7b155e1..ceac21c 100644
--- a/example_recipes/cmd_sequences/multicast/loop.xml
+++ b/example_recipes/cmd_sequences/multicast/loop.xml
@@ -16,22 +16,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="loop" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="1" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(1,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
@@ -45,22 +45,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="loop" value="0" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="1" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(1,1)}" />
 
             <option name="condition" value="packets_received == 0"
/>
         </options>
diff --git a/example_recipes/cmd_sequences/multicast/max_groups.xml
b/example_recipes/cmd_sequences/multicast/max_groups.xml
index 2141678..a2d1a25 100644
--- a/example_recipes/cmd_sequences/multicast/max_groups.xml
+++ b/example_recipes/cmd_sequences/multicast/max_groups.xml
@@ -6,20 +6,19 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30">
         <options>
             <option name="setup" value="max_groups" />
-            <option name="interface" value="{$host1if1}" />
+            <option name="interface" value="{ip(1,1)}" />
             <option name="condition" value="max_groups > 0"
/>
         </options>
     </command>
 
     <!-- Change default max_memberhsips -->
-    <command type="exec" value="echo '5' >
/proc/sys/net/ipv4/igmp_max_memberships" machine_id="1" />
+
+    <command type="system_config"
option="/proc/sys/net/ipv4/igmp_max_memberships" value="5"
machine_id="1" />
     <command type="test" value="Multicast"
machine_id="1" timeout="30">
         <options>
             <option name="setup" value="max_groups" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
             <option name="condition" value="max_groups == 5"
/>
         </options>
     </command>
-    <command type="exec" value="echo '20' >
/proc/sys/net/ipv4/igmp_max_memberships" machine_id="1" />
-
 </command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/membership.xml
b/example_recipes/cmd_sequences/multicast/membership.xml
index fd9c166..3136e2f 100644
--- a/example_recipes/cmd_sequences/multicast/membership.xml
+++ b/example_recipes/cmd_sequences/multicast/membership.xml
@@ -22,22 +22,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_membership" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
 
             <option name="condition" value="packets_received >
0" />
             <option name="condition" value="packets_received_after_drop
== 0" />
diff --git a/example_recipes/cmd_sequences/multicast/simple.xml
b/example_recipes/cmd_sequences/multicast/simple.xml
index 236558b..7455201 100644
--- a/example_recipes/cmd_sequences/multicast/simple.xml
+++ b/example_recipes/cmd_sequences/multicast/simple.xml
@@ -8,22 +8,21 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <!-- <option name="interface"
value="192.168.122.179" /> -->
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
diff --git a/example_recipes/cmd_sequences/multicast/source_membership.xml
b/example_recipes/cmd_sequences/multicast/source_membership.xml
index aeb525b..ffda96f 100644
--- a/example_recipes/cmd_sequences/multicast/source_membership.xml
+++ b/example_recipes/cmd_sequences/multicast/source_membership.xml
@@ -25,23 +25,23 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_source_membership"
/>
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
-            <option type="recipe_eval" name="source"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
+            <option name="source" value="{ip(1,1)}" />
 
             <option name="condition" value="packets_received >
0" />
             <option name="condition" value="packets_received_after_drop
== 0" />
@@ -56,22 +56,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_source_membership"
/>
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
             <option name="source" value="127.0.0.200" />
 
             <option name="condition" value="packets_received == 0"
/>
diff --git a/example_recipes/cmd_sequences/multicast/ttl.xml
b/example_recipes/cmd_sequences/multicast/ttl.xml
index ae55228..d0fe197 100644
--- a/example_recipes/cmd_sequences/multicast/ttl.xml
+++ b/example_recipes/cmd_sequences/multicast/ttl.xml
@@ -19,23 +19,23 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="0" />
             <option name="loop" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="1" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(1,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
@@ -58,22 +58,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="0" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
@@ -87,22 +87,22 @@
     <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
         <options>
             <option name="setup" value="send_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option name="delay" value="0.1" />
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="delay" value="{$send_delay}" />
             <option name="ttl" value="1" />
-            <option type="recipe_eval" name="interface"
value="['machines'][1]['netconfig'][1]['addresses'][0]"
/>
+            <option name="interface" value="{ip(1,1)}" />
         </options>
     </command>
 
     <command type="test" value="Multicast"
machine_id="2" timeout="30">
         <options>
             <option name="setup" value="recv_simple" />
-            <option name="address" value="238.0.0.1" />
-            <option name="port" value="1337" />
-            <option name="duration" value="10" />
-            <option type="recipe_eval" name="interface"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
+            <option name="address" value="{$multicast_group}"
/>
+            <option name="port" value="{$port}" />
+            <option name="duration" value="{$test_duration}"
/>
+            <option name="interface" value="{ip(2,1)}" />
 
             <option name="condition" value="packets_received >
0" />
         </options>
diff --git a/example_recipes/rpazdera-multicast.xml
b/example_recipes/rpazdera-multicast.xml
index 9a90168..192e462 100644
--- a/example_recipes/rpazdera-multicast.xml
+++ b/example_recipes/rpazdera-multicast.xml
@@ -10,10 +10,14 @@
             <netconfig>
 	            <netdevice id="1" type="eth"
phys_id="1">
                     <addresses>
-                        <address value="192.168.122.237/24" />
+                        <address value="192.168.122.225/24" />
+                    </addresses>
+                </netdevice>
+	            <netdevice id="2" type="eth"
phys_id="2">
+                    <addresses>
+                        <address value="192.168.122.239/24" />
                     </addresses>
                 </netdevice>
-	            <netdevice id="2" type="eth" phys_id="2"
/>
             </netconfig>
         </machine>
         <machine id="2">
@@ -24,13 +28,25 @@
             <netconfig>
 	            <netdevice id="1" type="eth"
phys_id="1">
                     <addresses>
-                        <address value="192.168.122.179/24" />
+                        <address value="192.168.122.200/24" />
                     </addresses>
                 </netdevice>
             </netconfig>
         </machine>
     </machines>
 
+    <define>
+        <alias name="multicast_group" value="239.1.2.3" />
+        <alias name="port" value="1337" />
+        <alias name="test_duration" value="10" />
+        <alias name="send_delay" value="0.1" />
+        <alias name="nonexistent_ip" value="127.0.0.200" />
+    </define>
+
+    <command_sequence source="cmd_sequences/multicast/max_groups.xml" />
+    <command_sequence source="cmd_sequences/multicast/block_source.xml"
/>
+    <command_sequence source="cmd_sequences/multicast/source_membership.xml"
/>
+    <command_sequence source="cmd_sequences/multicast/membership.xml" />
     <command_sequence source="cmd_sequences/multicast/if.xml" />
     <command_sequence source="cmd_sequences/multicast/ttl.xml" />
     <command_sequence source="cmd_sequences/multicast/loop.xml" />
-- 
1.7.7.6