The machines tag were recently changed to <network> and with that, we also renamed machines to hosts. This patch changes the attributes of commands in tasks to match these changes.
The 'machine' attribute was changed to 'host' for the <config>, <run>, and the signal tags (<wait>, <intr>, <kill>).
The commit also contains the same changes for the python task API.
Signed-off-by: Radek Pazdera rpazdera@redhat.com --- lnst/Common/NetTestCommand.py | 2 +- lnst/Controller/RecipeParser.py | 6 +-- lnst/Controller/Task.py | 54 +++++++++++----------- recipes/examples/quick_guides/ping_check.xml | 2 +- recipes/multicast/cmd_sequences/block_source.xml | 22 ++++----- recipes/multicast/cmd_sequences/if.xml | 20 ++++---- recipes/multicast/cmd_sequences/loop.xml | 18 ++++---- recipes/multicast/cmd_sequences/max_groups.xml | 6 +-- recipes/multicast/cmd_sequences/membership.xml | 12 ++--- recipes/multicast/cmd_sequences/simple.xml | 10 ++-- .../multicast/cmd_sequences/source_membership.xml | 22 ++++----- recipes/multicast/cmd_sequences/ttl.xml | 28 +++++------ recipes/smoke/lib/task-bg.xml | 4 +- recipes/smoke/lib/task-config.xml | 2 +- recipes/smoke/lib/task-exec.xml | 2 +- recipes/smoke/lib/task-ping.xml | 2 +- recipes/team/sequence_iperf.xml | 6 +-- recipes/team/sequence_ping_simple.xml | 4 +- recipes/team/sequence_pktgen.xml | 6 +-- recipes/team/sequence_pktgen_flows.xml | 4 +- recipes/team/sequence_pktgen_hashes.xml | 2 +- recipes/team/sequence_pktgen_lacp.xml | 6 +-- recipes/team/sequence_queue_mapping.xml | 24 +++++----- schema-recipe.rng | 6 +-- 24 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/lnst/Common/NetTestCommand.py b/lnst/Common/NetTestCommand.py index abd7400..64bd432 100644 --- a/lnst/Common/NetTestCommand.py +++ b/lnst/Common/NetTestCommand.py @@ -25,7 +25,7 @@ def str_command(command): attrs = ["type(%s)" % command["type"]] if command["type"] == "test": attrs.append("module(%s)" % command["module"]) - attrs.append("machine(%s)" % command["machine"]) + attrs.append("host(%s)" % command["machine"])
if "bg_id" in command: attrs.append("bg_id(%s)" % command["bg_id"]) diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py index 405c87b..7833e7f 100644 --- a/lnst/Controller/RecipeParser.py +++ b/lnst/Controller/RecipeParser.py @@ -176,7 +176,7 @@ class RecipeParser(XmlParser):
def _process_run_cmd(self, cmd_tag): cmd = XmlData(cmd_tag) - cmd["machine"] = self._get_attribute(cmd_tag, "machine") + cmd["machine"] = self._get_attribute(cmd_tag, "host")
has_module = self._has_attribute(cmd_tag, "module") has_command = self._has_attribute(cmd_tag, "command") @@ -216,7 +216,7 @@ class RecipeParser(XmlParser): def _process_config_cmd(self, cmd_tag): cmd = XmlData(cmd_tag) cmd["type"] = "config" - cmd["machine"] = self._get_attribute(cmd_tag, "machine") + cmd["machine"] = self._get_attribute(cmd_tag, "host")
if self._has_attribute(cmd_tag, "persistent"): cmd["persistent"] = self._get_attribute(cmd_tag, "persistent") @@ -251,6 +251,6 @@ class RecipeParser(XmlParser): def _process_signal_cmd(self, cmd_tag): cmd = XmlData(cmd_tag) cmd["type"] = cmd_tag.tag - cmd["machine"] = self._get_attribute(cmd_tag, "machine") + cmd["machine"] = self._get_attribute(cmd_tag, "host") cmd["bg_id"] = self._get_attribute(cmd_tag, "bg_id") return cmd diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py index d42c47c..c933cfb 100644 --- a/lnst/Controller/Task.py +++ b/lnst/Controller/Task.py @@ -18,9 +18,9 @@ class TaskError(Exception): pass class ControllerAPI(object): """ An API class representing the controller. """
- def __init__(self, ctl, machines): + def __init__(self, ctl, hosts): self._ctl = ctl - self._machines = machines + self._hosts = hosts self._result = True
def _run_command(self, command): @@ -34,28 +34,28 @@ class ControllerAPI(object): self._result = self._result and res["passed"] return res
- def get_machine(self, machine_id): + def get_host(self, host_id): """ - Get an API handle for the machine from the recipe spec with + Get an API handle for the host from the recipe spec with a specific id.
- :param machine_id: id of the machine as defined in the recipe - :type machine_id: string + :param host_id: id of the host as defined in the recipe + :type host_id: string
- :return: The machine handle. - :rtype: MachineAPI + :return: The host handle. + :rtype: HostAPI
- :raises TaskError: If there is no machine with such id. + :raises TaskError: If there is no host with such id. """ - if machine_id not in self._machines: - raise TaskError("Machine '%s' not found." % machine_id) + if host_id not in self._hosts: + raise TaskError("Host '%s' not found." % host_id)
- machine = self._machines[machine_id] - return MachineAPI(self, machine_id, machine) + host = self._hosts[host_id] + return HostAPI(self, host_id, host)
def get_module(self, name, **kwargs): """ - Initialize a module to be run on a machine. + Initialize a module to be run on a host.
:param name: name of the module :type name: string @@ -78,19 +78,19 @@ class ControllerAPI(object): cmd = {"type": "ctl_wait", "seconds": int(seconds)} return self._ctl._run_command(cmd)
-class MachineAPI(object): - """ An API class representing a machine. """ +class HostAPI(object): + """ An API class representing a host machine. """
- def __init__(self, ctl, machine_id, machine): + def __init__(self, ctl, host_id, host): self._ctl = ctl - self._id = machine_id - self._m = machine + self._id = host_id + self._m = host
self._bg_id_seq = 0
def config(self, option, value, persistent=False): """ - Configure an option in /sys or /proc on the machine. + Configure an option in /sys or /proc on the host.
:param option: A path within /sys or /proc. :type option: string @@ -110,9 +110,9 @@ class MachineAPI(object):
def run(self, what, **kwargs): """ - Configure an option in /sys or /proc on the machine. + Configure an option in /sys or /proc on the host.
- :param what: What should be run on the machine. + :param what: What should be run on the host. :type what: str or ModuleAPI
:param bg: Run in background flag. @@ -247,9 +247,9 @@ class ModuleAPI(object): class ProcessAPI(object): """ An API class representing either a running or finished process. """
- def __init__(self, ctl, m_id, cmd_res, bg_id): + def __init__(self, ctl, h_id, cmd_res, bg_id): self._ctl = ctl - self._machine = m_id + self._host = h_id self._cmd_res = cmd_res self._bg_id = bg_id
@@ -274,7 +274,7 @@ class ProcessAPI(object): def wait(self): """ Blocking wait until the command returns. """ if self._bg_id: - cmd = {"machine": self._machine, + cmd = {"machine": self._host, "type": "wait", "proc_id": self._bg_id} self._res = self._ctl._run_command(cmd) @@ -282,7 +282,7 @@ class ProcessAPI(object): def intr(self): """ Interrupt the command. """ if self._bg_id: - cmd = {"machine": self._machine, + cmd = {"machine": self._host, "type": "intr", "proc_id": self._bg_id} self._res = self._ctl._run_command(cmd) @@ -296,7 +296,7 @@ class ProcessAPI(object): to keep the results, use 'intr' instead. """ if self._bg_id: - cmd = {"machine": self._machine, + cmd = {"machine": self._host, "type": "kill", "proc_id": self._bg_id} self._res = self._ctl._run_command(cmd) diff --git a/recipes/examples/quick_guides/ping_check.xml b/recipes/examples/quick_guides/ping_check.xml index 25f3c4a..7111d50 100644 --- a/recipes/examples/quick_guides/ping_check.xml +++ b/recipes/examples/quick_guides/ping_check.xml @@ -27,7 +27,7 @@ This is a recipe from a quick guide that is available on LNST wiki page: </network>
<task> - <run machine="testmachine1" module="IcmpPing"> + <run host="testmachine1" module="IcmpPing"> <options> <option name="addr" value="{ip(testmachine2,testifc2)}"/> <option name="count" value="3"/> diff --git a/recipes/multicast/cmd_sequences/block_source.xml b/recipes/multicast/cmd_sequences/block_source.xml index dc16789..0026f5e 100644 --- a/recipes/multicast/cmd_sequences/block_source.xml +++ b/recipes/multicast/cmd_sequences/block_source.xml @@ -5,7 +5,7 @@ configured to forward igmp traffic through the bridge --> <task> <!-- IP_BLOCK/UNBLOCK_SOURCE sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_block_source"/> <option name="condition" value="status == 'pass'"/> @@ -13,10 +13,10 @@ </run>
<!-- Block source in the middle of ongoing communication --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="238.0.0.1"/> @@ -28,7 +28,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_block_source"/> <option name="address" value="238.0.0.1"/> @@ -41,13 +41,13 @@ <option name="condition" value="packets_received_while_blocking == 0"/> </options> </run> - <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- Nonexistent source --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="238.0.0.1"/> @@ -59,7 +59,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_block_source"/> <option name="address" value="238.0.0.1"/> @@ -72,6 +72,6 @@ <option name="condition" value="packets_received_while_blocking > 0"/> </options> </run> - <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
</task> diff --git a/recipes/multicast/cmd_sequences/if.xml b/recipes/multicast/cmd_sequences/if.xml index 6a4392a..968ea57 100644 --- a/recipes/multicast/cmd_sequences/if.xml +++ b/recipes/multicast/cmd_sequences/if.xml @@ -5,7 +5,7 @@ - --> <task> <!-- IP_MULTICAST_IF sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_if"/>
@@ -16,10 +16,10 @@ </run>
<!-- IP_MULTICAST_IF correct interfaces set --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -31,7 +31,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -43,12 +43,12 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- IP_MULTICAST_IF incorrect interfaces set --> - <run command="sleep 1" machine="1"/> + <run command="sleep 1" host="1"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -60,7 +60,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -72,5 +72,5 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/> </task> diff --git a/recipes/multicast/cmd_sequences/loop.xml b/recipes/multicast/cmd_sequences/loop.xml index f3ac139..6c32dd8 100644 --- a/recipes/multicast/cmd_sequences/loop.xml +++ b/recipes/multicast/cmd_sequences/loop.xml @@ -2,7 +2,7 @@ <!-- Requires: 1 hosts with at least two interfaces --> <task> <!-- IP_MULTICAST_LOOP sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_loop"/> <option name="condition" value="status == 'pass'"/> @@ -10,9 +10,9 @@ </run>
<!-- IP_MULTICAST_LOOP enabled --> - <run command="sleep 1" machine="1"/> + <run command="sleep 1" host="1"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -24,7 +24,7 @@ </options> </run>
- <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -36,12 +36,12 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- IP_MULTICAST_LOOP disabled --> - <run command="sleep 1" machine="1"/> + <run command="sleep 1" host="1"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -53,7 +53,7 @@ </options> </run>
- <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -65,5 +65,5 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/> </task> diff --git a/recipes/multicast/cmd_sequences/max_groups.xml b/recipes/multicast/cmd_sequences/max_groups.xml index 0be1ed4..ff887da 100644 --- a/recipes/multicast/cmd_sequences/max_groups.xml +++ b/recipes/multicast/cmd_sequences/max_groups.xml @@ -2,7 +2,7 @@ <!-- Requires: 1 host with one interface --> <task> <!-- With a specific interface --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="max_groups"/> <option name="interface" value="{ip(1,testiface)}"/> @@ -11,8 +11,8 @@ </run>
<!-- Change default max_memberhsips --> - <config machine="1" option="/proc/sys/net/ipv4/igmp_max_memberships" value="5"/> - <run machine="1" module="Multicast" timeout="30"> + <config host="1" option="/proc/sys/net/ipv4/igmp_max_memberships" value="5"/> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="max_groups"/> <option name="interface" value="{ip(1,testiface)}"/> diff --git a/recipes/multicast/cmd_sequences/membership.xml b/recipes/multicast/cmd_sequences/membership.xml index 21b12d6..72508a8 100644 --- a/recipes/multicast/cmd_sequences/membership.xml +++ b/recipes/multicast/cmd_sequences/membership.xml @@ -5,7 +5,7 @@ - --> <task> <!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_membership"/> <option name="condition" value="status == 'pass'"/> @@ -15,10 +15,10 @@ <!-- This simple test case verifies that if one side leaves multicast group - in the middle of ongoing communication, no further packets are delivered - to the process. --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -30,7 +30,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_membership"/> <option name="address" value="{$multicast_group}"/> @@ -43,5 +43,5 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/> </task> diff --git a/recipes/multicast/cmd_sequences/simple.xml b/recipes/multicast/cmd_sequences/simple.xml index ccfa22e..9d1cdea 100644 --- a/recipes/multicast/cmd_sequences/simple.xml +++ b/recipes/multicast/cmd_sequences/simple.xml @@ -1,9 +1,9 @@ <!-- Requires: 2 hosts with at least one interface --> <task> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -14,7 +14,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -26,5 +26,5 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/> </task> diff --git a/recipes/multicast/cmd_sequences/source_membership.xml b/recipes/multicast/cmd_sequences/source_membership.xml index 5b598e0..37b0d6f 100644 --- a/recipes/multicast/cmd_sequences/source_membership.xml +++ b/recipes/multicast/cmd_sequences/source_membership.xml @@ -7,7 +7,7 @@ configured to forward igmp traffic through the bridge --> <task> <!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_source_membership"/> <option name="condition" value="status == 'pass'"/> @@ -17,10 +17,10 @@ <!-- This simple test case verifies that if one side leaves multicast group - in the middle of ongoing communication, no further packets are delivered - to the process. --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -32,7 +32,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_source_membership"/> <option name="address" value="{$multicast_group}"/> @@ -45,13 +45,13 @@ <option name="condition" value="packets_received_after_drop == 0"/> </options> </run> - <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- Nonexistent source --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -63,7 +63,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_source_membership"/> <option name="address" value="{$multicast_group}"/> @@ -76,6 +76,6 @@ <option name="condition" value="packets_received_after_drop == 0"/> </options> </run> - <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
</task> diff --git a/recipes/multicast/cmd_sequences/ttl.xml b/recipes/multicast/cmd_sequences/ttl.xml index 6390f31..1ad5b5d 100644 --- a/recipes/multicast/cmd_sequences/ttl.xml +++ b/recipes/multicast/cmd_sequences/ttl.xml @@ -5,7 +5,7 @@ - --> <task> <!-- IP_MULTICAST_TTL sockopt conformance test --> - <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="sockopt_ttl"/> <option name="condition" value="status == 'pass'"/> @@ -13,9 +13,9 @@ </run>
<!-- IP_MULTICAST_TTL = 0, looped on one host --> - <run command="sleep 1" machine="1"/> + <run command="sleep 1" host="1"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -28,7 +28,7 @@ </options> </run>
- <run machine="1" module="Multicast" timeout="30"> + <run host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -40,7 +40,7 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- IP_MULTICAST_TTL = 0 between 2 hosts --> <!-- KNOWN BUG: according to the specs, packets @@ -51,10 +51,10 @@
http://www.spinics.net/lists/netdev/msg183704.html --> - <run command="sleep 1" machine="1"/> - <run command="sleep 1" machine="2"/> + <run command="sleep 1" host="1"/> + <run command="sleep 1" host="2"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -66,7 +66,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -78,12 +78,12 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/>
<!-- IP_MULTICAST_TTL = 1 between 2 hosts --> - <run command="sleep 1" machine="1"/> + <run command="sleep 1" host="1"/>
- <run bg_id="1" machine="1" module="Multicast" timeout="30"> + <run bg_id="1" host="1" module="Multicast" timeout="30"> <options> <option name="setup" value="send_simple"/> <option name="address" value="{$multicast_group}"/> @@ -95,7 +95,7 @@ </options> </run>
- <run machine="2" module="Multicast" timeout="30"> + <run host="2" module="Multicast" timeout="30"> <options> <option name="setup" value="recv_simple"/> <option name="address" value="{$multicast_group}"/> @@ -107,5 +107,5 @@ </options> </run>
- <wait bg_id="1" machine="1"/> + <wait bg_id="1" host="1"/> </task> diff --git a/recipes/smoke/lib/task-bg.xml b/recipes/smoke/lib/task-bg.xml index 3f08743..54b4d9e 100644 --- a/recipes/smoke/lib/task-bg.xml +++ b/recipes/smoke/lib/task-bg.xml @@ -1,5 +1,5 @@ <task> - <run bg_id="1" expect="#icmp_result#" machine="1" module="IcmpPing" timeout="30"> + <run bg_id="1" expect="#icmp_result#" host="1" module="IcmpPing" timeout="30"> <options> <option name="addr" value="{ip(2,testiface)}"/> <option name="count" value="40"/> @@ -8,5 +8,5 @@ </options> </run> <ctl_wait seconds="5"/> - <intr bg_id="1" machine="1"/> + <intr bg_id="1" host="1"/> </task> diff --git a/recipes/smoke/lib/task-config.xml b/recipes/smoke/lib/task-config.xml index 25a0a6a..264d9b3 100644 --- a/recipes/smoke/lib/task-config.xml +++ b/recipes/smoke/lib/task-config.xml @@ -1,5 +1,5 @@ <task> - <config machine="1"> + <config host="1"> <options> <option name="/proc/sys/net/ipv4/igmp_max_memberships" value="5"/> <option name="/proc/sys/net/ipv4/igmp_max_memberships" value="6"/> diff --git a/recipes/smoke/lib/task-exec.xml b/recipes/smoke/lib/task-exec.xml index 9fae49f..40b75bf 100644 --- a/recipes/smoke/lib/task-exec.xml +++ b/recipes/smoke/lib/task-exec.xml @@ -1,5 +1,5 @@ <task> - <run command="[ `ip -o link | grep {devname(1,testiface)} | wc -l` -gt 0 ]" machine="1" timeout="30"/> + <run command="[ `ip -o link | grep {devname(1,testiface)} | wc -l` -gt 0 ]" host="1" timeout="30"/> <!-- This does not yet work for non-eth devices --> <!--<command machine_id="1" timeout="30" type="exec" value="[ `ip -o link | grep {hwaddr(1,testiface)} | wc -l` -gt 0 ]"/>--> diff --git a/recipes/smoke/lib/task-ping.xml b/recipes/smoke/lib/task-ping.xml index 1c275f7..87284fa 100644 --- a/recipes/smoke/lib/task-ping.xml +++ b/recipes/smoke/lib/task-ping.xml @@ -1,5 +1,5 @@ <task> - <run expect="#icmp_result#" machine="1" module="IcmpPing" timeout="30"> + <run expect="#icmp_result#" host="1" module="IcmpPing" timeout="30"> <options> <option name="addr" value="{ip(2,testiface)}"/> <option name="count" value="40"/> diff --git a/recipes/team/sequence_iperf.xml b/recipes/team/sequence_iperf.xml index e45f307..9e0b2d0 100644 --- a/recipes/team/sequence_iperf.xml +++ b/recipes/team/sequence_iperf.xml @@ -1,18 +1,18 @@ <task> <ctl_wait seconds="3"/> - <run bg_id="1" machine="2" module="Iperf"> + <run bg_id="1" host="2" module="Iperf"> <options> <option name="role" value="server"/> <option name="bind" value="{ip(2,testiface)}"/> </options> </run> <ctl_wait seconds="5"/> - <run machine="1" module="Iperf"> + <run host="1" module="Iperf"> <options> <option name="role" value="client"/> <option name="duration" value="15"/> <option name="iperf_server" value="{ip(2,testiface)}"/> </options> </run> - <kill bg_id="1" machine="2"/> + <kill bg_id="1" host="2"/> </task> diff --git a/recipes/team/sequence_ping_simple.xml b/recipes/team/sequence_ping_simple.xml index 853cceb..adb15d0 100644 --- a/recipes/team/sequence_ping_simple.xml +++ b/recipes/team/sequence_ping_simple.xml @@ -1,6 +1,6 @@ <task> <ctl_wait seconds="4"/> - <run machine="1" module="IcmpPing" timeout="60"> + <run host="1" module="IcmpPing" timeout="60"> <options> <option name="addr" value="{ip(2,testiface)}"/> <option name="count" value="2000"/> @@ -8,7 +8,7 @@ <option name="limit_rate" value="95"/> </options> </run> - <run machine="1" module="Icmp6Ping" timeout="60"> + <run host="1" module="Icmp6Ping" timeout="60"> <options> <option name="addr" value="{ip(2,testiface,1)}"/> <option name="count" value="2000"/> diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/sequence_pktgen.xml index e09c89c..5807b42 100644 --- a/recipes/team/sequence_pktgen.xml +++ b/recipes/team/sequence_pktgen.xml @@ -1,13 +1,13 @@ <task> <ctl_wait seconds="4"/> - <run bg_id="1" machine="1" module="PktCounter"> + <run bg_id="1" host="1" module="PktCounter"> <options> <option name="input_netdev_name" value="{devname(1,testiface)}"/> <option name="proto" value="udp"/> <option name="dport" value="9"/> </options> </run> - <run machine="2" module="PktgenTx" timeout="200"> + <run host="2" module="PktgenTx" timeout="200"> <options> <option name="pktgen_option" value="dst {ip(1,testiface)}"/> <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> @@ -17,5 +17,5 @@ <option name="netdev_name" value="{devname(2,testiface)}"/> </options> </run> - <intr bg_id="1" machine="1"/> + <intr bg_id="1" host="1"/> </task> diff --git a/recipes/team/sequence_pktgen_flows.xml b/recipes/team/sequence_pktgen_flows.xml index 729f3cd..c9d58ee 100644 --- a/recipes/team/sequence_pktgen_flows.xml +++ b/recipes/team/sequence_pktgen_flows.xml @@ -1,6 +1,6 @@ <task> <ctl_wait seconds="4"/> - <run bg_id="1" machine="1" module="PktgenTx"> + <run bg_id="1" host="1" module="PktgenTx"> <options> <option name="pktgen_option" value="count 0"/> <option name="pktgen_option" value="clone_skb 0"/> @@ -18,5 +18,5 @@ </options> </run> <ctl_wait seconds="400"/> - <intr bg_id="1" machine="1"/> + <intr bg_id="1" host="1"/> </task> \ No newline at end of file diff --git a/recipes/team/sequence_pktgen_hashes.xml b/recipes/team/sequence_pktgen_hashes.xml index 6d5c046..c8212b6 100644 --- a/recipes/team/sequence_pktgen_hashes.xml +++ b/recipes/team/sequence_pktgen_hashes.xml @@ -1,6 +1,6 @@ <task> <ctl_wait seconds="4"/> - <run machine="1" module="PktgenTx" timeout="200"> + <run host="1" module="PktgenTx" timeout="200"> <options> <option name="pktgen_option" value="count 10000"/> <option name="pktgen_option" value="clone_skb 0"/> diff --git a/recipes/team/sequence_pktgen_lacp.xml b/recipes/team/sequence_pktgen_lacp.xml index 0c469a8..e93fcdb 100644 --- a/recipes/team/sequence_pktgen_lacp.xml +++ b/recipes/team/sequence_pktgen_lacp.xml @@ -1,13 +1,13 @@ <task> <ctl_wait seconds="4"/> - <run bg_id="1" machine="1" module="PktCounter"> + <run bg_id="1" host="1" module="PktCounter"> <options> <option name="input_netdev_name" value="{devname(1,testiface)}"/> <option name="proto" value="udp"/> <option name="dport" value="9"/> </options> </run> - <run machine="2" module="PktgenTx" timeout="200"> + <run host="2" module="PktgenTx" timeout="200"> <options> <option name="pktgen_option" value="dst {ip(1,testiface)}"/> <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> @@ -17,5 +17,5 @@ <option name="netdev_name" value="{devname(2,3)}"/> </options> </run> - <intr bg_id="1" machine="1"/> + <intr bg_id="1" host="1"/> </task> \ No newline at end of file diff --git a/recipes/team/sequence_queue_mapping.xml b/recipes/team/sequence_queue_mapping.xml index ede0499..04446b5 100644 --- a/recipes/team/sequence_queue_mapping.xml +++ b/recipes/team/sequence_queue_mapping.xml @@ -1,10 +1,10 @@ <task> <ctl_wait seconds="4"/> - <run command="tc qdisc add dev {devname(1,testiface)} handle 1 root multiq" machine="1"/> - <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,0)} action skbedit queue_mapping 1" machine="1"/> - <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,1)} action skbedit queue_mapping 2" machine="1"/> - <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,2)} action skbedit queue_mapping 3" machine="1"/> - <run bg_id="1" machine="1" module="IcmpPing" timeout="60"> + <run command="tc qdisc add dev {devname(1,testiface)} handle 1 root multiq" host="1"/> + <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,0)} action skbedit queue_mapping 1" host="1"/> + <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,1)} action skbedit queue_mapping 2" host="1"/> + <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,2)} action skbedit queue_mapping 3" host="1"/> + <run bg_id="1" host="1" module="IcmpPing" timeout="60"> <options> <option name="addr" value="{ip(2,testiface,0)}"/> <option name="count" value="100"/> @@ -12,7 +12,7 @@ <option name="limit_rate" value="95"/> </options> </run> - <run bg_id="2" machine="1" module="IcmpPing" timeout="60"> + <run bg_id="2" host="1" module="IcmpPing" timeout="60"> <options> <option name="addr" value="{ip(2,testiface,1)}"/> <option name="count" value="100"/> @@ -20,7 +20,7 @@ <option name="limit_rate" value="95"/> </options> </run> - <run bg_id="3" machine="1" module="IcmpPing" timeout="60"> + <run bg_id="3" host="1" module="IcmpPing" timeout="60"> <options> <option name="addr" value="{ip(2,testiface,2)}"/> <option name="count" value="100"/> @@ -28,7 +28,7 @@ <option name="limit_rate" value="95"/> </options> </run> - <run bg_id="4" machine="1" module="IcmpPing" timeout="60"> + <run bg_id="4" host="1" module="IcmpPing" timeout="60"> <options> <option name="addr" value="{ip(2,testiface,3)}"/> <option name="count" value="100"/> @@ -36,8 +36,8 @@ <option name="limit_rate" value="95"/> </options> </run> - <wait bg_id="1" machine="1"/> - <wait bg_id="2" machine="1"/> - <wait bg_id="3" machine="1"/> - <wait bg_id="4" machine="1"/> + <wait bg_id="1" host="1"/> + <wait bg_id="2" host="1"/> + <wait bg_id="3" host="1"/> + <wait bg_id="4" host="1"/> </task> \ No newline at end of file diff --git a/schema-recipe.rng b/schema-recipe.rng index fba15db..c211b11 100644 --- a/schema-recipe.rng +++ b/schema-recipe.rng @@ -282,7 +282,7 @@
<define name="config"> <element name="config"> - <attribute name="machine"/> + <attribute name="host"/>
<optional> <attribute name="option"/> @@ -321,7 +321,7 @@
<define name="run"> <element name="run"> - <attribute name="machine"/> + <attribute name="host"/>
<choice> <attribute name="module"/> @@ -383,7 +383,7 @@ </define>
<define name="signal_command"> - <attribute name="machine"/> + <attribute name="host"/> <attribute name="bg_id"/> </define>