April 2012 - LNST-developers - Fedora mailing-lists

Packet Assert Proposal
by Radek Pazdera 01 May '12

01 May '12

Hi, I did a series of tests for LNST lately where I needed to check whether packets with some properties left or arrived to some interface. The usual way of doing this is to run tcpdump with some filter, grep the results for the required properties and see if you get something. I thought it might be useful to be able to do this natively in LNST. Maybe crate new command type like this: <command type="packet_assert" timeout="10" bg_id="5"> <option name="interface" value="192.168.1.100" /> <option name="filter" value="igmp" /> <option name="grep_for" value="igmp query v{$igmp_version}" /> <option name="grep_for" value="> {$multiaddr}" /> <option name="min_count" value="5" /> </command> Do you think it's a good idea or should I do it some other way/not do things like this at all? We could discuss it together with the previous sysctl proposal if you're interested. Thank you, Radek Pazdera

2 1

Sysctl Proposal
by Radek Pazdera 30 Apr '12

30 Apr '12

Hi, I was working on some tests for LNST where I needed to change kernel settings in /proc/sys a lot. Now this can be achieved by using the exec command, but I thought, that it could be a good idea to integrate this natively into LNST since this could be frequently used in kernel networking tests. There are two places (that I know of) where you'd want to call sysctl: * in the recipe with effect through the end of the recipe * inside of TestGeneric child classes with effect only inside the class I think that writing a class with the following methods might work: * set values with sysctl (original value of the option will be kept) * restore original values Each test could have an instance of this class available and the restore method would be called in destructor. And also NetTestController would have one that would be passed to the slaves in _prepare_slaves() and then restored in _cleanup_slaves(). Big plus of natively controlling sysctl calls is (in my opinion), that we could easily save the initial values and then restore them when test is over. Honza Tluka told me that you've already considered such feature and proposed, that we could meet up sometime and discuss the idea further. What do you think? Thank you, Radek Pazdera

1 0

[PATCH] Add skb_clone option to PktgenTx test
by Jan Tluka 29 Apr '12

29 Apr '12

The pktgen's skb_clone > 0 is not valid for bonds/vlans in RHEL. This is due to fix of bug https://bugzilla.redhat.com/show_bug.cgi?id=678794. Following patch adds skb_clone option that can be set to 0 for such cases. The default value remains 100000. Tested by myself on RHEL6. --- Tests/TestPktgenTx.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Tests/TestPktgenTx.py b/Tests/TestPktgenTx.py index 5e48f2c..5ec500f 100644 --- a/Tests/TestPktgenTx.py +++ b/Tests/TestPktgenTx.py @@ -57,6 +57,7 @@ class TestPktgenTx(TestGeneric): addr = self.get_mopt("addr", opt_type="addr") hwaddr = self.get_mopt("hwaddr") vlan_tci = self.get_opt("vlan_tci", default=0) + skb_clone = self.get_opt("skb_clone", default=100000) exec_cmd("modprobe pktgen") @@ -67,7 +68,7 @@ class TestPktgenTx(TestGeneric): for dev_name in dev_names: pgwrkr.add_device(dev_name) pg = Pktgen("/proc/net/pktgen/%s" % dev_name) - pg.set("clone_skb 100000") + pg.set("clone_skb %s" % skb_clone) pg.set("pkt_size 60") pg.set("dst %s" % addr) pg.set("dst_mac %s" % hwaddr) -- 1.7.6.5

2 1

[lnst] Add skb_clone option to PktgenTx test
by Jiří Pírko 29 Apr '12

29 Apr '12

commit ae61c8a03824d1ba32a29106207296176c94e54f Author: Jan Tluka <jtluka(a)redhat.com> Date: Thu Apr 26 17:45:15 2012 +0200 Add skb_clone option to PktgenTx test The pktgen's skb_clone > 0 is not valid for bonds/vlans in RHEL. This is due to fix of bug https://bugzilla.redhat.com/show_bug.cgi?id=678794. Following patch adds skb_clone option that can be set to 0 for such cases. The default value remains 100000. Tested by myself on RHEL6. Tests/TestPktgenTx.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/Tests/TestPktgenTx.py b/Tests/TestPktgenTx.py index 5e48f2c..5ec500f 100644 --- a/Tests/TestPktgenTx.py +++ b/Tests/TestPktgenTx.py @@ -57,6 +57,7 @@ class TestPktgenTx(TestGeneric): addr = self.get_mopt("addr", opt_type="addr") hwaddr = self.get_mopt("hwaddr") vlan_tci = self.get_opt("vlan_tci", default=0) + skb_clone = self.get_opt("skb_clone", default=100000) exec_cmd("modprobe pktgen") @@ -67,7 +68,7 @@ class TestPktgenTx(TestGeneric): for dev_name in dev_names: pgwrkr.add_device(dev_name) pg = Pktgen("/proc/net/pktgen/%s" % dev_name) - pg.set("clone_skb 100000") + pg.set("clone_skb %s" % skb_clone) pg.set("pkt_size 60") pg.set("dst %s" % addr) pg.set("dst_mac %s" % hwaddr)

1 0

[PATCH 1/2] NetTestParse: Source attr support for all tags
by Radek Pazdera 19 Apr '12

19 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> This commit introduces a possibility of including various parts of recipe through 'source' attribute (as it were with netmachineconfig, netconfig and command_sequence tags) to all tags in the XML. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- NetTest/NetTestParse.py | 59 +++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/NetTest/NetTestParse.py b/NetTest/NetTestParse.py index c4b553b..a6991ff 100644 --- a/NetTest/NetTestParse.py +++ b/NetTest/NetTestParse.py @@ -25,6 +25,9 @@ def load_file(filename): class WrongCommandSequenceException(Exception): pass +class WrongIncludeSource(Exception): + pass + class NetTestParse: def __init__(self, recipe_path): recipe_path = os.path.expanduser(recipe_path) @@ -37,22 +40,12 @@ class NetTestParse: def _parse_machine(self, dom_machine): machine = {} - dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] - dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] - source = str(dom_netmachineconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netmachineconfig_xml = load_file(file_path) - else: - netmachineconfig_xml = dom_netmachineconfig.toxml() + dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] + netmachineconfig_xml = dom_netmachineconfig.toxml() - source = str(dom_netconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netconfig_xml = load_file(file_path) - else: - netconfig_xml = dom_netconfig.toxml() + dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] + netconfig_xml = dom_netconfig.toxml() ncparse = NetConfigParse(netmachineconfig_xml) machine["info"] = ncparse.get_machine_info() @@ -72,6 +65,8 @@ class NetTestParse: def parse_recipe(self): recipe = {} dom = parseString(self._recipe_xml_string) + + self._load_included_parts(dom) dom_nettestrecipe = dom.getElementsByTagName("nettestrecipe")[0] dom_machines_grp = dom_nettestrecipe.getElementsByTagName("machines") @@ -86,6 +81,30 @@ class NetTestParse: def get_recipe(self): return self._recipe + def _load_included_parts(self, dom_node): + if dom_node.nodeType == dom_node.ELEMENT_NODE: + source = str(dom_node.getAttribute("source")) + if source: + file_path = self._get_referenced_xml_path(source) + xml_data = load_file(file_path) + + dom = parseString(xml_data) + loaded_node = None + try: + loaded_node = dom.getElementsByTagName(dom_node.nodeName)[0] + except Exception: + err = ("No '%s' node present in included file '%s'." + % (dom_node.nodeName, file_path)) + raise WrongIncludeSource(err) + + parent = dom_node.parentNode + parent.replaceChild(loaded_node, dom_node) + self._load_included_parts(loaded_node) + return + + for child in dom_node.childNodes: + self._load_included_parts(child) + def _parse_command_option(self, dom_option, options): logging.debug("Parsing command option") option_type = str(dom_option.getAttribute("type")) @@ -193,18 +212,8 @@ class NetTestParse: def parse_recipe_command_sequence(self): sequence = [] dom_sequences = self._dom_nettestrecipe.getElementsByTagName("command_sequence") - for dom_sequence in dom_sequences: - source = str(dom_sequence.getAttribute("source")) - if source: - """ - If source attribute is present, load sequence command - from referenced xml file. - """ - file_path = self._get_referenced_xml_path(source) - xml_data = load_file(file_path) - dom = parseString(xml_data) - dom_sequence = dom.getElementsByTagName("command_sequence")[0] + for dom_sequence in dom_sequences: dom_commands = dom_sequence.getElementsByTagName("command") for dom_command in dom_commands: sequence.append(self._parse_command(dom_command)) -- 1.7.7.6

2 2

[lnst] NetTestParse: Adding aliases support
by Jiří Pírko 19 Apr '12

19 Apr '12

