LNST-developers September 2014

lnst-developers@lists.fedorahosted.org

64 participants
119 discussions

Start a nNew thread

公孙姐，你的东西
by 公孙尧远 25 Sep '14

25 Sep '14

1 0

lnst-developers: 营销时代的改变
by 伊山林 24 Sep '14

24 Sep '14

╲ruhe

1 0

梦想成真
by 向幻灵 24 Sep '14

24 Sep '14

梦想成真

1 0

令狐双飞：：销售前的准备你做好了吗？
by 令狐双飞 23 Sep '14

23 Sep '14

步步高升

1 0

[lnst] No recipe specified fix
by Jiří Pírko 23 Sep '14

23 Sep '14

commit c9832453c6069030734a8c3af01e4433b3c4fb63 Author: Jiri Prochazka <jprochaz(a)redhat.com> Date: Tue Sep 23 16:00:18 2014 +0200 No recipe specified fix Controller should no longer run "properly" with no recipe specified. Fixes https://github.com/jpirko/lnst/issues/79 Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> lnst-ctl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) --- diff --git a/lnst-ctl b/lnst-ctl index 6ff00ab..f63f610 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -232,6 +232,9 @@ def main(): retval = RETVAL_PASS res_serializer = NetTestResultSerializer() + if recipes == []: + logging.error("No recipe specified!") + usage(RETVAL_ERR) for recipe_path in recipes: if os.path.isdir(recipe_path): all_files = []

1 0

[PATCH] No recipe specified fix
by Jiri Prochazka 23 Sep '14

23 Sep '14

Controller should no longer run "properly" with no recipe specified. Fixes https://github.com/jpirko/lnst/issues/79 Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> diff --git a/lnst-ctl b/lnst-ctl index 6ff00ab..f63f610 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -232,6 +232,9 @@ def main(): retval = RETVAL_PASS res_serializer = NetTestResultSerializer() + if recipes == []: + logging.error("No recipe specified!") + usage(RETVAL_ERR) for recipe_path in recipes: if os.path.isdir(recipe_path): all_files = [] -- 1.9.3

2 1

[PATCH] No recipe specified fix
by Jiri Prochazka 23 Sep '14

23 Sep '14

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> diff --git a/lnst-ctl b/lnst-ctl index 6ff00ab..f63f610 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -232,6 +232,9 @@ def main(): retval = RETVAL_PASS res_serializer = NetTestResultSerializer() + if recipes == []: + logging.error("No recipe specified!") + usage(RETVAL_ERR) for recipe_path in recipes: if os.path.isdir(recipe_path): all_files = [] -- 1.9.3

1 0

[PATCH] This patch fixes issue 79
by Jiri Prochazka 23 Sep '14

23 Sep '14

https://github.com/jpirko/lnst/issues/79 Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> diff --git a/lnst-ctl b/lnst-ctl index 6ff00ab..f63f610 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -232,6 +232,9 @@ def main(): retval = RETVAL_PASS res_serializer = NetTestResultSerializer() + if recipes == []: + logging.error("No recipe specified!") + usage(RETVAL_ERR) for recipe_path in recipes: if os.path.isdir(recipe_path): all_files = [] -- 1.9.3

2 1

[PATCH] No recipe specified fix
by Jiri Prochazka 23 Sep '14

23 Sep '14

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> diff --git a/lnst-ctl b/lnst-ctl index 6ff00ab..939038e 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -232,6 +232,9 @@ def main(): retval = RETVAL_PASS res_serializer = NetTestResultSerializer() + if recipes == []: + logging.error("No recipe specified!") + usage(RETVAL_ERR) for recipe_path in recipes: if os.path.isdir(recipe_path): all_files = [] -- 1.9.3

2 1

[PATCH] Added lnst-pool-wizard v3.
by Jiri Prochazka 23 Sep '14

23 Sep '14

