This patch set removes both the PerfRepo code and deprecated TaskAPI.
We consider PerfRepo project dead, with zero development in the past year.
Jan Tluka (5): lnst/Controller/Config.py: remove PerfRepo configuration lnst/Controller: remove deprecated TaskAPI lnst/RecipeCommon/TestRecipe.py: remove references to PerfRepo code lnst/RecipeCommon: remove PerfRepo code lnst/RecipeCommon: remove ModuleWrap due to deprecated TaskAPI
install/lnst-ctl.conf.in | 5 - lnst-ctl.conf | 5 - lnst/Controller/Config.py | 20 - lnst/Controller/Task.py | 824 ------------------ lnst/RecipeCommon/ModuleWrap.py | 180 ---- lnst/RecipeCommon/PerfRepo/PerfRepo.py | 408 --------- lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py | 79 -- lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py | 72 -- lnst/RecipeCommon/PerfRepo/__init__.py | 0 lnst/RecipeCommon/TestRecipe.py | 38 +- .../examples/python_recipe_simple_netperf.py | 19 +- 11 files changed, 2 insertions(+), 1648 deletions(-) delete mode 100644 lnst/Controller/Task.py delete mode 100644 lnst/RecipeCommon/ModuleWrap.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepo.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py delete mode 100644 lnst/RecipeCommon/PerfRepo/__init__.py
PerfRepo support has been removed.
Signed-off-by: Jan Tluka jtluka@redhat.com --- install/lnst-ctl.conf.in | 5 ----- lnst-ctl.conf | 5 ----- lnst/Controller/Config.py | 20 -------------------- 3 files changed, 30 deletions(-)
diff --git a/install/lnst-ctl.conf.in b/install/lnst-ctl.conf.in index 295f9ba..161c5c3 100644 --- a/install/lnst-ctl.conf.in +++ b/install/lnst-ctl.conf.in @@ -56,8 +56,3 @@ allow_virtual = True # which contains the slave machine descriptions. [pools]
-# Optional section for configuring access to a PerfRepo instance -#[perfrepo] -#url = -#username = -#password = diff --git a/lnst-ctl.conf b/lnst-ctl.conf index 8f4b95c..873967e 100644 --- a/lnst-ctl.conf +++ b/lnst-ctl.conf @@ -12,9 +12,4 @@ log_dir = ./Logs xslt_url = http://www.lnst-project.org/files/result_xslt/xml_to_html.xsl allow_virtual = True
-[perfrepo] -url = -username = -password = - [pools] diff --git a/lnst/Controller/Config.py b/lnst/Controller/Config.py index b82787c..774528f 100644 --- a/lnst/Controller/Config.py +++ b/lnst/Controller/Config.py @@ -62,26 +62,6 @@ class CtlConfig(Config): "name" : "allow_virtual" }
- self._options['perfrepo'] = dict() - self._options['perfrepo']['url'] = {\ - "value" : "", - "additive" : False, - "action" : self.optionPlain, - "name" : "url" - } - self._options['perfrepo']['username'] = {\ - "value" : "", - "additive" : False, - "action" : self.optionPlain, - "name" : "username" - } - self._options['perfrepo']['password'] = {\ - "value" : "", - "additive" : False, - "action" : self.optionPlain, - "name" : "password" - } - self._options['pools'] = dict()
self._options['security'] = dict()
This is deprecated by the BaseRecipe API.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Controller/Task.py | 824 ---------------------------------------- 1 file changed, 824 deletions(-) delete mode 100644 lnst/Controller/Task.py
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py deleted file mode 100644 index 3264406..0000000 --- a/lnst/Controller/Task.py +++ /dev/null @@ -1,824 +0,0 @@ -""" -This module contains the API for python tasks. - -Copyright 2013 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@redhat.com (Radek Pazdera) -""" - -import hashlib -import re -import logging -from lnst.Common.Utils import dict_to_dot, list_to_dot, deprecated -from lnst.Common.Config import lnst_config -from lnst.Controller.XmlTemplates import XmlTemplateError -from lnst.Common.Path import Path -from lnst.Controller.PerfRepoMapping import PerfRepoMapping -from lnst.Controller.Common import ControllerError -from lnst.Common.Utils import Noop - -try: - from perfrepo import PerfRepoRESTAPI - from perfrepo import PerfRepoTestExecution - from perfrepo import PerfRepoValue -except: - PerfRepoRESTAPI = None - PerfRepoTestExecution = None - PerfRepoValue = None - -# The handle to be imported from each task -ctl = None - -def get_alias(alias, default=None): - return ctl.get_alias(alias, default) - -def get_mreq(): - return ctl.get_mreq() - -def wait(seconds): - return ctl.wait(seconds) - -def get_module(name, options={}): - return ctl.get_module(name, options) - -def breakpoint(): - if not ctl.breakpoints: - return - logging.info("Breakpoint reached. Press enter to continue.") - eval(input("")) - -def add_host(params={}): - m_id = ctl.gen_m_id() - ctl.mreq[m_id] = {'interfaces' : {}, 'params' : params} - handle = HostAPI(ctl, m_id) - ctl.add_host(m_id, handle) - return handle - -def match(): - ctl.cleanup_slaves() - - if ctl.first_run: - ctl.first_run = False - ctl.set_machine_requirements() - - if ctl.prepare_test_env(): - if ctl.run_mode == "match_setup": - return False - if ctl.packet_capture(): - ctl.start_packet_capture() - return True - else: - if ctl._ctl._multi_match: - if ctl.prepare_test_env(): - if ctl.run_mode == "match_setup": - return False - if ctl.packet_capture(): - ctl.start_packet_capture() - return True - else: - return False - else: - return False - - -class TaskError(ControllerError): - pass - -class ControllerAPI(object): - """ An API class representing the controller. """ - - def __init__(self, ctl): - self._ctl = ctl - self.run_mode = ctl.run_mode - self.breakpoints = ctl.breakpoints - self._result = True - self.first_run = True - self._m_id_seq = 0 - self.mreq = {} - - self._perf_repo_api = PerfRepoAPI() - - self._hosts = {} - - def get_mreq(self): - return self.mreq - - def cleanup_slaves(self): - self._ctl._cleanup_slaves() - - def set_machine_requirements(self): - self._ctl.set_machine_requirements() - - def packet_capture(self): - return self._ctl._packet_capture - - def start_packet_capture(self): - self._ctl._start_packet_capture() - - def prepare_test_env(self): - return self._ctl.prepare_test_env() - - def gen_m_id(self): - self._m_id_seq += 1 - return "m_id_%s" % self._m_id_seq - - def add_host(self, host_id, handle): - self._hosts[host_id] = handle - - def init_hosts(self, hosts): - for host_id, host in list(hosts.items()): - self._hosts[host_id].init_host(host) - - def _run_command(self, command): - """ - An internal wrapper that allows keeping track of the - results of the commands within the task. - - Please, don't use this. - """ - res = self._ctl._run_command(command) - self._result = self._result and res["passed"] - return res - - def get_module(self, name, options={}): - """ - Initialize a module to be run on a host. - - :param name: name of the module - :type name: string - - :return: The module handle. - :rtype: ModuleAPI - """ - return ModuleAPI(name, options) - - def wait(self, seconds): - """ - The controller will wait for a specific amount of seconds. - - :param seconds: how long - :type seconds: float - - :return: Command result (always passes). - :rtype: dict - """ - cmd = {"type": "ctl_wait", "seconds": int(seconds)} - return self._ctl._run_command(cmd) - - def get_alias(self, alias, default=None): - """ - Get the value of user defined alias. - - :param alias: name of user defined alias - :type alias: string - - :return: value of a user defined alias - :rtype: string - """ - try: - val = self._ctl._get_alias(alias) - if val is None: - return default - else: - return val - except XmlTemplateError: - return default - - def get_aliases(self): - """ - Get all user defined aliases. - - :return: names and values of a user defined aliases - :rtype: dict - """ - return self._ctl._get_aliases() - - def connect_PerfRepo(self, mapping_file, url=None, username=None, password=None): - if not self._perf_repo_api.connected(): - if url is None: - url = lnst_config.get_option("perfrepo", "url") - if username is None: - username = lnst_config.get_option("perfrepo", "username") - if password is None: - password = lnst_config.get_option("perfrepo", "password") - - if not url: - logging.warn("No PerfRepo URL specified in config file") - if not username: - logging.warn("No PerfRepo username specified in config file") - if not password: - logging.warn("No PerfRepo password specified in config file") - if url and username and password: - self._perf_repo_api.connect(url, username, password) - - root = Path(None, self._ctl._recipe_path).get_root() - path = Path(root, mapping_file) - self._perf_repo_api.load_mapping(path) - - if not self._perf_repo_api.connected(): - if PerfRepoRESTAPI is None: - logging.warn("Python PerfRepo library not found.") - logging.warn("Connection to PerfRepo incomplete, further "\ - "PerfRepo commands will be ignored.") - return self._perf_repo_api - - def get_configuration(self): - machines = self._ctl._machines - configuration = {} - for m_id, m in list(machines.items()): - configuration["machine_"+m_id] = m.get_configuration() - return configuration - - def get_mapping(self): - match = self._ctl.get_pool_match() - mapping = [] - for m_id, m in list(match["machines"].items()): - machine = {} - machine["id"] = m_id - machine["pool_id"] = m["target"] - machine["hostname"] = m["hostname"] - machine["interface"] = [] - for i_id, i in list(m["interfaces"].items()): - interface = {} - interface["id"] = i_id - interface["pool_id"] = i["target"] - interface["hwaddr"] = i["hwaddr"] - machine["interface"].append(interface) - mapping.append(machine) - return mapping - -class HostAPI(object): - """ An API class representing a host machine. """ - - def __init__(self, ctl, host_id): - self._ctl = ctl - self._id = host_id - self._m = None - - self._ifaces = {} - self._if_id_seq = 0 - self._bg_id_seq = 0 - - def _gen_if_id(self): - self._if_id_seq += 1 - return "if_id_%s" % self._if_id_seq - - def init_host(self, host): - self._m = host - self.init_ifaces() - - def init_ifaces(self): - for interface in self._m.get_interfaces(): - if interface.get_id() is None: - continue - self._ifaces[interface.get_id()].init_iface(interface) - - def add_interface(self, label, netns=None, params=None): - m_id = self.get_id() - if_id = self._gen_if_id() - - self._ctl.mreq[m_id]['interfaces'][if_id] = {} - self._ctl.mreq[m_id]['interfaces'][if_id]['network'] = label - self._ctl.mreq[m_id]['interfaces'][if_id]['netns'] = netns - - if params: - self._ctl.mreq[m_id]['interfaces'][if_id]['params'] = params - else: - self._ctl.mreq[m_id]['interfaces'][if_id]['params'] = {} - - self._ifaces[if_id] = InterfaceAPI(None, self) - return self._ifaces[if_id] - - def get_id(self): - return self._id - - def get_configuration(self): - return self._m.get_configuration() - - def config(self, option, value, persistent=False, netns=None): - """ - Configure an option in /sys or /proc on the host. - - :param option: A path within /sys or /proc. - :type option: string - :param value: Value to be set. - :type value: string - :param persistent: A flag. - :type persistent: bool - :param netns: LNST created namespace to configure. - :type netns: string - - :return: Command result. - :rtype: dict - """ - cmd = {"host": str(self._id), "type": "config"} - cmd["options"] = [{"name": option, "value": value}] - cmd["persistent"] = persistent - cmd["netns"] = netns - - return self._ctl._run_command(cmd) - - def run(self, what, **kwargs): - """ - Configure an option in /sys or /proc on the host. - - :param what: What should be run on the host. - :type what: str or ModuleAPI - - :param bg: Run in background flag. - :type bg: bool - :param expect: "pass" or "fail". - :type expect: string - :param timeout: A time limit in seconds. - :type timeout: int - :param tool: Run from a tool (the same as 'from' in XML). - :type tool: string - :param json: Process JSON output into dictionary. - :type json: bool - - :return: A handle for process. - :rtype: ProcessAPI - """ - cmd = {"host": str(self._id)} - bg_id = None - cmd["netns"] = None - - for arg, argval in list(kwargs.items()): - if arg == "bg" and argval == True: - self._bg_id_seq += 1 - cmd["bg_id"] = bg_id = self._bg_id_seq - elif arg == "bg" and argval == False: - continue - elif arg == "expect": - if str(argval) not in ["pass", "fail"]: - msg = "Unrecognised value of the expect attribute (%s)." \ - % argval - raise TaskError(msg) - - cmd["expect"] = argval == "pass" - elif arg == "fail_expected": - cmd["expect"] = not argval - elif arg == "timeout": - try: - cmd["timeout"] = int(argval) - except ValueError: - msg = "Timeout must be integer, not '%s'." % argval - raise TaskError(msg) - elif arg == "tool": - if type(what) == str: - cmd["from"] = str(argval) - else: - msg = "Argument 'tool' not valid when running modules." - raise TaskError(msg) - elif arg == "desc": - cmd["desc"] = argval - elif arg == "netns": - cmd["netns"] = argval - elif arg == "save_output": - pass # now ignored as output is saved always - elif arg == "json": - cmd["json"] = argval - else: - msg = "Argument '%s' not recognised by the run() method." % arg - raise TaskError(msg) - - if type(what) == ModuleAPI: - cmd["type"] = "test" - cmd["module"] = what._name - cmd["options"] = what._opts - elif type(what) == str: - cmd["type"] = "exec" - cmd["command"] = str(what) - else: - raise TaskError("Unable to run '%s'." % str(what)) - - cmd_res = self._ctl._run_command(cmd) - return ProcessAPI(self._ctl, self._id, cmd_res, bg_id, cmd["netns"]) - - def sync_resources(self, modules=[], tools=[]): - res_table = self._ctl._ctl._resource_table - sync_table = {'module': {}, 'tools': {}} - for mod in modules: - if mod in res_table['module']: - sync_table['module'][mod] = res_table['module'][mod] - else: - msg = "Module '%s' not found on the controller"\ - % mod - raise TaskError(msg) - - for tool in tools: - if tool in res_table['tools']: - sync_table['tools'][tool] = res_table['tools'][tool] - else: - msg = "Tool '%s' not found on the controller"\ - % tool - raise TaskError(msg) - - self._m.sync_resources(sync_table) - - def _add_iface(self, if_type, if_id, netns, ip, options, slaves): - interface = self._m.new_soft_interface(if_id, if_type) - if_id = interface.get_id() - iface = InterfaceAPI(interface, self) - self._ifaces[if_id] = iface - - if slaves: - for slave in slaves: - if type(slave) == type(()): - slave_iface = slave[0] - slave_options = slave[1] - for key in slave_options: - interface.set_slave_option(slave_iface.get_id(), - key, slave_options[key]) - else: - slave_iface = slave - interface.add_slave(slave_iface._if) - - if ip: - interface.add_address(ip) - - if options: - for key in options: - interface.set_option(key, options[key]) - - if netns: - interface.set_netns(netns) - - interface.configure() - interface.up() - - self._m.wait_interface_init() - - return iface - - def _remove_iface(self, iface): - interface = iface._if - interface.deconfigure() - interface.cleanup() - if_id = interface.get_id() - self._m.remove_interface(if_id) - self._ifaces.pop(if_id) - - def create_bond(self, if_id=None, netns=None, ip=None, - options=None, slaves=None): - return self._add_iface("bond", if_id, netns, ip, options, slaves) - - def create_bridge(self, if_id=None, netns=None, ip=None, - options=None, slaves=None): - return self._add_iface("bridge", if_id, netns, ip, options, slaves) - - def create_team(self, config=None, if_id=None, netns=None, ip=None, - slaves=None): - out_slaves = [] - for slave in slaves: - if type(slave) == type(()): - slave_iface = slave[0] - slave_config = slave[1] - out_slaves.append((slave_iface, - {"teamd_port_config": slave_config})) - else: - out_slaves.append(slave) - - options = {} - if config: - options["teamd_config"] = config - - return self._add_iface("team", if_id, netns, ip, options, out_slaves) - - def create_vlan(self, realdev_iface, vlan_tci, if_id=None, netns=None, ip=None): - return self._add_iface("vlan", if_id, netns, ip, {"vlan_tci": vlan_tci}, - [realdev_iface]) - - def create_vxlan(self, vxlan_id, realdev_iface=None, group_ip=None, - remote_ip=None, if_id=None, netns=None, ip=None, options={}): - if group_ip is None and remote_ip is None: - raise TaskError("Either group_ip or remote_ip must be specified.") - - options.update({"id": vxlan_id, - "group_ip": group_ip, - "remote_ip": remote_ip}) - if realdev_iface is not None: - slaves = [realdev_iface] - else: - slaves = [] - - return self._add_iface("vxlan", if_id, netns, ip, options, slaves) - -class DeviceAPI(object): - def __init__(self, net_device, host): - self._dev = net_device - self._host = host - - def get_if_index(self): - return self._dev.get_if_index() - - def get_hwaddr(self): - return self._dev.get_hwaddr() - - def get_devname(self): - return self._dev.get_name() - - def get_ips(self, selector={}): - return self._dev.get_ip_addrs(selector) - - def get_ip(self, num, selector={}): - return self._dev.get_ip_addr(num, selector) - - def get_ifi_type(self): - return self._dev.get_ifi_type() - - def get_state(self): - return self._dev.get_state() - - # def get_master(self): - # return self._dev.get_master() - - def get_slaves(self): - return self._dev.get_slaves() - - def get_netns(self): - return self._dev.get_netns() - - # def get_peer(self): - # return self._dev.get_peer() - - def get_mtu(self): - return self._dev.get_mtu() - - def set_mtu(self, mtu): - return self._dev.set_mtu(mtu) - - def get_driver(self): - return self._dev.get_driver() - - def get_devlink_name(self): - return self._dev.get_devlink_name() - - def get_devlink_port_name(self): - return self._dev.get_devlink_port_name() - -class InterfaceAPI(object): - def __init__(self, interface, host): - self._if = interface - self._host = host - - def init_iface(self, interface): - self._if = interface - - def get_id(self): - return self._if.get_id() - - def get_type(self): - return self._if.get_type() - - def get_network(self): - return self._if.get_network() - - def get_driver(self): - return VolatileValue(self._if.get_driver) - - def get_devname(self): - return VolatileValue(self._if.get_devname) - - def get_hwaddr(self): - return VolatileValue(self._if.get_hwaddr) - - def get_ip(self, ip_index=0, selector={}): - return VolatileValue(self._if.get_address, ip_index) - - def get_ips(self, selector={}): - return VolatileValue(self._if.get_addresses) - - def get_prefix(self, ip_index=0): - return VolatileValue(self._if.get_prefix, ip_index) - - def get_mtu(self): - return VolatileValue(self._if.get_mtu) - - def set_mtu(self, mtu): - return self._if.set_mtu(mtu) - - def link_stats(self): - return self._if.link_stats() - - def set_link_up(self): - return self._if.set_link_up() - - def set_link_down(self): - return self._if.set_link_down() - - def get_host(self): - return self._host - - def get_netns(self): - return self._if.get_netns() - - def reset(self, ip=None, netns=None): - self._if.down() - self._if.deconfigure() - - if ip: - self._if.add_address(ip) - - if netns: - self._if.set_netns(netns) - - self._if.configure() - self._if.up() - - def set_addresses(self, ips): - self._if.set_addresses(ips) - - def enable_multicast(self): - self._if.add_route("224.0.0.0/4") - - def disable_multicast(self): - self._if.del_route("224.0.0.0/4") - - def destroy(self): - self._host._remove_iface(self) - - def add_br_vlan(_self, vlan_tci, pvid=False, untagged=False, - self=False, master=False): - _self._if.add_br_vlan({"vlan_id": vlan_tci, "pvid": pvid, - "untagged": untagged, - "self": self, "master": master}) - - def del_br_vlan(_self, vlan_tci, pvid=False, untagged=False, - self=False, master=False): - _self._if.del_br_vlan({"vlan_id": vlan_tci, "pvid": pvid, - "untagged": untagged, - "self": self, "master": master}) - - def get_br_vlans(self): - return self._if.get_br_vlans() - - def add_br_fdb(_self, hwaddr, self=False, master=False, vlan_tci=None): - _self._if.add_br_fdb({"hwaddr": hwaddr, "self": self, "master": master, - "vlan_id": vlan_tci}) - - def del_br_fdb(_self, hwaddr, self=False, master=False, vlan_tci=None): - _self._if.del_br_fdb({"hwaddr": hwaddr, "self": self, "master": master, - "vlan_id": vlan_tci}) - - def get_br_fdbs(self): - return self._if.get_br_fdbs() - - def set_br_learning(_self, on=True, self=False, master=False): - _self._if.set_br_learning({"on": on, "self": self, "master": master}) - - def set_br_learning_sync(_self, on=True, self=False, master=False): - _self._if.set_br_learning_sync({"on": on, "self": self, - "master": master}) - - def set_br_flooding(_self, on=True, self=False, master=False): - _self._if.set_br_flooding({"on": on, "self": self, "master": master}) - - def set_br_state(_self, state, self=False, master=False): - _self._if.set_br_state({"state": state, "self": self, "master": master}) - - def set_speed(self, speed): - return self._if.set_speed(speed) - - def set_autoneg(self): - return self._if.set_autoneg() - - def slave_add(self, slave_id): - return self._if.slave_add(slave_id) - - def slave_del(self, slave_id): - return self._if.slave_del(slave_id) - - def get_devlink_name(self): - return self._if.get_devlink_name() - - def get_devlink_port_name(self): - return self._if.get_devlink_port_name() - -class ModuleAPI(object): - """ An API class representing a module. """ - - def __init__(self, module_name, options={}): - self._name = module_name - - self._opts = {} - for opt, val in list(options.items()): - self._opts[opt] = [] - if type(val) == list: - for v in val: - self._opts[opt].append({"value": str(v)}) - else: - self._opts[opt].append({"value": str(val)}) - - def get_options(self): - return self._opts - - def set_options(self, options): - self._opts = {} - for opt, val in list(options.items()): - self._opts[opt] = [] - if type(val) == list: - for v in val: - self._opts[opt].append({"value": str(v)}) - else: - self._opts[opt].append({"value": str(val)}) - - def update_options(self, options): - for opt, val in list(options.items()): - self._opts[opt] = [] - if type(val) == list: - for v in val: - self._opts[opt].append({"value": str(v)}) - else: - self._opts[opt].append({"value": str(val)}) - - def unset_option(self, option_name): - if option_name in self._opts: - del self._opts[option_name] - -class ProcessAPI(object): - """ An API class representing either a running or finished process. """ - - def __init__(self, ctl, h_id, cmd_res, bg_id, netns): - self._ctl = ctl - self._host = h_id - self._cmd_res = cmd_res - self._bg_id = bg_id - self._netns = netns - - def passed(self): - """ - Returns a boolean result of the process. - - :return: True if the command passed. - :rtype: bool - """ - return self._cmd_res["passed"] - - def get_result(self): - """ - Returns the whole comand result. - - :return: Command result data. - :rtype: dict - """ - return self._cmd_res - - def out(self): - """ - Returns the whole command result stdout. - - :return: Command result stdout. - :rtype: str - """ - return self.get_result()["res_data"]["stdout"] - - def wait(self): - """ Blocking wait until the command returns. """ - if self._bg_id: - cmd = {"host": self._host, - "type": "wait", - "proc_id": self._bg_id, - "netns": self._netns} - self._cmd_res = self._ctl._run_command(cmd) - - def intr(self): - """ Interrupt the command. """ - if self._bg_id: - cmd = {"host": self._host, - "type": "intr", - "proc_id": self._bg_id, - "netns": self._netns} - self._cmd_res = self._ctl._run_command(cmd) - - def kill(self): - """ - Kill the command. - - In this case, the command results are disposed. A killed - command will always be shown as passed. If you would like - to keep the results, use 'intr' instead. - """ - if self._bg_id: - cmd = {"host": self._host, - "type": "kill", - "proc_id": self._bg_id, - "netns": self._netns} - self._cmd_res = self._ctl._run_command(cmd) - -class VolatileValue(object): - def __init__(self, func, *args, **kwargs): - self._func = func - self._args = args - self._kwargs = kwargs - - def get_val(self): - return self._func(*self._args, **self._kwargs) - - def __str__(self): - return str(self.get_val()) -
The python recipe example, python_recipe_simple_netperf.py has been updated accordingly.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/TestRecipe.py | 38 +------------------ .../examples/python_recipe_simple_netperf.py | 19 +--------- 2 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/lnst/RecipeCommon/TestRecipe.py b/lnst/RecipeCommon/TestRecipe.py index 360cd2a..9c77f55 100755 --- a/lnst/RecipeCommon/TestRecipe.py +++ b/lnst/RecipeCommon/TestRecipe.py @@ -9,20 +9,12 @@ from lnst.Controller.Recipe import RecipeError
from lnst.Tests.Netperf import Netperf
-from lnst.RecipeCommon.PerfRepo.PerfRepo import PerfRepoAPI -from lnst.RecipeCommon.PerfRepo.PerfRepo import generate_perfrepo_comment -from lnst.RecipeCommon.PerfRepo.PerfRepoUtils import netperf_baseline_template -from lnst.RecipeCommon.PerfRepo.PerfRepoUtils import netperf_result_template - from lnst.RecipeCommon.IRQ import pin_dev_irqs
class TestRecipe(BaseRecipe): ipv = StrParam(default="both") mtu = IntParam(default=1500)
- mapping_file = StrParam() - pr_user_comment = StrParam() - nperf_cpupin = IntParam() nperf_reserve = IntParam(default=20) nperf_mode = StrParam(default="default") @@ -43,20 +35,9 @@ class TestRecipe(BaseRecipe): def __init__(self, **kwargs): super(TestRecipe, self).__init__(**kwargs)
- if "mapping_file" in self.params: - self.perf_api = PerfRepoAPI(self.params.mapping_file) - self.perf_api.connect_PerfRepo() - - def initial_setup(self): machines = []
- if "pr_user_comment" in self.params: - machines = [machines.append(m) for m in self.matched] - - self.pr_comment = generate_perfrepo_comment(machines, - self.params.pr_user_comment) - if "nperf_cpupin" in self.params: for m in self.matched: m.run("service irqbalance stop") @@ -113,18 +94,9 @@ class TestRecipe(BaseRecipe): return Netperf(**kwargs)
- def netperf_run(self, netserver, netperf, perfrepo_result=None): + def netperf_run(self, netserver, netperf): srv_proc = self.matched.m1.run(netserver, bg=True)
- if perfrepo_result: - if not hasattr(self, 'perf_api'): - raise RecipeError("no class variable called perf_api") - - - baseline = self.perf_api.get_baseline_of_result(perfrepo_result) - #TODO: - #netperf_baseline_template(netperf, baseline) - time.sleep(2)
res_data = self.matched.m2.run(netperf, @@ -133,14 +105,6 @@ class TestRecipe(BaseRecipe): self.params.nperf_reserve) * self.params.netperf_runs)
- if perfrepo_result: - netperf_result_template(perfrepo_result, res_data) - - if hasattr(self, 'pr_comment'): - perfrepo_result.set_comment(self.params.pr_comment) - - self.perf_api.save_result(perfrepo_result) - srv_proc.kill(2)
return res_data, srv_proc diff --git a/recipes/examples/python_recipe_simple_netperf.py b/recipes/examples/python_recipe_simple_netperf.py index 1f9b400..175dd39 100755 --- a/recipes/examples/python_recipe_simple_netperf.py +++ b/recipes/examples/python_recipe_simple_netperf.py @@ -18,7 +18,6 @@ class SimpleNetperfRecipe(TestRecipe): [("gro", "on"), ("gso", "on"), ("tso", "off"), ("tx", "off"), ("rx", "on")], [("gro", "on"), ("gso", "on"), ("tso", "on"), ("tx", "on"), ("rx", "off")]]
- mapping_file = StrParam(default="simple_netperf.mapping") product_name = StrParam(default="RHEL7")
m1 = HostReq() @@ -73,28 +72,12 @@ class SimpleNetperfRecipe(TestRecipe): for ipver in ipv: if self.params.ipv in [ipver, 'both']: for ttype, ttype_name in transport_type: - result = self.perf_api.new_result(ttype+"_"+ipver+"_id", - ttype+"_"+ipver+"_result", - hash_ignore=[ - 'kernel_release', - 'redhat_release']) - - for offload in setting: - result.set_parameter(offload[0], offload[1]) - - result.add_tag(self.params.product_name) - if self.params.nperf_mode == "multi": - result.add_tag("multithreaded") - result.set_parameter("num_parallel", - self.params.nperf_num_parallel) - ip_num = 0 if ipver is 'ipv4' else 1 netperf = self.generate_netperf_cli(self.matched.m1.eth0.ips[ip_num], ttype_name)
self.netperf_run(Netserver(bind=self.matched.m1.eth0.ips[ip_num]), - netperf, - result) + netperf) time.sleep(5)
The PerfRepo support has been dropped due to lack of development of the project.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/PerfRepo/PerfRepo.py | 408 ------------------ lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py | 79 ---- lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py | 72 ---- lnst/RecipeCommon/PerfRepo/__init__.py | 0 4 files changed, 559 deletions(-) delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepo.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py delete mode 100644 lnst/RecipeCommon/PerfRepo/__init__.py
diff --git a/lnst/RecipeCommon/PerfRepo/PerfRepo.py b/lnst/RecipeCommon/PerfRepo/PerfRepo.py deleted file mode 100644 index fd70c92..0000000 --- a/lnst/RecipeCommon/PerfRepo/PerfRepo.py +++ /dev/null @@ -1,408 +0,0 @@ -""" -This module defines helper functions for interacting with PerfRepo -that can be imported directly into LNST Python tasks. - -Copyright 2016 Red Hat, Inc. -Licensed under the GNU General Public License, version 2 as -published by the Free Software Foundation; see COPYING for details. -""" - -__author__ = """ -jtluka@redhat.com (Jan Tluka) -""" - -import os -import re -import logging -import hashlib - -from lnst.Common.Path import Path -from lnst.RecipeCommon.PerfRepo.PerfRepoMapping import PerfRepoMapping -from lnst.Common.Utils import dict_to_dot, list_to_dot -from lnst.Common.Utils import Noop -from lnst.Common.LnstError import LnstError - -try: - from perfrepo import PerfRepoRESTAPI - from perfrepo import PerfRepoTestExecution - from perfrepo import PerfRepoValue -except: - PerfRepoRESTAPI = None - PerfRepoTestExecution = None - PerfRepoValue = None - -class PerfRepoError(LnstError): - """Exception used by PerfRepo related stuff""" - pass - - -def generate_perfrepo_comment(hosts=[], user_comment=None): - """ Prepare the PerfRepo comment. - - By default it will include kernel versions used on the hosts and - Beaker job url. - - Keyword arguments: - hosts -- list of HostAPI objects - user_comment -- additional user specified comment - """ - - comment = "" - - for host in hosts: - host_cfg = host.get_configuration() - comment += "Kernel (%s): %s<BR>" % \ - (host_cfg['id'], host_cfg['kernel_release']) - - # if we're running in Beaker environment, include job url - if 'BEAKER' in os.environ and 'JOBID' in os.environ: - bkr_server = os.environ['BEAKER'] - bkr_jobid = os.environ['JOBID'] - bkr_job_url = bkr_server + 'jobs/' + bkr_jobid - comment += "Beaker job: %s<BR>" % bkr_job_url - - if user_comment: - comment += user_comment - - return comment - - - - - -class PerfRepoAPI(object): - def __init__(self, mapping_file_path, url=None, username=None, password=None): - self._mapping_file_path = mapping_file_path - self._url = url - self._username = username - self._password = password - - self._rest_api = None - self._mapping = None - - def connect_PerfRepo(self, max_retries=3): - if not self.connected(): - #TODO: store credentials in config or not - #if self._url is None: - # self._url = lnst_config.get_option("perfrepo", "url") - #if self._username is None: - # self._username = lnst_config.get_option("perfrepo", "username") - #if self._password is None: - # self._password = lnst_config.get_option("perfrepo", "password") - - if not self._url: - logging.warn("No PerfRepo URL specified in config file") - if not self._username: - logging.warn("No PerfRepo username specified in config file") - if not self._password: - logging.warn("No PerfRepo password specified in config file") - if self._url and self._username and self._password: - self.connect(self._url, self._username, self._password, max_retries) - - path = Path(None, self._mapping_file_path) - self.load_mapping(path) - - if not self.connected(): - if PerfRepoRESTAPI is None: - logging.warn("Python PerfRepo library not found.") - logging.warn("Connection to PerfRepo incomplete, further "\ - "PerfRepo commands will be ignored.") - - def load_mapping(self, file_path): - try: - self._mapping = PerfRepoMapping(file_path.resolve()) - except: - logging.error("Failed to load PerfRepo mapping file '%s'" %\ - file_path.abs_path()) - self._mapping = None - - def get_mapping(self): - return self._mapping - - def connected(self): - if self._rest_api is not None and self._rest_api.connected() and\ - self._mapping is not None: - return True - else: - return False - - def connect(self, url, username, password, max_retries): - if PerfRepoRESTAPI is not None: - self._rest_api = PerfRepoRESTAPI(url, username, password) - self._rest_api.set_retries(max_retries) - if not self._rest_api.connected(): - self._rest_api = None - else: - self._rest_api = None - - def new_result(self, mapping_key, name, hash_ignore=[]): - if not self.connected(): - return Noop() - - mapping_id = self._mapping.get_id(mapping_key) - if mapping_id is None: - logging.debug("Test key '%s' has no mapping defined!" % mapping_key) - return Noop() - - logging.debug("Test key '%s' mapped to id '%s'" % (mapping_key, - mapping_id)) - - try: - test = self._rest_api.test_get_by_id(mapping_id, log=False) - except Exception as e: - test = None - logging.error(str(e)) - if test is None: - try: - test = self._rest_api.test_get_by_uid(mapping_id, log=False) - except Exception as e: - test = None - logging.error(str(e)) - - if test is not None: - test_url = self._rest_api.get_obj_url(test) - logging.debug("Found Test with id='%s' and uid='%s'! %s" % \ - (test.get_id(), test.get_uid(), test_url)) - else: - logging.debug("No Test with id or uid '%s' found!" % mapping_id) - return Noop() - - logging.info("Creating a new result object for PerfRepo") - result = PerfRepoResult(test, name, hash_ignore) - return result - - def save_result(self, result): - if isinstance(result, Noop): - return - elif not self.connected(): - raise PerfRepoError("Not connected to PerfRepo.") - elif isinstance(result, PerfRepoResult): - if len(result.get_testExecution().get_values()) < 1: - logging.debug("PerfRepoResult with no result data, skipping "\ - "send to PerfRepo.") - return - h = result.generate_hash() - logging.debug("Adding hash '%s' as tag to result." % h) - result.add_tag(h) - logging.info("Sending TestExecution to PerfRepo.") - try: - self._rest_api.testExecution_create(result.get_testExecution()) - except Exception as e: - logging.error(str(e)) - return - - report_id = self._mapping.get_id(h) - if not report_id and result.get_testExecution().get_id() is not None: - logging.debug("No mapping defined for hash '%s'" % h) - logging.debug("If you want to create a new report and set "\ - "this result as the baseline run this command:") - cmd = "perfrepo-cli report create" - cmd += " name REPORTNAME" - - test = result.get_test() - cmd += " chart CHARTNAME" - cmd += " testid %s" % test.get_id() - series_num = 0 - for m in test.get_metrics(): - cmd += " series NAME%d" % series_num - cmd += " metric %s" % m.get_id() - cmd += " tags %s" % h - series_num += 1 - cmd += " baseline BASELINENAME" - cmd += " execid %s" % result.get_testExecution().get_id() - cmd += " metric %s" % test.get_metrics()[0].get_id() - logging.debug(cmd) - else: - raise PerfRepoError("Parameter result must be an instance "\ - "of PerfRepoResult") - - def get_baseline(self, report_id): - if report_id is None or not self.connected(): - return Noop() - - try: - report = self._rest_api.report_get_by_id(report_id, log=False) - except Exception as e: - report = None - logging.error(str(e)) - if report is None: - logging.debug("No report with id %s found!" % report_id) - return Noop() - logging.debug("Report found: %s" %\ - self._rest_api.get_obj_url(report)) - - baseline = report.get_baseline() - - if baseline is None: - logging.debug("No baseline set for report %s" %\ - self._rest_api.get_obj_url(report)) - return Noop() - - baseline_exec_id = baseline["execId"] - try: - baseline_testExec = self._rest_api.testExecution_get(baseline_exec_id, - log=False) - except Exception as e: - baseline_testExec = None - logging.error(str(e)) - - if baseline_testExec is not None: - logging.debug("TestExecution of baseline: %s" %\ - self._rest_api.get_obj_url(baseline_testExec)) - else: - logging.debug("Couldn't get TestExecution of baseline.") - return Noop() - return PerfRepoBaseline(baseline_testExec) - - def get_baseline_of_result(self, result): - if not isinstance(result, PerfRepoResult) or not self.connected(): - return Noop() - - res_hash = result.generate_hash() - logging.debug("Result hash is: '%s'" % res_hash) - - report_id = self._mapping.get_id(res_hash) - if report_id is not None: - logging.debug("Hash '%s' maps to report id '%s'" % (res_hash, - report_id)) - else: - logging.debug("Hash '%s' has no mapping defined!" % res_hash) - return Noop() - - baseline = self.get_baseline(report_id) - - if baseline.get_texec() is None: - logging.debug("No baseline set for results with hash %s" % res_hash) - return baseline - - def compare_to_baseline(self, result, report_id, metric_name): - if not self.connected(): - return False - baseline_testExec = self.get_baseline(report_id) - result_testExec = result.get_testExecution() - - return self.compare_testExecutions(result_testExec, - baseline_testExec, - metric_name) - - def compare_testExecutions(self, first, second, metric_name): - first_value = first.get_value(metric_name) - first_min = first.get_value(metric_name + "_min") - first_max = first.get_value(metric_name + "_max") - - second_value = second.get_value(metric_name) - second_min = second.get_value(metric_name + "_min") - second_max = second.get_value(metric_name + "_max") - - comp = second_value.get_comparator() - if comp == "HB": - if second_min.get_result() > first_max.get_result(): - return False - return True - elif comp == "LB": - if first_min.get_result() > second_max.get_result(): - return False - return True - else: - return False - -class PerfRepoResult(object): - def __init__(self, test, name, hash_ignore=[]): - self._test = test - self._testExecution = PerfRepoTestExecution() - self._testExecution.set_testId(test.get_id()) - self._testExecution.set_testUid(test.get_uid()) - self._testExecution.set_name(name) - #self.set_configuration(ctl.get_configuration()) - self._hash_ignore = hash_ignore - - def add_value(self, val_name, value): - perf_value = PerfRepoValue() - perf_value.set_metricName(val_name) - perf_value.set_result(value) - - self._testExecution.add_value(perf_value) - - def set_configuration(self, configuration=None): - #if configuration is None: - # configuration = ctl.get_configuration() - #for pair in dict_to_dot(configuration, "configuration."): - # self._testExecution.add_parameter(pair[0], pair[1]) - pass - - def set_mapping(self, mapping=None): - #if mapping is None: - # mapping = ctl.get_mapping() - #for pair in list_to_dot(mapping, "mapping.", "machine"): - # self._testExecution.add_parameter(pair[0], pair[1]) - pass - - def set_tag(self, tag): - self._testExecution.add_tag(tag) - - def add_tag(self, tag): - self.set_tag(tag) - - def set_tags(self, tags): - for tag in tags: - self.set_tag(tag) - - def add_tags(self, tags): - self.set_tags(tags) - - def set_parameter(self, name, value): - self._testExecution.add_parameter(name, value) - - def set_parameters(self, params): - for name, value in params: - self.set_parameter(name, value) - - def set_hash_ignore(self, hash_ignore): - self._hash_ignore = hash_ignore - - def set_comment(self, comment): - if comment: - self._testExecution.set_comment(comment) - - def get_hash_ignore(self): - return self._hash_ignore - - def get_testExecution(self): - return self._testExecution - - def get_test(self): - return self._test - - def generate_hash(self, ignore=[]): - ignore.extend(self._hash_ignore) - tags = self._testExecution.get_tags() - params = self._testExecution.get_parameters() - - sha1 = hashlib.sha1() - sha1.update(self._testExecution.get_testUid()) - for i in sorted(tags): - sha1.update(i) - for i in sorted(params, key=lambda x: x[0]): - skip = False - for j in ignore: - if re.search(j, i[0]): - skip = True - break - if skip: - continue - sha1.update(i[0]) - sha1.update(str(i[1])) - return sha1.hexdigest() - -class PerfRepoBaseline(object): - def __init__(self, texec): - self._texec = texec - - def get_value(self, name): - if self._texec is None: - return None - perfrepovalue = self._texec.get_value(name) - return perfrepovalue.get_result() - - def get_texec(self): - return self._texec diff --git a/lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py b/lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py deleted file mode 100644 index 3a6cee7..0000000 --- a/lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py +++ /dev/null @@ -1,79 +0,0 @@ -""" -This module defines the PerfRepoMapping class that is used as an interface to -mapping files that map recipe keys to IDs in a PerfRepo instance. - -Copyright 2015 Red Hat, Inc. -Licensed under the GNU General Public License, version 2 as -published by the Free Software Foundation; see COPYING for details. -""" - -__author__ = """ -olichtne@redhat.com (Ondrej Lichtner) -""" - -import re -import logging -import pprint -from lnst.Common.Path import Path - -class PerfRepoMapping(object): - def __init__(self, filepath): - if not isinstance(filepath, Path): - filepath = Path(None, filepath) - - self._filepath = filepath.resolve() - self._mapping = {} - self.load_mapping_file(self._filepath) - - def load_mapping_file(self, filename): - line_re = re.compile(r"^(\w+)\s*=\s*(\w+)\s*$") - res_dict = {} - - lines = [] - try: - with open(filename) as f: - lines = f.readlines() - except: - self._mapping = {} - raise - - lines = self._preprocess_lines(lines) - - for line in lines: - match = line_re.match(line) - if match is not None and len(match.groups()) == 2: - h = match.group(1) - if h in res_dict: - logging.warn("Duplicate entry found for hash: %s\n" - "\t %s = %s (previous)\n" - "\t %s (new)" % (h, h, res_dict[h], line)) - res_dict[h] = match.group(2) - else: - logging.warn("Skipping mapping line, invalid format:\n%s" %line) - self._mapping = res_dict - - def _preprocess_lines(self, lines): - comment_re = re.compile(r"^(.*?)#.*$") - result_lines = [] - - for line in lines: - line = line.strip() - match = comment_re.match(line) - if match and len(match.groups()) == 1: - line = match.group(1) - line = line.strip() - if line != "": - result_lines.append(line) - return result_lines - - def get_id(self, key): - try: - return self._mapping[key] - except (KeyError, TypeError): - return None - - def __str__(self): - if self._mapping is None: - return "" - else: - return pprint.pformat(self._mapping) diff --git a/lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py b/lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py deleted file mode 100644 index 4c545e4..0000000 --- a/lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py +++ /dev/null @@ -1,72 +0,0 @@ -""" -This module contains helper functions useful when writing recipes -that use PerfRepo. - -Copyright 2015 Red Hat, Inc. -Licensed under the GNU General Public License, version 2 as -published by the Free Software Foundation; see COPYING for details. -""" - -__author__ = """ -olichtne@redhat.com (Ondrej Lichtner) -""" - -import logging -from lnst.Common.Utils import Noop - -def netperf_baseline_template(module, baseline): - module.unset_option('threshold') - module.unset_option('threshold_deviation') - - if baseline.get_texec() is None: - return module - - try: - throughput = baseline.get_value('throughput') - deviation = baseline.get_value('throughput_deviation') - except: - logging.error("Invalid baseline TestExecution passed.") - return module - - logging.debug("Setting Netperf threshold.") - if throughput is not None and deviation is not None: - module.update_options({'threshold': '%s bits/sec' % throughput, - 'threshold_deviation': '%s bits/sec' % deviation}) - return module - -def perfrepo_baseline_to_dict(baseline): - if baseline.get_texec() is None: - return {} - - try: - throughput = baseline.get_value('throughput') - deviation = baseline.get_value('throughput_deviation') - except: - logging.error("Invalid baseline TestExecution passed.") - return {} - - if throughput is not None and deviation is not None: - return {'threshold': '%s bits/sec' % throughput, - 'threshold_deviation': '%s bits/sec' % deviation} - return {} - -def netperf_result_template(perfrepo_result, netperf_result): - if isinstance(perfrepo_result, Noop): - return perfrepo_result - - try: - result = netperf_result.get_result() - res_data = result['res_data'] - rate = res_data['rate'] - deviation = res_data['rate_deviation'] - except: - logging.error("Netperf didn't return usable result data.") - return perfrepo_result - - logging.debug("Adding Netperf results to PerfRepo object.") - perfrepo_result.add_value('throughput', rate) - perfrepo_result.add_value('throughput_min', rate - deviation) - perfrepo_result.add_value('throughput_max', rate + deviation) - perfrepo_result.add_value('throughput_deviation', deviation) - - return perfrepo_result diff --git a/lnst/RecipeCommon/PerfRepo/__init__.py b/lnst/RecipeCommon/PerfRepo/__init__.py deleted file mode 100644 index e69de29..0000000
This module heavily depends on deprecated TaskAPI.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/ModuleWrap.py | 180 -------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 lnst/RecipeCommon/ModuleWrap.py
diff --git a/lnst/RecipeCommon/ModuleWrap.py b/lnst/RecipeCommon/ModuleWrap.py deleted file mode 100644 index 1f7acc6..0000000 --- a/lnst/RecipeCommon/ModuleWrap.py +++ /dev/null @@ -1,180 +0,0 @@ -""" -This module defines helper functions for using test modules from Python Tasks - -Copyright 2016 Red Hat, Inc. -Licensed under the GNU General Public License, version 2 as -published by the Free Software Foundation; see COPYING for details. -""" - -__author__ = """ -olichtne@redhat.com (Ondrej Lichtner) -""" - -from lnst.Common.LnstError import LnstError -from lnst.Controller.Task import ctl - -def ping(src, dst, options={}, expect="pass", bg=False): - """ Perform an IcmpPing from source to destination - - Keyword arguments: - src -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - dst -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - options -- dictionary of options for the IcmpPing module, can't contain - keys 'addr' and 'iface' - """ - - options = dict(options) - if 'addr' in options or 'iface' in options: - raise LnstError("options can't contain keys 'addr' and 'iface'") - - if not isinstance(src, tuple) or len(src) < 2 or len(src) > 4: - raise LnstError('Invalid source specification') - try: - if len(src) == 2: - h1, if1 = src - options["iface"] = if1.get_devname() - elif len(src) == 3: - h1, if1, addr_index1 = src - options["iface"] = if1.get_ip(addr_index1) - elif len(src) == 4: - h1, if1, addr_index1, addr_selector1 = src - options["iface"] = if1.get_ip(addr_index1, selector=addr_selector1) - except: - raise LnstError('Invalid source specification') - - if not isinstance(dst, tuple) or len(dst) < 3 or len(dst) > 4: - raise LnstError('Invalid destination specification') - try: - if len(dst) == 3: - h2, if2, addr_index2 = dst - options["addr"] = if2.get_ip(addr_index2) - elif len(dst) == 4: - h2, if2, addr_index2, addr_selector2 = dst - options["addr"] = if2.get_ip(addr_index2, selector=addr_selector2) - except: - raise LnstError('Invalid destination specification') - - ping_mod = ctl.get_module("IcmpPing", - options = options) - - return h1.run(ping_mod, expect=expect, bg=bg) - -def ping6(src, dst, options={}, expect="pass", bg=False): - """ Perform an Icmp6Ping from source to destination - - Keyword arguments: - src -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - dst -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - options -- dictionary of options for the IcmpPing module, can't contain - keys 'addr' and 'iface' - """ - - options = dict(options) - if 'addr' in options or 'iface' in options: - raise LnstError("options can't contain keys 'addr' and 'iface'") - - if not isinstance(src, tuple) or len(src) < 2 or len(src) > 4: - raise LnstError('Invalid source specification') - try: - if len(src) == 2: - h1, if1 = src - options["iface"] = if1.get_devname() - elif len(src) == 3: - h1, if1, addr_index1 = src - options["iface"] = if1.get_ip(addr_index1) - elif len(src) == 4: - h1, if1, addr_index1, addr_selector1 = src - options["iface"] = if1.get_ip(addr_index1, selector=addr_selector1) - except: - raise LnstError('Invalid source specification') - - if not isinstance(dst, tuple) or len(dst) < 3 or len(dst) > 4: - raise LnstError('Invalid destination specification') - try: - if len(dst) == 3: - h2, if2, addr_index2 = dst - options["addr"] = if2.get_ip(addr_index2) - elif len(dst) == 4: - h2, if2, addr_index2, addr_selector2 = dst - options["addr"] = if2.get_ip(addr_index2, selector=addr_selector2) - except: - raise LnstError('Invalid destination specification') - - ping_mod = ctl.get_module("Icmp6Ping", - options = options) - - return h1.run(ping_mod, expect=expect, bg=bg) - -def netperf(src, dst, server_opts={}, client_opts={}, baseline={}, timeout=60): - """ Start a Netserver on the given machine and ip address - - Keyword arguments: - src -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - dst -- tuple of (HostAPI, InterfaceAPI/DeviceAPI, ip address index, ip addr selector) - server_opts -- dictionary of additional options for the netperf server - can't contain 'bind' or 'role' - client_opts -- dictionary of additional options for the netperf client - can't contain 'bind', 'role', 'netperf_server', 'threshold' - or 'threshold_deviation' - baseline -- optional dictionary with keys 'threshold' and 'threshold_deviation' - that specifies the baseline of the netperf test - timeout -- integer number of seconds specifing the maximum amount of time - for the test, defaults to 60 - """ - - server_opts = dict(server_opts) - if 'bind' in server_opts or 'role' in server_opts: - raise LnstError("server_opts can't contain keys 'bind' and 'role'") - - client_opts = dict(client_opts) - if 'bind' in client_opts or\ - 'role' in client_opts or\ - 'netperf_server' in client_opts: - raise LnstError("client_opts can't contain keys 'bind', 'role' "\ - "and 'netperf_server'") - - if not isinstance(src, tuple) or len(src) < 2 or len(src) > 4: - raise LnstError('Invalid source specification') - try: - if len(src) == 3: - h1, if1, addr_index1 = src - client_ip = if1.get_ip(addr_index1) - elif len(src) == 4: - h1, if1, addr_index1, addr_selector1 = src - client_ip = if1.get_ip(addr_index1, selector=addr_selector1) - except: - raise LnstError('Invalid source specification') - - if not isinstance(dst, tuple) or len(dst) < 3 or len(dst) > 4: - raise LnstError('Invalid destination specification') - try: - if len(dst) == 3: - h2, if2, addr_index2 = dst - server_ip = if2.get_ip(addr_index2) - elif len(dst) == 4: - h2, if2, addr_index2, addr_selector2 = dst - server_ip = if2.get_ip(addr_index2, addr_selector2) - except: - raise LnstError('Invalid destination specification') - - server_opts["role"] = "server" - server_opts["bind"] = server_ip - - client_opts["role"] = "client" - client_opts["bind"] = client_ip - client_opts["netperf_server"] = server_ip - - if "threshold" in baseline: - client_opts["threshold"] = baseline["threshold"] - if "threshold_deviation" in baseline: - client_opts["threshold_deviation"] = baseline["threshold_deviation"] - - netserver_mod = ctl.get_module("Netperf", options=server_opts) - netclient_mod = ctl.get_module("Netperf", options=client_opts) - - netserver = h2.run(netserver_mod, bg=True) - ctl.wait(2) - result = h1.run(netclient_mod, timeout=timeout) - - netserver.intr() - return result
On Fri, Feb 21, 2020 at 01:54:37PM +0100, Jan Tluka wrote:
This patch set removes both the PerfRepo code and deprecated TaskAPI.
We consider PerfRepo project dead, with zero development in the past year.
Jan Tluka (5): lnst/Controller/Config.py: remove PerfRepo configuration lnst/Controller: remove deprecated TaskAPI lnst/RecipeCommon/TestRecipe.py: remove references to PerfRepo code lnst/RecipeCommon: remove PerfRepo code lnst/RecipeCommon: remove ModuleWrap due to deprecated TaskAPI
install/lnst-ctl.conf.in | 5 - lnst-ctl.conf | 5 - lnst/Controller/Config.py | 20 - lnst/Controller/Task.py | 824 ------------------ lnst/RecipeCommon/ModuleWrap.py | 180 ---- lnst/RecipeCommon/PerfRepo/PerfRepo.py | 408 --------- lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py | 79 -- lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py | 72 -- lnst/RecipeCommon/PerfRepo/__init__.py | 0 lnst/RecipeCommon/TestRecipe.py | 38 +- .../examples/python_recipe_simple_netperf.py | 19 +- 11 files changed, 2 insertions(+), 1648 deletions(-) delete mode 100644 lnst/Controller/Task.py delete mode 100644 lnst/RecipeCommon/ModuleWrap.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepo.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoMapping.py delete mode 100644 lnst/RecipeCommon/PerfRepo/PerfRepoUtils.py delete mode 100644 lnst/RecipeCommon/PerfRepo/__init__.py
-- 2.21.1 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Thanks, looks good. Pushed.
-Ondrej
lnst-developers@lists.fedorahosted.org
-
Jan Tluka -
Ondrej Lichtner