commit 38f1c8755865b92d2999b674fcf6cf30520c11c5 Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 19 14:29:30 2012 +0200 NetTestParse: Adding aliases support This commit enhances NetTestParser with the ability to define and resolve aliases through the recipe. Aliases can be defined anywhere in the recipe using <define> tag. For instance: <define> <alias name="source_ip" value="192.168.0.1" /> <alias name="mask" value="24" /> </define> Referencing aliases can be done from text elements and element attributes in the XML as follows: <address value="{$source_ip}/{$mask}" /> This patch also enables accessing recipe_eval functionality in command_sequence tag through this convention. You can reference $recipe variable, for example: <command type="test" value="Multicast" machine_id="1" timeout="30"> <options> <option name="setup" value="max_groups" /> <option name="interface" value="{$recipe['machines'][1]['netconfig'][1]['addresses'][0]}" /> <option name="condition" value="max_groups > 0" /> </options> </command> Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> NetTest/NetTestParse.py | 87 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 6 deletions(-) --- diff --git a/NetTest/NetTestParse.py b/NetTest/NetTestParse.py index a6991ff..10ff4fc 100644 --- a/NetTest/NetTestParse.py +++ b/NetTest/NetTestParse.py @@ -13,6 +13,7 @@ jpirko(a)redhat.com (Jiri Pirko) from xml.dom.minidom import parseString import logging import os +import re from NetConfig.NetConfigParse import NetConfigParse from NetTest.NetTestCommand import str_command @@ -62,6 +63,16 @@ class NetTestParse: machines[machine_id] = self._parse_machine(dom_machine) return machines + def _parse_definitions(self, dom_definitions_grp): + definitions = {} + for dom_definitions_item in dom_definitions_grp: + dom_aliases = dom_definitions_item.getElementsByTagName("alias") + for dom_alias in dom_aliases: + alias_name = str(dom_alias.getAttribute("name")) + alias_value = str(dom_alias.getAttribute("value")) + definitions[alias_name] = alias_value + return definitions + def parse_recipe(self): recipe = {} dom = parseString(self._recipe_xml_string) @@ -69,10 +80,18 @@ class NetTestParse: self._load_included_parts(dom) dom_nettestrecipe = dom.getElementsByTagName("nettestrecipe")[0] + dom_definitions_grp = dom_nettestrecipe.getElementsByTagName("define") + self._definitions = self._parse_definitions(dom_definitions_grp) + for define_tag in dom_definitions_grp: + parent = define_tag.parentNode + parent.removeChild(define_tag) + dom_machines_grp = dom_nettestrecipe.getElementsByTagName("machines") + self._expand_group(dom_machines_grp) recipe["machines"] = self._parse_machines(dom_machines_grp) dom_switches_grp = dom_nettestrecipe.getElementsByTagName("switches") + self._expand_group(dom_switches_grp) recipe["switches"] = self._parse_machines(dom_switches_grp) self._recipe = recipe @@ -105,6 +124,15 @@ class NetTestParse: for child in dom_node.childNodes: self._load_included_parts(child) + def _recipe_eval(self, eval_data): + try: + return str(eval("self._recipe%s" % eval_data)) + except (KeyError, IndexError): + print self._recipe + logging.error("Wrong recipe_eval value \"%s\" passed" + % eval_data) + raise Exception + def _parse_command_option(self, dom_option, options): logging.debug("Parsing command option") option_type = str(dom_option.getAttribute("type")) @@ -115,12 +143,7 @@ class NetTestParse: elif option_type == "recipe_eval": name = str(dom_option.getAttribute("name")) orig_value = str(dom_option.getAttribute("value")) - try: - value = str(eval("self._recipe%s" % orig_value)) - except (KeyError, IndexError): - logging.error("Wrong recipe_eval value \"%s\" passed" - % orig_value) - raise Exception + value = str(self._recipe_eval(orig_value)) else: logging.error("Unknown option type \"%s\"" % option_type) raise Exception("Unknown option type") @@ -212,6 +235,7 @@ class NetTestParse: def parse_recipe_command_sequence(self): sequence = [] dom_sequences = self._dom_nettestrecipe.getElementsByTagName("command_sequence") + self._expand_group(dom_sequences, recipe_eval=True) for dom_sequence in dom_sequences: dom_commands = dom_sequence.getElementsByTagName("command") @@ -220,3 +244,54 @@ class NetTestParse: self._check_sequence(sequence) self._recipe["sequence"] = sequence + + def _expand(self, node, recipe_eval=False): + if node.nodeType == node.ELEMENT_NODE: + i = 0 + num_attributes = node.attributes.length + while(i < num_attributes): + attr = node.attributes.item(i) + attr.value = self._expand_string(attr.value, recipe_eval) + i += 1 + elif node.nodeType == node.TEXT_NODE: + node.data = self._expand_string(node.data, recipe_eval) + + for child in node.childNodes: + self._expand(child, recipe_eval) + + def _expand_group(self, group, recipe_eval=False): + for node in group: + self._expand(node, recipe_eval) + + def _expand_string(self, string, recipe_eval): + eval_re = "\{\$recipe([^\{\}]+)\}" + alias_re = "\{\$([^\{\}]*)\}" + while True: + eval_match = re.search(eval_re, string) + if eval_match: + eval_string = eval_match.group(0) + eval_data = eval_match.group(1) + if recipe_eval: + string = string.replace(eval_string, + self._recipe_eval(eval_data)) + continue + else: + err = ("Accessing $recipe allowed only from command sequence: %s" + % string) + raise KeyError(err) + alias_match = re.search(alias_re, string) + if alias_match: + alias = alias_match.group(0) + alias_name = alias_match.group(1) + try: + string = string.replace(alias, + self._definitions[alias_name]) + continue + except KeyError, err: + raise Exception("Alias '%s' doesn't exist!" % str(err)) + + + if not (eval_match and alias_match): + break + + return string

1 0

[lnst] NetTestParse: Source attr support for all tags
by Jiří Pírko 19 Apr '12

19 Apr '12

commit c38ca17e9c5dfecdc9d120d14a683cc64f7e6514 Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 19 14:29:29 2012 +0200 NetTestParse: Source attr support for all tags This commit introduces a possibility of including various parts of recipe through 'source' attribute (as it were with netmachineconfig, netconfig and command_sequence tags) to all tags in the XML. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> NetTest/NetTestParse.py | 59 +++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 25 deletions(-) --- diff --git a/NetTest/NetTestParse.py b/NetTest/NetTestParse.py index c4b553b..a6991ff 100644 --- a/NetTest/NetTestParse.py +++ b/NetTest/NetTestParse.py @@ -25,6 +25,9 @@ def load_file(filename): class WrongCommandSequenceException(Exception): pass +class WrongIncludeSource(Exception): + pass + class NetTestParse: def __init__(self, recipe_path): recipe_path = os.path.expanduser(recipe_path) @@ -37,22 +40,12 @@ class NetTestParse: def _parse_machine(self, dom_machine): machine = {} - dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] - dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] - source = str(dom_netmachineconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netmachineconfig_xml = load_file(file_path) - else: - netmachineconfig_xml = dom_netmachineconfig.toxml() + dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] + netmachineconfig_xml = dom_netmachineconfig.toxml() - source = str(dom_netconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netconfig_xml = load_file(file_path) - else: - netconfig_xml = dom_netconfig.toxml() + dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] + netconfig_xml = dom_netconfig.toxml() ncparse = NetConfigParse(netmachineconfig_xml) machine["info"] = ncparse.get_machine_info() @@ -72,6 +65,8 @@ class NetTestParse: def parse_recipe(self): recipe = {} dom = parseString(self._recipe_xml_string) + + self._load_included_parts(dom) dom_nettestrecipe = dom.getElementsByTagName("nettestrecipe")[0] dom_machines_grp = dom_nettestrecipe.getElementsByTagName("machines") @@ -86,6 +81,30 @@ class NetTestParse: def get_recipe(self): return self._recipe + def _load_included_parts(self, dom_node): + if dom_node.nodeType == dom_node.ELEMENT_NODE: + source = str(dom_node.getAttribute("source")) + if source: + file_path = self._get_referenced_xml_path(source) + xml_data = load_file(file_path) + + dom = parseString(xml_data) + loaded_node = None + try: + loaded_node = dom.getElementsByTagName(dom_node.nodeName)[0] + except Exception: + err = ("No '%s' node present in included file '%s'." + % (dom_node.nodeName, file_path)) + raise WrongIncludeSource(err) + + parent = dom_node.parentNode + parent.replaceChild(loaded_node, dom_node) + self._load_included_parts(loaded_node) + return + + for child in dom_node.childNodes: + self._load_included_parts(child) + def _parse_command_option(self, dom_option, options): logging.debug("Parsing command option") option_type = str(dom_option.getAttribute("type")) @@ -193,18 +212,8 @@ class NetTestParse: def parse_recipe_command_sequence(self): sequence = [] dom_sequences = self._dom_nettestrecipe.getElementsByTagName("command_sequence") - for dom_sequence in dom_sequences: - source = str(dom_sequence.getAttribute("source")) - if source: - """ - If source attribute is present, load sequence command - from referenced xml file. - """ - file_path = self._get_referenced_xml_path(source) - xml_data = load_file(file_path) - dom = parseString(xml_data) - dom_sequence = dom.getElementsByTagName("command_sequence")[0] + for dom_sequence in dom_sequences: dom_commands = dom_sequence.getElementsByTagName("command") for dom_command in dom_commands: sequence.append(self._parse_command(dom_command))

