From: Ondrej Lichtner <olichtne(a)redhat.com&gt; All devices now contain information about their driver. This value is either the driver name returned by ethtool, or 'loopback' in case of a loopback device. This also adds a dependency on ethtool. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Slave/InterfaceManager.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 8bb4553..c815d5f 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -13,6 +13,7 @@ olichtne(a)redhat.com (Ondrej Lichtner) """ import logging +import re from lnst.Slave.NetConfigDevice import NetConfigDevice from lnst.Slave.NetConfigCommon import get_option from lnst.Common.NetUtils import normalize_hwaddr @@ -271,6 +272,7 @@ class Device(object): self._netns = None self._peer = None self._mtu = None + self._driver = None self._if_manager = if_manager @@ -285,6 +287,9 @@ class Device(object): self._netns = None self._mtu = nl_msg.get_attr("IFLA_MTU") + if self._driver is None: + self._driver = self._ethtool_get_driver() + self._initialized = True def update_netlink(self, nl_msg): @@ -315,6 +320,9 @@ class Device(object): if self._conf_dict: self._conf_dict["name"] = self._name + if self._driver is None: + self._driver = self._ethtool_get_driver() + self._initialized = True #return an update message that will be sent to the controller @@ -485,3 +493,10 @@ class Device(object): def get_netns(self): return self._netns + + def _ethtool_get_driver(self): + if self._ifi_type == 772: #loopback ifi type + return 'loopback' + out, _ = exec_cmd("ethtool -i %s" % self._name, False, False, False) + match = re.search("^driver: (.*)$", out, re.MULTILINE) + return match.group(1) -- 2.1.0

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This commit changes the 'hello' Slave RPC method. Until now the method only returned the string 'hello', but from now it also returns information about the slave such as: * nm_running * kernel_release * redhat_release This could be extended with more relevant information in the future. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Controller/Machine.py | 5 ++++- lnst/Slave/NetTestSlave.py | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py index c4f5aa6..dd4c5f9 100644 --- a/lnst/Controller/Machine.py +++ b/lnst/Controller/Machine.py @@ -51,6 +51,7 @@ class Machine(object): def __init__(self, m_id, hostname=None, libvirt_domain=None, rpcport=None): self._id = m_id self._hostname = hostname + self._slave_desc = None self._connection = None self._configured = False self._system_config = {} @@ -179,12 +180,14 @@ class Machine(object): connection = socket.create_connection((hostname, port)) self._msg_dispatcher.add_slave(self, connection) - hello = self._rpc_call("hello", recipe_name) + hello, slave_desc = self._rpc_call("hello", recipe_name) if hello != "hello": msg = "Unable to establish RPC connection " \ "to machine %s, handshake failed!" % hostname raise MachineError(msg) + self._slave_desc = slave_desc + for iface in self._interfaces: iface.initialize() diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py index 04e6dec..d186757 100644 --- a/lnst/Slave/NetTestSlave.py +++ b/lnst/Slave/NetTestSlave.py @@ -83,6 +83,7 @@ class SlaveMethods: self._log_ctl.set_recipe(recipe_path, expand=date) sleep(1) + slave_desc = {} if check_process_running("NetworkManager"): logging.warning("=============================================") logging.warning("NetworkManager is running on a slave machine!") @@ -91,7 +92,16 @@ class SlaveMethods: else: logging.warning("Usage of NM is disabled!") logging.warning("=============================================") - return "hello" + slave_desc["nm_running"] = True + else: + slave_desc["nm_running"] = False + + k_release, _ = exec_cmd("uname -r", False, False, False) + r_release, _ = exec_cmd("cat /etc/redhat-release", False, False, False) + slave_desc["kernel_release"] = k_release + slave_desc["redhat_release"] = r_release + + return ("hello", slave_desc) def bye(self): self.restore_system_config() -- 2.1.0

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This commit makes the method a bit more readable and adds some new information to the result dictionary, that will be useful for exporting information into PerfRepo, this newly added information is not used on the Slave, so this change shoudln't have any impact there. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Controller/Machine.py | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py index bce9ef1..e0a3436 100644 --- a/lnst/Controller/Machine.py +++ b/lnst/Controller/Machine.py @@ -644,14 +644,24 @@ class Interface(object): self._mtu = if_data["mtu"] self._driver = if_data["driver"] - def _get_config(self): - config = {"hwaddr": self._hwaddr, "type": self._type, - "addresses": self._addresses, "slaves": self._slaves.keys(), + def get_config(self): + config = {"id": self._id, + "hwaddr": self._hwaddr, + "devname": self._devname, + "network_label": self._network, + "type": self._type, + "addresses": self._addresses, + "slaves": self._slaves.keys(), "options": self._options, "slave_options": self._slave_options, - "master": None, "other_masters": [], - "ovs_conf": self._ovs_conf, "netns": self._netns, - "peer": self._peer, "netem" : self._netem} + "master": None, + "other_masters": [], + "ovs_conf": self._ovs_conf, + "netns": self._netns, + "peer": self._peer, + "netem": self._netem, + "mtu": self._mtu, + "driver": self._driver} if self._master["primary"] != None: config["master"] = self._master["primary"].get_id() @@ -710,10 +720,10 @@ class Interface(object): if self._netns != None: self._machine._rpc_call("set_if_netns", self.get_id(), self._netns) self._machine._rpc_call_to_netns(self._netns, "configure_interface", - self.get_id(), self._get_config()) + self.get_id(), self.get_config()) else: self._machine._rpc_call("configure_interface", self.get_id(), - self._get_config()) + self.get_config()) def deconfigure(self): if not self._configured: @@ -791,10 +801,10 @@ class LoopbackInterface(Interface): if self._netns != None: self._machine._rpc_call_to_netns(self._netns, "configure_interface", - self.get_id(), self._get_config()) + self.get_id(), self.get_config()) else: self._machine._rpc_call("configure_interface", self.get_id(), - self._get_config()) + self.get_config()) self._configured = True def deconfigure(self): @@ -922,9 +932,9 @@ class SoftInterface(Interface): if self._type == "veth": peer_if = self._machine.get_interface(self._peer) - peer_config = peer_if._get_config() + peer_config = peer_if.get_config() dev_name, peer_name = self._machine._rpc_call("create_if_pair", - self._id, self._get_config(), + self._id, self.get_config(), self._peer, peer_config) self.set_devname(dev_name) peer_if.set_devname(peer_name) @@ -934,10 +944,10 @@ class SoftInterface(Interface): if self._netns != None: dev_name = self._machine._rpc_call_to_netns(self._netns, - "create_soft_interface", self._id, self._get_config()) + "create_soft_interface", self._id, self.get_config()) else: dev_name = self._machine._rpc_call("create_soft_interface", - self._id, self._get_config()) + self._id, self.get_config()) self.set_devname(dev_name) def deconfigure(self): -- 2.1.0

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This method generates a description of the slave machine that the object represents, this includes information about configured Interfaces of this machine. The commit also updates the ControllerAPI method get_configuration, that now uses the Machine get_configuration method to create a complete configuration description of the entire test environment. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Controller/Machine.py | 13 +++++++++++++ lnst/Controller/Task.py | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py index 4ce24cc..a7c5ea9 100644 --- a/lnst/Controller/Machine.py +++ b/lnst/Controller/Machine.py @@ -74,6 +74,19 @@ class Machine(object): self._namespaces = [] self._bg_cmds = {} + def get_configuration(self): + configuration = {} + configuration["id"] = self._id + configuration["hostname"] = self._hostname + configuration["kernel_release"] = self._slave_desc["kernel_release"] + configuration["redhat_release"] = self._slave_desc["redhat_release"] + + configuration["interfaces"] = {} + for i in self._interfaces: + if not isinstance(i, UnusedInterface): + configuration["interface_"+i.get_id()] = i.get_config() + return configuration + def _add_interface(self, if_id, if_type, cls): if if_id != None: for iface in self._interfaces: diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py index e8db95f..c3a430f 100644 --- a/lnst/Controller/Task.py +++ b/lnst/Controller/Task.py @@ -115,7 +115,11 @@ class ControllerAPI(object): return self._perf_repo_api def get_configuration(self): - return self._ctl._recipe["machines"] + machines = self._ctl._machines + configuration = {} + for m_id, m in machines.items(): + configuration["machine_"+m_id] = m.get_configuration() + return configuration def get_mapping(self): match = self._ctl.get_pool_match() @@ -537,7 +541,7 @@ class PerfRepoResult(object): def set_configuration(self, configuration=None): if configuration is None: configuration = ctl.get_configuration() - for pair in list_to_dot(configuration, "configuration.", "machine"): + for pair in dict_to_dot(configuration, "configuration."): self._testExecution.add_parameter(pair[0], pair[1]) def set_mapping(self, mapping=None): -- 2.1.0

Mon, May 25, 2015 at 04:32:55PM CEST, olichtne(a)redhat.com wrote: For Fedora we have /etc/fedora-release file. We should support that as well. What happens if this file does not exist?