More info on: https://github.com/jpirko/lnst/wiki/Pool-Wizard Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> diff --git a/lnst-pool-wizard b/lnst-pool-wizard new file mode 100755 index 0000000..57ea491 --- /dev/null +++ b/lnst-pool-wizard @@ -0,0 +1,66 @@ +#! /usr/bin/env python +""" +Machine pool wizard + +Copyright 2014 Red Hat, Inc. +Licensed under the GNU General Public License, version 2 as +published by the Free Software Foundation; see COPYING for details. +""" + +__author__ = """ +jprochaz(a)redhat.com (Jiri Prochazka) +""" +from lnst.Controller.Wizard import Wizard +import sys +import getopt + +RETVAL_PASS = 0 +RETVAL_ERR = 1 + +def help(retval = 0): + print "Usage:\n"\ + " lnst-pool-wizard [mode] [hostname[:port]]\n"\ + "\n"\ + "Modes:\n"\ + " -h, --help display this help text and exit\n"\ + " -i, --interactive start wizard in interactive mode (this "\ + "is default mode)\n"\ + " -n, --noninteractive start wizard in noninteractive mode\n"\ + "Examples:\n"\ + " lnst-pool-wizard --interactive\n"\ + " lnst-pool-wizard --noninteractive 192.168.122.2\n"\ + " lnst-pool-wizard -n 192.168.122.2:8888 192.168.122.3:9999 192.168.122.4\n" + sys.exit(retval) + + +def main(): + try: + opts, args = getopt.getopt( + sys.argv[1:], + "hin", + ["help", "interactive", "noninteractive"] + ) + except getopt.GetoptError as err: + print str(err) + help(RETVAL_ERR) + wizard = Wizard() + for opt, arg in opts: + if opt in ("-h", "--help"): + help() + elif opt in ("-i", "--interactive"): + wizard.interactive() + sys.exit(RETVAL_PASS) + elif opt in ("-n", "--noninteractive"): + if not args: + print "No hostname entered!" + return RETVAL_ERR + wizard.noninteractive(args) + sys.exit(RETVAL_PASS) + else: + help(RET_ERR) + wizard.interactive() + sys.exit(RETVAL_PASS) + + +if __name__ == "__main__": + main() diff --git a/lnst/Controller/MessageDispatcherLite.py b/lnst/Controller/MessageDispatcherLite.py new file mode 100644 index 0000000..70a006a --- /dev/null +++ b/lnst/Controller/MessageDispatcherLite.py @@ -0,0 +1,65 @@ +""" +This module defines MessageDispatcherLite class which is derived from +lnst.NetTestController.MessageDispatcher. + +Copyright 2011 Red Hat, Inc. +Licensed under the GNU General Public License, version 2 as +published by the Free Software Foundation; see COPYING for details. +""" + +__author__ = """ +jpirko(a)redhat.com (Jiri Pirko) +""" + +from lnst.Common.ConnectionHandler import send_data, recv_data +from lnst.Common.ConnectionHandler import ConnectionHandler + +class MessageDispatcherLite(ConnectionHandler): + def __init__(self): + super(MessageDispatcherLite, self).__init__() + + def add_slave(self, machine, connection): + self.add_connection(1, connection) + + def send_message(self, machine_id, data): + soc = self.get_connection(1) + + if send_data(soc, data) == False: + msg = "Connection error from slave %s" % str(1) + raise NetTestError(msg) + + def wait_for_result(self, machine_id): + wait = True + while wait: + connected_slaves = self._connections.keys() + + messages = self.check_connections() + + remaining_slaves = self._connections.keys() + + for msg in messages: + if msg[1]["type"] == "result" and msg[0] == 1: + wait = False + result = msg[1]["result"] + else: + self._process_message(msg) + + if connected_slaves != remaining_slaves: + disconnected_slaves = set(connected_slaves) -\ + set(remaining_slaves) + msg = "Slaves " + str(list(disconnected_slaves)) + \ + " disconnected from the controller." + raise NetTestError(msg) + + return result + + def _process_message(self, message): + if message[1]["type"] == "log": + pass + else: + msg = "Unknown message type: %s" % message[1]["type"] + raise NetTestError(msg) + + def disconnect_slave(self, machine_id): + soc = self.get_connection(machine_id) + self.remove_connection(soc) diff --git a/lnst/Controller/Wizard.py b/lnst/Controller/Wizard.py new file mode 100644 index 0000000..f16c8fa --- /dev/null +++ b/lnst/Controller/Wizard.py @@ -0,0 +1,205 @@ +""" +Wizard class for creating machine pool .xml files + +Copyright 2014 Red Hat Inc. +Licensed under the GNU General Public Licence, version 2 as +published by the Free Software Foundation; see COPYING for details. +""" + +__author__ = """ +jprochaz(a)redhat.com (Jiri Prochazka) +""" +import socket +import sys +import os +from lnst.Controller.Machine import Machine +from lnst.Controller.MessageDispatcherLite import MessageDispatcherLite +from lnst.Common.NetUtils import test_tcp_connection +from lnst.Common.Utils import mkdir_p +from lnst.Common.Config import DefaultRPCPort +from xml.dom.minidom import getDOMImplementation + +class Wizard: + def __init__(self): + self._msg_dispatcher = MessageDispatcherLite() + self._pool_dir = os.path.expanduser("~/.lnst/pool") + + def interactive(self): + """ + Starts Wizard in interactive mode. Wizard requests hostname and port + from user, tests connectivity to entered host, then he tries to connect + and configure slave on host machine, and finally he requests list of + ethernet interfaces in state DOWN. Then he writes them into .xml file + named by user. User can choose which interfaces should be added to the + .xml file. + """ + while True: + pool_dir = raw_input("Enter path to pool directory "\ + "(default: ~/.lnst/pool): ") + if pool_dir != "": + self._pool_dir = os.path.expanduser(pool_dir) + print "Pool directory set to %s" % self._pool_dir + while True: + hostname = raw_input("Enter hostname: ") + try: + # Tests if hostname is translatable into IP address + socket.gethostbyname(hostname) + break + except: + sys.stderr.write("Hostname is not translatable into valid"\ + " IP address.\n") + continue + while True: + port = raw_input("Enter port(default: 9999): ") + if port == "": + port = DefaultRPCPort + try: + port = int(port) + break + except: + sys.stderr.write("Invalid port.") + continue + msg = self._get_suitable_interfaces(socket.gethostbyname(hostname),\ + port) + if msg: + self._write_to_xml(msg, hostname, port, "interactive") + next_machine = raw_input("Do you want to add another machine? "\ + "[Y/n]: ") + if next_machine.lower() == 'y' or next_machine == "": + continue + else: + break + return + + def noninteractive(self, hostlist): + """ + Starts Wizard in noninteractive mode. Wizard gets list of hosts and + ports as arguments. He tries to connect and get info about suitable + interfaces for each of the hosts. Noninteractive mode does not prompt + user about anything, it automatically adds all suitable interfaces into + .xml file named the same as the hostname of the selected machine. + """ + self._mode = "noninteractive" + + for host in hostlist: + # Checks if port was entered along with hostname + if host.find(":") != -1: + hostname = host.split(':')[0] + try: + port = int(host.split(':')[1]) + except: + port = DefaultRPCPort + else: + hostname = host + port = DefaultRPCPort + msg = self._get_suitable_interfaces(hostname, port) + if not msg: + continue + self._write_to_xml(msg, hostname, port, "noninteractive") + + def _get_suitable_interfaces(self, hostname, port): + """ + Calls all functions, which are used by both interactive and + noninteractive mode to get list of suitable interfaces. The list is + saved to variable msg. + """ + if not test_tcp_connection(hostname, port): + sys.stderr.write("Host destination '%s:%s' unreachable.\n" + % (hostname, port)) + return False + if not self._connect_and_configure_machine(hostname, port): + return False + msg = self._get_device_ifcs(hostname, port) + self._msg_dispatcher.disconnect_slave(1) + return msg + + def _get_device_ifcs(self, hostname, port): + """ + Sends RPC call request to Slave to call function get_devices, which + returns list of ethernet devices which are in state DOWN. + """ + msg = self._machine._rpc_call("get_devices") + if msg == {}: + sys.stderr.write("No suitable interfaces found on the slave "\ + "'%s:%s'.\n" % (hostname, port)) + return False + return msg + + def _connect_and_configure_machine(self, hostname, port): + """ + Connects to Slave and configures it + """ + try: + self._machine = Machine(1, hostname, None, port) + self._machine.set_rpc(self._msg_dispatcher) + self._machine.configure("MachinePoolWizard") + return True + except: + sys.stderr.write("Remote machine '%s:%s' configuration failed!\n" + % (hostname, port)) + self._msg_dispatcher.disconnect_slave(1) + return False + + def _write_to_xml(self, msg, hostname, port, mode): + """ + Used for writing desired output into .xml file. In interactive mode, + user is prompted for every interface, in noninteractive mode all + interfaces are automatically added to the .xml file. + """ + if mode == "interactive": + output_file = raw_input("Enter the name of the output .xml file "\ + "(without .xml, default is hostname.xml): ") + if mode == "noninteractive" or output_file == "": + output_file = hostname + + impl = getDOMImplementation() + doc = impl.createDocument(None, "slavemachine", None) + top_el = doc.documentElement + params_el = doc.createElement("params") + top_el.appendChild(params_el) + param_el = doc.createElement("param") + param_el.setAttribute("name", "hostname") + param_el.setAttribute("value", hostname) + params_el.appendChild(param_el) + interfaces_el = doc.createElement("interfaces") + top_el.appendChild(interfaces_el) + + devices_added = 0 + for interface in msg.itervalues(): + if mode == 'interactive': + answer = raw_input("Do you want to add interface '%s' (%s) " + "to the recipe? [Y/n]" % (interface['name'], + interface['hwaddr'])) + if mode == "noninteractive" or answer.lower() == 'y'\ + or answer == "": + devices_added += 1 + eth_el = doc.createElement("eth") + eth_el.setAttribute("id", interface['name']) + eth_el.setAttribute("label", "default_network") + interfaces_el.appendChild(eth_el) + params_el = doc.createElement("params") + eth_el.appendChild(params_el) + param_el = doc.createElement("param") + param_el.setAttribute("name", "hwaddr") + param_el.setAttribute("value", interface['hwaddr']) + params_el.appendChild(param_el) + if devices_added == 0: + sys.stderr.write("You didn't add any interface, no file '%s.xml' "\ + "will be created!\n" % output_file) + return + + mkdir_p(self._pool_dir) + + try: + f = open(self._pool_dir + "/" + output_file + ".xml", 'w') + f.write(doc.toprettyxml()) + f.close() + except: + sys.stderr.write("File '%s.xml' could not be opened "\ + "or data written." % output_file+"\n") + raise WizardException() + + print "File '%s.xml' successfuly created." % output_file + +class WizardException(Exception): + pass diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index e30b52a..fc29af0 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -238,6 +238,7 @@ class Device(object): self._conf = None self._conf_dict = None self._ip = None + self._ifi_type = None self._state = None self._master = {"primary": None, "other": []} self._slaves = [] @@ -247,6 +248,7 @@ class Device(object): def init_netlink(self, nl_msg): self._if_index = nl_msg['index'] + self._ifi_type = nl_msg['ifi_type'] self._hwaddr = normalize_hwaddr(nl_msg.get_attr("IFLA_ADDRESS")) self._name = nl_msg.get_attr("IFLA_IFNAME") self._state = nl_msg.get_attr("IFLA_OPERSTATE") diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py index 0fbbcff..ec6dddb 100644 --- a/lnst/Slave/NetTestSlave.py +++ b/lnst/Slave/NetTestSlave.py @@ -119,6 +119,15 @@ class SlaveMethods: return devices + def get_devices(self): + self._if_manager.rescan_devices() + devices = self._if_manager.get_devices() + result = {} + for device in devices: + if device._ifi_type == 1 and device._state == 'DOWN': + result[device._if_index] = {'name' : device._name, 'hwaddr' : device._hwaddr} + return result + def get_devices_by_devname(self, devname): name_scan = self._if_manager.get_devices() netdevs = [] -- 1.9.3

2 1

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers September 2014