1 0

[PATCH 1/2] NetTestParse: Source attr support for all tags
by Radek Pazdera 19 Apr '12

19 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> This commit introduces a possibility of including various parts of recipe through 'source' attribute (as it were with netmachineconfig, netconfig and command_sequence tags) to all tags in the XML. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- NetTest/NetTestParse.py | 68 +++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 25 deletions(-) diff --git a/NetTest/NetTestParse.py b/NetTest/NetTestParse.py index c4b553b..7cf6ff0 100644 --- a/NetTest/NetTestParse.py +++ b/NetTest/NetTestParse.py @@ -25,6 +25,9 @@ def load_file(filename): class WrongCommandSequenceException(Exception): pass +class WrongIncludeSource(Exception): + pass + class NetTestParse: def __init__(self, recipe_path): recipe_path = os.path.expanduser(recipe_path) @@ -37,22 +40,12 @@ class NetTestParse: def _parse_machine(self, dom_machine): machine = {} - dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] - dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] - source = str(dom_netmachineconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netmachineconfig_xml = load_file(file_path) - else: - netmachineconfig_xml = dom_netmachineconfig.toxml() + dom_netmachineconfig = dom_machine.getElementsByTagName("netmachineconfig")[0] + netmachineconfig_xml = dom_netmachineconfig.toxml() - source = str(dom_netconfig.getAttribute("source")) - if source: - file_path = self._get_referenced_xml_path(source) - netconfig_xml = load_file(file_path) - else: - netconfig_xml = dom_netconfig.toxml() + dom_netconfig = dom_machine.getElementsByTagName("netconfig")[0] + netconfig_xml = dom_netconfig.toxml() ncparse = NetConfigParse(netmachineconfig_xml) machine["info"] = ncparse.get_machine_info() @@ -72,6 +65,8 @@ class NetTestParse: def parse_recipe(self): recipe = {} dom = parseString(self._recipe_xml_string) + + self._load_included_parts(dom) dom_nettestrecipe = dom.getElementsByTagName("nettestrecipe")[0] dom_machines_grp = dom_nettestrecipe.getElementsByTagName("machines") @@ -86,6 +81,39 @@ class NetTestParse: def get_recipe(self): return self._recipe + def _load_included_parts(self, dom_node): + if dom_node.nodeType == dom_node.ELEMENT_NODE: + source = str(dom_node.getAttribute("source")) + if source: + file_path = self._get_referenced_xml_path(source) + xml_data = load_file(file_path) + + dom = parseString(xml_data) + loaded_node = None + try: + loaded_node = dom.getElementsByTagName(dom_node.nodeName)[0] + except Exception: + err = ("No '%s' node present in included file '%s'." + % (dom_node.nodeName, file_path)) + raise WrongIncludeSource(err) + + parent = dom_node.parentNode + parent.replaceChild(loaded_node, dom_node) + self._load_included_parts(loaded_node) + return + + for child in dom_node.childNodes: + self._load_included_parts(child) + + def _recipe_eval(self, eval_data): + try: + return str(eval("self._recipe%s" % eval_data)) + except (KeyError, IndexError): + print self._recipe + logging.error("Wrong recipe_eval value \"%s\" passed" + % eval_data) + raise Exception + def _parse_command_option(self, dom_option, options): logging.debug("Parsing command option") option_type = str(dom_option.getAttribute("type")) @@ -193,18 +221,8 @@ class NetTestParse: def parse_recipe_command_sequence(self): sequence = [] dom_sequences = self._dom_nettestrecipe.getElementsByTagName("command_sequence") - for dom_sequence in dom_sequences: - source = str(dom_sequence.getAttribute("source")) - if source: - """ - If source attribute is present, load sequence command - from referenced xml file. - """ - file_path = self._get_referenced_xml_path(source) - xml_data = load_file(file_path) - dom = parseString(xml_data) - dom_sequence = dom.getElementsByTagName("command_sequence")[0] + for dom_sequence in dom_sequences: dom_commands = dom_sequence.getElementsByTagName("command") for dom_command in dom_commands: sequence.append(self._parse_command(dom_command)) -- 1.7.7.6

2 2

[PATCH 2/2] NetTestParse: Adding aliases support
by Radek Pazdera 19 Apr '12

19 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> This commit enhances NetTestParser with the ability to define and resolve aliases through the recipe. Aliases can be defined anywhere in the recipe using <define> tag. For instance: <define> <alias name="source_ip" value="192.168.0.1" /> <alias name="mask" value="24" /> </define> Referencing aliases can be done from text elements and element attributes in the XML as follows: <address value="{$source_ip}/{$mask}" /> This patch enables accessing recipe_eval functionality in command_sequence tag through this convention. You can reference $recipe variable, for example: <command type="test" value="Multicast" machine_id="1" timeout="30"> <options> <option name="setup" value="max_groups" /> <option name="interface" value="{$recipe['machines'][1]['netconfig'][1]['addresses'][0]}" /> <option name="condition" value="max_groups > 0" /> </options> </command> Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- NetTest/NetTestParse.py | 78 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 6 deletions(-) diff --git a/NetTest/NetTestParse.py b/NetTest/NetTestParse.py index 7cf6ff0..10ff4fc 100644 --- a/NetTest/NetTestParse.py +++ b/NetTest/NetTestParse.py @@ -13,6 +13,7 @@ jpirko(a)redhat.com (Jiri Pirko) from xml.dom.minidom import parseString import logging import os +import re from NetConfig.NetConfigParse import NetConfigParse from NetTest.NetTestCommand import str_command @@ -62,6 +63,16 @@ class NetTestParse: machines[machine_id] = self._parse_machine(dom_machine) return machines + def _parse_definitions(self, dom_definitions_grp): + definitions = {} + for dom_definitions_item in dom_definitions_grp: + dom_aliases = dom_definitions_item.getElementsByTagName("alias") + for dom_alias in dom_aliases: + alias_name = str(dom_alias.getAttribute("name")) + alias_value = str(dom_alias.getAttribute("value")) + definitions[alias_name] = alias_value + return definitions + def parse_recipe(self): recipe = {} dom = parseString(self._recipe_xml_string) @@ -69,10 +80,18 @@ class NetTestParse: self._load_included_parts(dom) dom_nettestrecipe = dom.getElementsByTagName("nettestrecipe")[0] + dom_definitions_grp = dom_nettestrecipe.getElementsByTagName("define") + self._definitions = self._parse_definitions(dom_definitions_grp) + for define_tag in dom_definitions_grp: + parent = define_tag.parentNode + parent.removeChild(define_tag) + dom_machines_grp = dom_nettestrecipe.getElementsByTagName("machines") + self._expand_group(dom_machines_grp) recipe["machines"] = self._parse_machines(dom_machines_grp) dom_switches_grp = dom_nettestrecipe.getElementsByTagName("switches") + self._expand_group(dom_switches_grp) recipe["switches"] = self._parse_machines(dom_switches_grp) self._recipe = recipe @@ -124,12 +143,7 @@ class NetTestParse: elif option_type == "recipe_eval": name = str(dom_option.getAttribute("name")) orig_value = str(dom_option.getAttribute("value")) - try: - value = str(eval("self._recipe%s" % orig_value)) - except (KeyError, IndexError): - logging.error("Wrong recipe_eval value \"%s\" passed" - % orig_value) - raise Exception + value = str(self._recipe_eval(orig_value)) else: logging.error("Unknown option type \"%s\"" % option_type) raise Exception("Unknown option type") @@ -221,6 +235,7 @@ class NetTestParse: def parse_recipe_command_sequence(self): sequence = [] dom_sequences = self._dom_nettestrecipe.getElementsByTagName("command_sequence") + self._expand_group(dom_sequences, recipe_eval=True) for dom_sequence in dom_sequences: dom_commands = dom_sequence.getElementsByTagName("command") @@ -229,3 +244,54 @@ class NetTestParse: self._check_sequence(sequence) self._recipe["sequence"] = sequence + + def _expand(self, node, recipe_eval=False): + if node.nodeType == node.ELEMENT_NODE: + i = 0 + num_attributes = node.attributes.length + while(i < num_attributes): + attr = node.attributes.item(i) + attr.value = self._expand_string(attr.value, recipe_eval) + i += 1 + elif node.nodeType == node.TEXT_NODE: + node.data = self._expand_string(node.data, recipe_eval) + + for child in node.childNodes: + self._expand(child, recipe_eval) + + def _expand_group(self, group, recipe_eval=False): + for node in group: + self._expand(node, recipe_eval) + + def _expand_string(self, string, recipe_eval): + eval_re = "\{\$recipe([^\{\}]+)\}" + alias_re = "\{\$([^\{\}]*)\}" + while True: + eval_match = re.search(eval_re, string) + if eval_match: + eval_string = eval_match.group(0) + eval_data = eval_match.group(1) + if recipe_eval: + string = string.replace(eval_string, + self._recipe_eval(eval_data)) + continue + else: + err = ("Accessing $recipe allowed only from command sequence: %s" + % string) + raise KeyError(err) + alias_match = re.search(alias_re, string) + if alias_match: + alias = alias_match.group(0) + alias_name = alias_match.group(1) + try: + string = string.replace(alias, + self._definitions[alias_name]) + continue + except KeyError, err: + raise Exception("Alias '%s' doesn't exist!" % str(err)) + + + if not (eval_match and alias_match): + break + + return string -- 1.7.7.6

1 0

[PATCH] SshUtils: Fix hanging slaves when using -e option
by Radek Pazdera 18 Apr '12

18 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> This patch fixes problem with haning processes on slave machines, after remote test execution using the -e option of nettestctl.py. The problem is, when `ssh' is killed on the client side, the corresponding remote `sshd' is terminated, but it doesn't signal bash with SIGHUP if there's no tty allocated. Which (in this case leaves two processes hanging on the slave machine (/bin/sh and ./nettestslave.py). The solution here is passing -t agrument to `ssh', which results in forced allocation of pseudo-tty. There's one issue with this solution: when the remotely executed command finishes, `ssh' terminates the connection which reults in printing "Connection closed by remote host" even if everything was ok (return code 0). So I also had to remove the error check associated with this message. But I tested this and it still works fine, because if the connection is closed by error, `ssh' exits with 255, LNST can recognize that and still report it as an error. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- Common/SshUtils.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Common/SshUtils.py b/Common/SshUtils.py index 109af71..e306976 100644 --- a/Common/SshUtils.py +++ b/Common/SshUtils.py @@ -142,7 +142,8 @@ def _remote_login(session, username, password, prompt, timeout=10): msg = "Got username prompt after password prompt" raise LoginAuthenticationError(msg, text) elif match == 3: # "Connection closed" - raise LoginError("Client said 'connection closed'", text) + logging.log(logging.INFO, "Remote command execution successful") + break elif match == 4: # "Connection refused" raise LoginError("Client said 'connection refused'", text) elif match == 5: # "Please wait" @@ -183,7 +184,7 @@ def remote_login(host, port, username, password, prompt, linesep="\n", command = "" else: command = "-C '%s'" % (command) - cmd = ("ssh -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o UserKnownHostsFile=/dev/null " + cmd = ("ssh -t -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o UserKnownHostsFile=/dev/null " "-p %s %s@%s %s" % #-o PreferredAuthentications=password (port, username, host, command)) -- 1.7.7.6

2 1

[PATCH v2 1/3] TestMulticast.py: Adding test for multicast tools
by Radek Pazdera 18 Apr '12

18 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> This test integratest multicast test tools into LNST and makes it possible to run and evaluate them from the recipes. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- Tests/TestMulticast.py | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) create mode 100644 Tests/TestMulticast.py diff --git a/Tests/TestMulticast.py b/Tests/TestMulticast.py new file mode 100644 index 0000000..c757bca --- /dev/null +++ b/Tests/TestMulticast.py @@ -0,0 +1,128 @@ +""" +Wrapper for executing the multicast test tools in LNST + +Copyright 2012 Red Hat, Inc. +Licensed under the GNU General Public License, version 2 as +published by the Free Software Foundation; see COPYING for details. +""" + +__author__ = """ +rpazdera(a)redhat.com (Radek Pazdera) +""" + +import logging +import re +from Common.TestsCommon import TestGeneric +from NetTest.NetTestCommand import CommandException +from Common.ExecCmd import exec_cmd + +class TestMulticast(TestGeneric): + """ Wrapper for executing the multicast test tools in LNST + + Running this test executes specified test setup from + multicast tools and evaluates the results. The behavior + is defined entirely by behavior of the selected setup. + + """ + + _tools_location = "test_tools/multicast/" + _conditions = {} + + @staticmethod + def _remove_mask(address_in_string): + """ Remove mask suffix from the IP address """ + if address_in_string != None: + return address_in_string.split('/')[0] + else: + return address_in_string + + def _compose_cmd(self): + """ Setup a command from the recipe options """ + cmd = "" + opts = {} + + setup = self._tools_location + self.get_mopt("setup") + opts["multicast_address"] = self._remove_mask(self.get_opt("address")) + opts["port"] = self.get_opt("port") + opts["interface"] = self._remove_mask(self.get_opt("interface")) + opts["duration"] = self.get_opt("duration") + + # sender-specific + opts["loop"] = self.get_opt("loop") + opts["ttl"] = self.get_opt("ttl") + opts["delay"] = self.get_opt("delay") + + # receiver-specific + opts["source"] = self._remove_mask(self.get_opt("source")) + + cmd = "./{0} ".format(setup) + + for optname, optval in opts.iteritems(): + if optval != None: + cmd += "--{0} \"{1}\" ".format(optname, optval) + + return cmd + + def _evaluate_result(self, name, value): + """ Check if the result meets required conditions """ + if name in self._conditions: + try: + float(value) + except ValueError: + value = '"' + value + '"' + + result = eval(value + self._conditions[name]) + logging.info("Condition evaluated {2}: {0}{1}".format(name, + self._conditions[name], str(result))) + + return result + else: + return True + + def _prepare_conditions(self): + """ Search for var names in conditions """ + varname_r = r"[a-zA-Z_][a-zA-Z0-9_]*" + + conds = self.get_multi_opt("condition") + logging.debug(conds) + for cond in conds: + if cond == None: + continue + logging.debug(cond) + match = re.match(varname_r, cond) + if match: + name = match.group(0) + self._conditions[name] = cond.replace(name, "") + else: + raise CommandException(self) + + + def run(self): + self._prepare_conditions() + + setup_name = self.get_mopt("setup") + logging.info("Started Multicast test setup {0}".format(setup_name)) + + exec_cmd("cd " + self._tools_location + " && make") + + cmd = self._compose_cmd() + data_stdout = exec_cmd(cmd, die_on_err=False)[0] + + res = {} + + # line format matches name=value pairs with optional + # double quotes around the value + line_format_r = r"([a-zA-Z0-9_ ]+)=\"?([a-zA-Z0-9_ ]*)\"?" + + for line in data_stdout.split("\n"): + match = re.search(line_format_r, line) + if match: + name = match.group(1).strip() + value = match.group(2).strip() + + res[name] = value + logging.info("Test result: {0} = {1}".format(name, value)) + if not self._evaluate_result(name, value): + return self.set_fail("Conditions not met!", res) + + return self.set_pass(res) -- 1.7.7.6

2 3

[lnst] SshUtils: Fix hanging slaves when using -e option
by Jiří Pírko 18 Apr '12

18 Apr '12

commit 7b9d4e51f4c4b309328e5a62a96be8dd8698af11 Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 5 17:17:40 2012 +0200 SshUtils: Fix hanging slaves when using -e option This patch fixes problem with haning processes on slave machines, after remote test execution using the -e option of nettestctl.py. The problem is, when `ssh' is killed on the client side, the corresponding remote `sshd' is terminated, but it doesn't signal bash with SIGHUP if there's no tty allocated. Which (in this case leaves two processes hanging on the slave machine (/bin/sh and ./nettestslave.py). The solution here is passing -t agrument to `ssh', which results in forced allocation of pseudo-tty. There's one issue with this solution: when the remotely executed command finishes, `ssh' terminates the connection which reults in printing "Connection closed by remote host" even if everything was ok (return code 0). So I also had to remove the error check associated with this message. But I tested this and it still works fine, because if the connection is closed by error, `ssh' exits with 255, LNST can recognize that and still report it as an error. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> Common/SshUtils.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- diff --git a/Common/SshUtils.py b/Common/SshUtils.py index 109af71..e306976 100644 --- a/Common/SshUtils.py +++ b/Common/SshUtils.py @@ -142,7 +142,8 @@ def _remote_login(session, username, password, prompt, timeout=10): msg = "Got username prompt after password prompt" raise LoginAuthenticationError(msg, text) elif match == 3: # "Connection closed" - raise LoginError("Client said 'connection closed'", text) + logging.log(logging.INFO, "Remote command execution successful") + break elif match == 4: # "Connection refused" raise LoginError("Client said 'connection refused'", text) elif match == 5: # "Please wait" @@ -183,7 +184,7 @@ def remote_login(host, port, username, password, prompt, linesep="\n", command = "" else: command = "-C '%s'" % (command) - cmd = ("ssh -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o UserKnownHostsFile=/dev/null " + cmd = ("ssh -t -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o UserKnownHostsFile=/dev/null " "-p %s %s@%s %s" % #-o PreferredAuthentications=password (port, username, host, command))

1 0

[lnst] multicast: Adding example recipe
by Jiří Pírko 18 Apr '12

18 Apr '12

commit 274ce419a3471c824428ea7c5204e65074af6f8a Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 5 14:56:40 2012 +0200 multicast: Adding example recipe Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> example_recipes/rpazdera-multicast.xml | 38 ++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) --- diff --git a/example_recipes/rpazdera-multicast.xml b/example_recipes/rpazdera-multicast.xml new file mode 100644 index 0000000..9a90168 --- /dev/null +++ b/example_recipes/rpazdera-multicast.xml @@ -0,0 +1,38 @@ + +<nettestrecipe> + <machines> + <machine id="1"> + <netmachineconfig> + <info hostname="10.34.1.120" rootpass="redhat" /> + <netdevice id="1" type="eth" phys_id="1" hwaddr="52:54:00:2E:D5:A8"/> + <netdevice id="2" type="eth" phys_id="2" hwaddr="52:54:00:90:23:0B"/> + </netmachineconfig> + <netconfig> + <netdevice id="1" type="eth" phys_id="1"> + <addresses> + <address value="192.168.122.237/24" /> + </addresses> + </netdevice> + <netdevice id="2" type="eth" phys_id="2" /> + </netconfig> + </machine> + <machine id="2"> + <netmachineconfig> + <info hostname="10.34.1.171" rootpass="redhat" /> + <netdevice id="1" type="eth" phys_id="1" hwaddr="52:54:00:12:DF:5A"/> + </netmachineconfig> + <netconfig> + <netdevice id="1" type="eth" phys_id="1"> + <addresses> + <address value="192.168.122.179/24" /> + </addresses> + </netdevice> + </netconfig> + </machine> + </machines> + + <command_sequence source="cmd_sequences/multicast/if.xml" /> + <command_sequence source="cmd_sequences/multicast/ttl.xml" /> + <command_sequence source="cmd_sequences/multicast/loop.xml" /> + <command_sequence source="cmd_sequences/multicast/simple.xml" /> +</nettestrecipe>

1 0

[lnst] multicast: Adding new folder for test tools
by Jiří Pírko 18 Apr '12

18 Apr '12

commit 1b1a3a5c5860071b3fcf729ae379df0df628e871 Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 5 14:56:39 2012 +0200 multicast: Adding new folder for test tools The `test_tools/' directory is a place for storing various non-python tools that will later be used for testing, such as programs in C, shell scripts etc. This commit also adds first test tools - a set of utilities, test setups and cases for validating implementation of multicast/igmp in kernel. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> example_recipes/cmd_sequences/multicast/if.xml | 77 ++++++++ example_recipes/cmd_sequences/multicast/loop.xml | 70 +++++++ example_recipes/cmd_sequences/multicast/simple.xml | 33 ++++ example_recipes/cmd_sequences/multicast/ttl.xml | 112 ++++++++++++ test_tools/multicast/Makefile | 21 ++ test_tools/multicast/client/send_simple.c | 59 ++++++ test_tools/multicast/multicast_utils.h | 192 ++++++++++++++++++++ test_tools/multicast/offline/sockopt_if.c | 70 +++++++ test_tools/multicast/offline/sockopt_loop.c | 52 ++++++ test_tools/multicast/offline/sockopt_ttl.c | 79 ++++++++ test_tools/multicast/parameters.h | 152 ++++++++++++++++ test_tools/multicast/server/recv_simple.c | 50 +++++ test_tools/multicast/sockopt_utils.h | 175 ++++++++++++++++++ 13 files changed, 1142 insertions(+), 0 deletions(-) --- diff --git a/example_recipes/cmd_sequences/multicast/if.xml b/example_recipes/cmd_sequences/multicast/if.xml new file mode 100644 index 0000000..c7fec3f --- /dev/null +++ b/example_recipes/cmd_sequences/multicast/if.xml @@ -0,0 +1,77 @@ + + + +<command_sequence> +  + <command type="test" value="Multicast" machine_id="1" timeout="30"> + <options> + <option name="setup" value="sockopt_if" /> + +  +  + </options> + </command> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + <command type="exec" machine_id="2" value="sleep 1" /> + + <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]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + + <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="1" /> + <option type="recipe_eval" name="interface" value="['machines'][1]['netconfig'][1]['addresses'][0]" /> + </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="127.0.0.1" /> + + <option name="condition" value="packets_received == 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> +</command_sequence> diff --git a/example_recipes/cmd_sequences/multicast/loop.xml b/example_recipes/cmd_sequences/multicast/loop.xml new file mode 100644 index 0000000..7b155e1 --- /dev/null +++ b/example_recipes/cmd_sequences/multicast/loop.xml @@ -0,0 +1,70 @@ + + + +<command_sequence> +  + <command type="test" value="Multicast" machine_id="1" timeout="30"> + <options> + <option name="setup" value="sockopt_loop" /> + <option name="condition" value="status == 'pass'" /> + </options> + </command> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + + <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="loop" value="1" /> + <option type="recipe_eval" name="interface" value="['machines'][1]['netconfig'][1]['addresses'][0]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + + <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="loop" value="0" /> + <option type="recipe_eval" name="interface" value="['machines'][1]['netconfig'][1]['addresses'][0]" /> + </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="condition" value="packets_received == 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> +</command_sequence> diff --git a/example_recipes/cmd_sequences/multicast/simple.xml b/example_recipes/cmd_sequences/multicast/simple.xml new file mode 100644 index 0000000..236558b --- /dev/null +++ b/example_recipes/cmd_sequences/multicast/simple.xml @@ -0,0 +1,33 @@ + + + +<command_sequence> + <command type="exec" machine_id="1" value="sleep 1" /> + <command type="exec" machine_id="2" value="sleep 1" /> + + <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]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> +</command_sequence> diff --git a/example_recipes/cmd_sequences/multicast/ttl.xml b/example_recipes/cmd_sequences/multicast/ttl.xml new file mode 100644 index 0000000..ae55228 --- /dev/null +++ b/example_recipes/cmd_sequences/multicast/ttl.xml @@ -0,0 +1,112 @@ + + + +<command_sequence> +  + <command type="test" value="Multicast" machine_id="1" timeout="30"> + <options> + <option name="setup" value="sockopt_ttl" /> + <option name="condition" value="status == 'pass'" /> + </options> + </command> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + + <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 name="loop" value="1" /> + <option type="recipe_eval" name="interface" value="['machines'][1]['netconfig'][1]['addresses'][0]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> + +  +  + <command type="exec" machine_id="1" value="sleep 1" /> + <command type="exec" machine_id="2" value="sleep 1" /> + + <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]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> + +  + <command type="exec" machine_id="1" value="sleep 1" /> + + <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="1" /> + <option type="recipe_eval" name="interface" value="['machines'][1]['netconfig'][1]['addresses'][0]" /> + </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="condition" value="packets_received > 0" /> + </options> + </command> + + <command type="wait" machine_id="1" value="1" /> +</command_sequence> diff --git a/test_tools/multicast/Makefile b/test_tools/multicast/Makefile new file mode 100644 index 0000000..47af8f5 --- /dev/null +++ b/test_tools/multicast/Makefile @@ -0,0 +1,21 @@ +CC=gcc +TOOLS_DIR=. +CFLAGS=-Wall -Wextra -I$(TOOLS_DIR) + +SENDERS=send_simple +RECEIVERS=recv_simple +OFFLINE=sockopt_loop sockopt_ttl sockopt_if + +all: $(SENDERS) $(RECEIVERS) $(OFFLINE) + +$(SENDERS): + $(CC) $(CFLAGS) -o $@ client/$@.c + +$(RECEIVERS): + $(CC) $(CFLAGS) -o $@ server/$@.c + +$(OFFLINE): + $(CC) $(CFLAGS) -o $@ offline/$@.c + +clean: + rm -f $(SENDERS) $(RECEIVERS) $(OFFLINE) diff --git a/test_tools/multicast/client/send_simple.c b/test_tools/multicast/client/send_simple.c new file mode 100644 index 0000000..2651c36 --- /dev/null +++ b/test_tools/multicast/client/send_simple.c @@ -0,0 +1,59 @@ +/* + * send_simple.c - simple sender setup for multicast tests + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#define SEND +#include "multicast_utils.h" + +int main(int argc, char** argv) +{ + struct parameters params; + parse_args(argc, argv, &params); + + int sockfd = init_out_socket(&params); + + /* Sockopts setup */ + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_LOOP, + &(params.loop), sizeof(params.loop)) < 0) { + perror("setsockopt"); + return EXIT_FAILURE; + } + + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, + &(params.ttl), sizeof(params.ttl)) < 0) { + perror("setsockopt"); + return EXIT_FAILURE; + } + + if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_IF, + &(params.interface), sizeof(params.interface)) < 0) { + perror("setsockopt"); + return EXIT_FAILURE; + } + + int num_sent = 0; + num_sent = send_data(sockfd, params.multiaddr, params.port, + params.duration, params.delay); + + printf("packets_sent=%d\n", num_sent); + + return EXIT_SUCCESS; +} diff --git a/test_tools/multicast/multicast_utils.h b/test_tools/multicast/multicast_utils.h new file mode 100644 index 0000000..25d0c38 --- /dev/null +++ b/test_tools/multicast/multicast_utils.h @@ -0,0 +1,192 @@ +/* + * multicast_utils.h - common tools for kernel multicast tests + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#ifndef __MULTICAST_UTILS_H__ +#define __MULTICAST_UTILS_H__ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <netinet/in.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <sys/select.h> + +#include <signal.h> +#include <time.h> + +#include <stdlib.h> +#include <unistd.h> + +#if !defined(SEND) && !defined(RECEIVE) +#error "At least one of SEND/RECEIVE macros must be defined!" +#endif + +#include "parameters.h" + +#define MESSAGE "Hello world!" + +int __verbosity = 0; + +/* Verbose print */ +#define printv(args...) \ + if (__verbosity > 0) \ + { \ + printf(args); \ + fflush(stdout); \ + } + +/** Initiailze socket for receiving multicast data */ +int init_in_socket(struct in_addr multiaddr, short port) +{ + int sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (sockfd < 0) { + perror("socket()"); + exit(EXIT_FAILURE); + } + + struct sockaddr_in addr; + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr = multiaddr; + memset(&(addr.sin_zero), 0, sizeof(addr.sin_zero)); + + if (bind(sockfd, (struct sockaddr*) &addr, sizeof(addr)) < 0) { + perror("bind()"); + exit(EXIT_FAILURE); + } + + return sockfd; +} + +/** Initialize socket for sending multicast data */ +int init_out_socket() +{ + int sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (sockfd < 0) { + perror("socket()"); + exit(EXIT_FAILURE); + } + + return sockfd; +} + +/** Close a socket */ +void free_socket(int sockfd) +{ + close(sockfd); +} + +/** Wait for data up to `duration' seconds */ +int wait_for_data(int sockfd, int duration, int packet_limit) +{ + const char message[] = MESSAGE; + char buffer[] = MESSAGE; + memset(buffer, 0, sizeof(buffer)); + + int num_received = 0; + + fd_set receive_fd_set; + struct timeval timeout; + + time_t deadline = time(NULL) + duration; + + printv("Receiving\n"); + + while (1) { + FD_ZERO(&receive_fd_set); + FD_SET(sockfd, &receive_fd_set); + + if (duration == 0) { + timeout.tv_sec = 5; + timeout.tv_usec = 0; + } else { + time_t now = time(NULL); + if ((deadline - now) <= 0) + break; + + timeout.tv_sec = deadline - now; + timeout.tv_usec = 0; + } + + + if (select(sockfd + 1, &receive_fd_set, NULL, NULL, &timeout) > 0) { + recv(sockfd, buffer, sizeof(buffer), 0); + if (strncmp(message, buffer, sizeof(buffer)) == 0) { + num_received++; + + printv("."); + if (!(num_received % 10)) + printv("\n"); + + if (packet_limit > 0 && num_received > packet_limit) + break; + } + } + } + + printv("\n"); + + return num_received; +} + +/** Send data for specified amount of time */ +int send_data(int sockfd, struct in_addr multiaddr, short port, + int duration, double delay) +{ + const char message[] = MESSAGE; + int i = 0; + + struct sockaddr_in addr; + + addr.sin_family = AF_INET; + addr.sin_addr = multiaddr; + addr.sin_port = htons(port); + memset(&(addr.sin_zero), 0, sizeof(addr.sin_zero)); + + struct timespec delay_value; + delay_value.tv_sec = 0; + delay_value.tv_nsec = delay * 999999999; + + printv("Sending...\n"); + + time_t started_at = time(NULL); + while (duration == 0 || (time(NULL) - started_at) < duration) { + i++; + sendto(sockfd, message, strlen(message), 0, + (struct sockaddr*) &addr, sizeof(addr)); + + printv("."); + if (!(i % 10)) + printv("\n"); + + nanosleep(&delay_value, NULL); + } + + printv("\n"); + + return i; +} + +#endif diff --git a/test_tools/multicast/offline/sockopt_if.c b/test_tools/multicast/offline/sockopt_if.c new file mode 100644 index 0000000..ff5bd51 --- /dev/null +++ b/test_tools/multicast/offline/sockopt_if.c @@ -0,0 +1,70 @@ +/* + * sockopt_if.c - IP_MULTICAST_IF socket option test + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include "sockopt_utils.h" + + +void test_if() +{ + struct in_addr address; + size_t size = sizeof(address); + + address.s_addr = INADDR_ANY; + test_getsockopt("IP_MULTICAST_IF default value", + IP_MULTICAST_IF, &address, size); + + inet_pton(AF_INET, "127.0.0.1", &address); + test_sockopt_value("IP_MULTICAST_IF set to 127.0.0.1", + IP_MULTICAST_IF, &address, size); + + struct ip_mreqn mreqn; + mreqn.imr_multiaddr.s_addr = 0xdeadbeef; + mreqn.imr_address.s_addr = INADDR_ANY; + mreqn.imr_ifindex = 0; + + test_sockopt_value("IP_MULTICAST_IF set to INADDR_ANY", + IP_MULTICAST_IF, &mreqn, sizeof(mreqn)); + + mreqn.imr_address.s_addr = 0x0100007f; + test_sockopt_value("IP_MULTICAST_IF set to 127.0.0.1", + IP_MULTICAST_IF, &mreqn, sizeof(mreqn)); + + + /* Errors */ + test_setsockopt_error("IP_MULTICAST_IF bad optlen", + IP_MULTICAST_IF, &address, 3, EINVAL); + + inet_pton(AF_INET, "238.0.10.0", &address); + test_setsockopt_error("IP_MULTICAST_IF address 238.0.10.0", + IP_MULTICAST_IF, &address, + sizeof(address), EADDRNOTAVAIL); +} + +int main() +{ + initialize(); + + test_if(); + + report_and_exit(); + return 0; +} diff --git a/test_tools/multicast/offline/sockopt_loop.c b/test_tools/multicast/offline/sockopt_loop.c new file mode 100644 index 0000000..fdf7478 --- /dev/null +++ b/test_tools/multicast/offline/sockopt_loop.c @@ -0,0 +1,52 @@ +/* + * sockopt_loop.c - IP_MULTICAST_LOOP socket option test + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include "sockopt_utils.h" + + +void test_loop() +{ + int value; + size_t size = sizeof(value); + + value = 1; + test_getsockopt("IP_MULTICAST_LOOP default value", + IP_MULTICAST_LOOP, &value, size); + + value = 0; + test_sockopt_value("IP_MULTICAST_LOOP set to zero", + IP_MULTICAST_LOOP, &value, size); + + /* Errors */ + test_setsockopt_error("IP_MULTICAST_LOOP bad optlen", + IP_MULTICAST_LOOP, &value, 0, EINVAL); +} + +int main() +{ + initialize(); + + test_loop(); + + report_and_exit(); + return 0; +} diff --git a/test_tools/multicast/offline/sockopt_ttl.c b/test_tools/multicast/offline/sockopt_ttl.c new file mode 100644 index 0000000..293bbe5 --- /dev/null +++ b/test_tools/multicast/offline/sockopt_ttl.c @@ -0,0 +1,79 @@ +/* + * sockopt_ttl.c - IP_MULTICAST_TTL socket option test + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include "sockopt_utils.h" + + +void test_ttl() +{ + int value; + size_t size = sizeof(value); + + value = 1; + test_getsockopt("IP_MULTICAST_TTL default value", + IP_MULTICAST_TTL, &value, size); + + value = 0; + test_sockopt_value("IP_MULTICAST_TTL set to zero", + IP_MULTICAST_TTL, &value, size); + + value = 64; + test_sockopt_value("IP_MULTICAST_TTL set to 64", + IP_MULTICAST_TTL, &value, size); + + value = 255; + test_sockopt_value("IP_MULTICAST_TTL set to 255", + IP_MULTICAST_TTL, &value, size); + + + /* + * Special case: + * For some reason kernel accepts + * TTL = -1 and takes it as if it were 1 + */ + value = -1; + test_setsockopt("IP_MULTICAST_TTL set to -1", + IP_MULTICAST_TTL, &value, size); + + value = 1; + test_getsockopt("IP_MULTICAST_TTL set to 1", + IP_MULTICAST_TTL, &value, size); + + + /* Errors */ + value = 500; + test_setsockopt_error("IP_MULTICAST_TTL set to 500", + IP_MULTICAST_TTL, &value, size, EINVAL); + + test_setsockopt_error("IP_MULTICAST_TTL bad optlen", + IP_MULTICAST_TTL, &value, 0, EINVAL); +} + +int main() +{ + initialize(); + + test_ttl(); + + report_and_exit(); + return 0; +} diff --git a/test_tools/multicast/parameters.h b/test_tools/multicast/parameters.h new file mode 100644 index 0000000..6a313ec --- /dev/null +++ b/test_tools/multicast/parameters.h @@ -0,0 +1,152 @@ +/* + * parameters.h - common code for parsing sender/receiver parameters + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <netinet/in.h> +#include <sys/types.h> +#include <sys/socket.h> + +#include <signal.h> +#include <time.h> + +#include <getopt.h> +#include <stdlib.h> +#include <unistd.h> + +extern int __verbosity; + +/** Structure that carries test parameters */ +struct parameters +{ + int duration; /* seconds */ + + struct in_addr multiaddr; + short port; + struct in_addr interface; + +#ifdef RECEIVE + struct in_addr sourceaddr; +#endif + +#ifdef SEND + double delay; + int ttl; + int loop; +#endif +}; + +/** Initialize parameters struct with default values. */ +void default_parameters(struct parameters* params) +{ + params->duration = 10; + params->port = 0; + memset(&params->multiaddr, 0, sizeof(struct in_addr)); + memset(&params->interface, 0, sizeof(struct in_addr)); +#ifdef RECEIVE + memset(&params->sourceaddr, 0, sizeof(struct in_addr)); +#endif + +#ifdef SEND + params->delay = 0.1; + params->ttl = 1; + params->loop = 1; +#endif +} + +/** Generic function for parsing arguments */ +void parse_args(int argc, char** argv, struct parameters* args) +{ +#ifdef SEND + static const char* opts = "d:a:p:i:f:l:t:v"; +#endif + +#ifdef RECEIVE + static const char* opts = "d:a:p:s:i:v"; +#endif + + static struct option long_options[] = + { + {"duration", required_argument, NULL, 'd'}, + {"multicast_address", required_argument, NULL, 'a'}, + {"port", required_argument, NULL, 'p'}, + {"interface", required_argument, NULL, 'i'}, + {"verbose", no_argument, NULL, 'v'}, +#ifdef RECEIVE + {"source_address", required_argument, NULL, 's'}, +#endif + +#ifdef SEND + {"delay", required_argument, NULL, 'f'}, + {"ttl", required_argument, NULL, 't'}, + {"loop", required_argument, NULL, 'l'}, +#endif + {0, 0, NULL, 0} + }; + + default_parameters(args); + + int opt; + int option_index = 0; + while((opt = getopt_long(argc, argv, opts, long_options, + &option_index)) != -1) { + switch (opt) { + case 'd': + args->duration = atoi(optarg); + break; + case 'a': + inet_pton(AF_INET, optarg, &(args->multiaddr)); + break; + case 'p': + args->port = atoi(optarg); + break; + case 'i': + inet_pton(AF_INET, optarg, &(args->interface)); + break; + case 'v': + __verbosity = 1; + break; +#ifdef RECEIVE + case 's': + inet_pton(AF_INET, optarg, &(args->sourceaddr)); + break; +#endif + +#ifdef SEND + case 'f': + args->delay = atof(optarg); + break; + case 't': + args->ttl = atoi(optarg); + break; + case 'l': + args->loop = atoi(optarg); + break; +#endif + default: /* '?' */ + printf("%s: invalid test options\n", argv[0]); + exit(EXIT_FAILURE); + } + } +} diff --git a/test_tools/multicast/server/recv_simple.c b/test_tools/multicast/server/recv_simple.c new file mode 100644 index 0000000..c4d045c --- /dev/null +++ b/test_tools/multicast/server/recv_simple.c @@ -0,0 +1,50 @@ +/* + * recv_simple.c - simple receiver setup for multicast tests + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#define RECEIVE +#include "multicast_utils.h" + +int main(int argc, char** argv) +{ + struct parameters params; + parse_args(argc, argv, &params); + + int sockfd = init_in_socket(params.multiaddr, params.port); + + struct ip_mreq mreq; + mreq.imr_multiaddr = params.multiaddr; + mreq.imr_interface = params.interface; + + int num_recv = 0; + + if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &(mreq), sizeof(mreq)) < 0) { + perror("setsockopt"); + return EXIT_FAILURE; + } + + num_recv = wait_for_data(sockfd, params.duration, 0); + + printf("packets_received=%d\n", num_recv); + + return EXIT_SUCCESS; +} diff --git a/test_tools/multicast/sockopt_utils.h b/test_tools/multicast/sockopt_utils.h new file mode 100644 index 0000000..6486f71 --- /dev/null +++ b/test_tools/multicast/sockopt_utils.h @@ -0,0 +1,175 @@ +/* + * sockopt_utils.h - common tools for writing sockopt conformance tests + * Copyright (C) 2012 Red Hat Inc. + * + * Author: Radek Pazdera (rpazdera(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#ifndef __SOCKOPT_UTILS_H__ +#define __SOCKOPT_UTILS_H__ + +#define __SUCCESS_CODE 0 +#define __FAILURE_CODE 1 + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> + +int __test_status = 1; +int __sockfd; + +void fail() +{ + __test_status = 0; +} + +void report_and_exit() +{ + close(__sockfd); + + if (__test_status) { + printf("status=pass\n"); + exit(__SUCCESS_CODE); + } else { + printf("status=fail\n"); + exit(__FAILURE_CODE); + } +} + +void error_exit(char* what) +{ + int code = errno; + printf("error_message=%s %s\n", what, strerror(code)); + fail(); + report_and_exit(); +} + +void initialize() +{ + __sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (__sockfd < 0) + error_exit("socket()"); +} + +void test_getsockopt(char* test_name, int optname, void *expected_optval, + socklen_t expected_optlen) +{ + int status; + socklen_t size = expected_optlen; + void* value = malloc(size); + + if (value == NULL) + error_exit("malloc()"); + + memset(value, 0, size); + + status = getsockopt(__sockfd, IPPROTO_IP, optname, value, &size); + if (status < 0) + error_exit("getsockopt()"); + + if (expected_optlen != size) { + printf("%s=fail: size of the returned struct differ\n", test_name); + fail(); + } else { + socklen_t i; + for (i = 0; i < size; i++) + if (((char*) value)[i] != ((char*) expected_optval)[i]) + { + free(value); + printf("%s=fail: received value of the option " + "differs from expected one\n", test_name); + fail(); + return; + } + + printf("%s=pass\n", test_name); + } + + free(value); +} + + +void test_setsockopt(char* test_name, int optname, void *optval, + socklen_t optlen) +{ + int status; + + status = setsockopt(__sockfd, IPPROTO_IP, optname, optval, optlen); + if (status < 0) + error_exit("setsockopt()"); + + printf("%s=pass\n", test_name); +} + +void test_sockopt_value(char* test_name, int optname, + void *optval, socklen_t optlen) +{ + test_setsockopt(test_name, optname, optval, optlen); + test_getsockopt(test_name, optname, optval, optlen); +} + +void test_setsockopt_error(char* test_name, int optname, void *optval, + socklen_t optlen, int expected_errorcode) +{ + int status; + + status = setsockopt(__sockfd, IPPROTO_IP, optname, optval, optlen); + if (status < 0) { + if (errno != expected_errorcode) { + printf("%s=fail: error codes don't " + "match (expected %d, got %d)\n", test_name, + expected_errorcode, errno); + fail(); + } else { + printf("%s=pass\n", test_name); + } + } else { + printf("%s=fail: no error occured\n", test_name); + fail(); + } +} + +void test_getsockopt_error(char* test_name, int optname, void *optval, + socklen_t optlen, int expected_errorcode) +{ + int status; + socklen_t size = optlen; + + status = getsockopt(__sockfd, IPPROTO_IP, optname, optval, &size); + if (status < 0) { + if (errno != expected_errorcode) { + printf("%s=fail: error codes don't " + "match (expected %d, got %d)\n", test_name, + expected_errorcode, errno); + fail(); + } else { + printf("%s=pass\n", test_name); + } + } else { + printf("%s=fail: no error occured\n", test_name); + fail(); + } +} + +#endif

1 0

[lnst] TestMulticast.py: Adding test for multicast tools
by Jiří Pírko 18 Apr '12

18 Apr '12

commit a75f9d32f3da1939ac823f268bed2c7f386a534d Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Thu Apr 5 14:56:38 2012 +0200 TestMulticast.py: Adding test for multicast tools This test integratest multicast test tools into LNST and makes it possible to run and evaluate them from the recipes. Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> Tests/TestMulticast.py | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) --- diff --git a/Tests/TestMulticast.py b/Tests/TestMulticast.py new file mode 100644 index 0000000..c757bca --- /dev/null +++ b/Tests/TestMulticast.py @@ -0,0 +1,128 @@ +""" +Wrapper for executing the multicast test tools in LNST + +Copyright 2012 Red Hat, Inc. +Licensed under the GNU General Public License, version 2 as +published by the Free Software Foundation; see COPYING for details. +""" + +__author__ = """ +rpazdera(a)redhat.com (Radek Pazdera) +""" + +import logging +import re +from Common.TestsCommon import TestGeneric +from NetTest.NetTestCommand import CommandException +from Common.ExecCmd import exec_cmd + +class TestMulticast(TestGeneric): + """ Wrapper for executing the multicast test tools in LNST + + Running this test executes specified test setup from + multicast tools and evaluates the results. The behavior + is defined entirely by behavior of the selected setup. + + """ + + _tools_location = "test_tools/multicast/" + _conditions = {} + + @staticmethod + def _remove_mask(address_in_string): + """ Remove mask suffix from the IP address """ + if address_in_string != None: + return address_in_string.split('/')[0] + else: + return address_in_string + + def _compose_cmd(self): + """ Setup a command from the recipe options """ + cmd = "" + opts = {} + + setup = self._tools_location + self.get_mopt("setup") + opts["multicast_address"] = self._remove_mask(self.get_opt("address")) + opts["port"] = self.get_opt("port") + opts["interface"] = self._remove_mask(self.get_opt("interface")) + opts["duration"] = self.get_opt("duration") + + # sender-specific + opts["loop"] = self.get_opt("loop") + opts["ttl"] = self.get_opt("ttl") + opts["delay"] = self.get_opt("delay") + + # receiver-specific + opts["source"] = self._remove_mask(self.get_opt("source")) + + cmd = "./{0} ".format(setup) + + for optname, optval in opts.iteritems(): + if optval != None: + cmd += "--{0} \"{1}\" ".format(optname, optval) + + return cmd + + def _evaluate_result(self, name, value): + """ Check if the result meets required conditions """ + if name in self._conditions: + try: + float(value) + except ValueError: + value = '"' + value + '"' + + result = eval(value + self._conditions[name]) + logging.info("Condition evaluated {2}: {0}{1}".format(name, + self._conditions[name], str(result))) + + return result + else: + return True + + def _prepare_conditions(self): + """ Search for var names in conditions """ + varname_r = r"[a-zA-Z_][a-zA-Z0-9_]*" + + conds = self.get_multi_opt("condition") + logging.debug(conds) + for cond in conds: + if cond == None: + continue + logging.debug(cond) + match = re.match(varname_r, cond) + if match: + name = match.group(0) + self._conditions[name] = cond.replace(name, "") + else: + raise CommandException(self) + + + def run(self): + self._prepare_conditions() + + setup_name = self.get_mopt("setup") + logging.info("Started Multicast test setup {0}".format(setup_name)) + + exec_cmd("cd " + self._tools_location + " && make") + + cmd = self._compose_cmd() + data_stdout = exec_cmd(cmd, die_on_err=False)[0] + + res = {} + + # line format matches name=value pairs with optional + # double quotes around the value + line_format_r = r"([a-zA-Z0-9_ ]+)=\"?([a-zA-Z0-9_ ]*)\"?" + + for line in data_stdout.split("\n"): + match = re.search(line_format_r, line) + if match: + name = match.group(1).strip() + value = match.group(2).strip() + + res[name] = value + logging.info("Test result: {0} = {1}".format(name, value)) + if not self._evaluate_result(name, value): + return self.set_fail("Conditions not met!", res) + + return self.set_pass(res)

1 0

[PATCH 0/3] Multicast Tests with LNST
by Radek Pazdera 05 Apr '12

05 Apr '12

From: Radek Pazdera <rpazdera(a)redhat.com> Hi, I'm trying to implement a set of automatic tests for multicast implementation in kernel using LNST. The thing is, there is only a little documentation for the interface at the moment, so some of the features that need test coverage are not implemented Python's socket module. That's why I need C for writing tests. I figured that this might be useful also in other areas of network stack testing and added a few new things into LNST. I'm sending it here for review. I created a directory called `test_tools'. That should be a place for storing non-python tools and utilities for testing, that can be used from LNST tests. I placed there a first set of tools for multicast. The communication between the C and LNST is achieved through a test called `TestMulticast'. This test takes arguments from the XML recipe file and executes the selected test setup from multicast tools. It also collects and evaluates results when the test ends. Additionaly, I added a couple of example command sequences to `example_recipes/cmd_sequences/multicast'. These should serve as a-sort-of building blocks for creating test recipes. Then if you'd like to run tests for IGMPv2 for instance you can only create netconfigs, include several test cases and run it as one big recipe. Example of these tests in practice is in the `rpazdera-multicast.xml' recipe I added to `example_recipes' directory. Is this solution acceptable for you to include it into LNST? Thank you, Radek Pazdera Radek Pazdera (3): TestMulticast.py: Adding test for multicast tools multicast: Adding new folder for test tools multicast: Adding example recipe Tests/TestMulticast.py | 129 +++++++++++++ example_recipes/cmd_sequences/multicast/if.xml | 77 ++++++++ example_recipes/cmd_sequences/multicast/loop.xml | 70 +++++++ example_recipes/cmd_sequences/multicast/simple.xml | 33 ++++ example_recipes/cmd_sequences/multicast/ttl.xml | 112 ++++++++++++ example_recipes/rpazdera-multicast.xml | 39 ++++ test_tools/multicast/Makefile | 22 +++ test_tools/multicast/client/send_simple.c | 59 ++++++ test_tools/multicast/multicast_utils.h | 192 ++++++++++++++++++++ test_tools/multicast/offline/sockopt_if.c | 70 +++++++ test_tools/multicast/offline/sockopt_loop.c | 52 ++++++ test_tools/multicast/offline/sockopt_ttl.c | 79 ++++++++ test_tools/multicast/parameters.h | 152 ++++++++++++++++ test_tools/multicast/server/recv_simple.c | 50 +++++ test_tools/multicast/sockopt_utils.h | 176 ++++++++++++++++++ 15 files changed, 1312 insertions(+), 0 deletions(-) create mode 100644 Tests/TestMulticast.py create mode 100644 example_recipes/cmd_sequences/multicast/if.xml create mode 100644 example_recipes/cmd_sequences/multicast/loop.xml create mode 100644 example_recipes/cmd_sequences/multicast/simple.xml create mode 100644 example_recipes/cmd_sequences/multicast/ttl.xml create mode 100644 example_recipes/rpazdera-multicast.xml create mode 100644 test_tools/multicast/Makefile create mode 100644 test_tools/multicast/client/send_simple.c create mode 100644 test_tools/multicast/multicast_utils.h create mode 100644 test_tools/multicast/offline/sockopt_if.c create mode 100644 test_tools/multicast/offline/sockopt_loop.c create mode 100644 test_tools/multicast/offline/sockopt_ttl.c create mode 100644 test_tools/multicast/parameters.h create mode 100644 test_tools/multicast/server/recv_simple.c create mode 100644 test_tools/multicast/sockopt_utils.h -- 1.7.7.6

2 5

[PATCH] SlaveUtils: Changed nettestslave.py exec command
by Radek Pazdera 03 Apr '12

03 Apr '12

Hi, I ran into a minor issue, while I was working with LNST. If you execute nettestctl.py with the -e option that automatically starts the slaves, they are run from the directory that is default after logging with ssh (usually user's home dir). This makes it hard to use paths relative to the install_path in the tests. I changed the command so nettestslave.py gets executed from the install directory, where it resides, so relative paths are valid. -- Radek Pazdera Changed the way nettestslave.py is executed so the cwd is the root of lnst install, not where ssh logs to by default (which is usually root home dir). Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> --- Common/SlaveUtils.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Common/SlaveUtils.py b/Common/SlaveUtils.py index d8db772..6cb7cc0 100644 --- a/Common/SlaveUtils.py +++ b/Common/SlaveUtils.py @@ -37,6 +37,6 @@ def prepare_client_session(host, port, login, passwd=None, command=None, if prompt is None: prompt = "Started" - command = "/%s/%s/%s" % (install_path, test_dir, command) + command = "cd /%s/%s/ && ./%s" % (install_path, test_dir, command) return wait_for_login(host, port, login, passwd, prompt, command=command, timeout=10) \ No newline at end of file -- 1.7.7.6

2 1

[lnst] SlaveUtils: Changed nettestslave.py exec command
by Jiří Pírko 03 Apr '12

03 Apr '12

commit 0c21e17ac5d1e2f8f1995b31c1f2e1ac6056662b Author: Radek Pazdera <rpazdera(a)redhat.com> Date: Mon Apr 2 11:25:21 2012 +0200 SlaveUtils: Changed nettestslave.py exec command Changed the way nettestslave.py is executed so the cwd is the root of lnst install, not where ssh logs to by default (which is usually root home dir). Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com> Common/SlaveUtils.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/Common/SlaveUtils.py b/Common/SlaveUtils.py index d8db772..e7fdf3d 100644 --- a/Common/SlaveUtils.py +++ b/Common/SlaveUtils.py @@ -37,6 +37,6 @@ def prepare_client_session(host, port, login, passwd=None, command=None, if prompt is None: prompt = "Started" - command = "/%s/%s/%s" % (install_path, test_dir, command) + command = "cd /%s/%s/ && ./%s" % (install_path, test_dir, command) return wait_for_login(host, port, login, passwd, prompt, command=command, timeout=10) \ No newline at end of file

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers April 2012