November 2015 - Kimchi-devel - oVirt List Archives

[PATCH v2] Add checking for UI codes when running make check-local
by Ramon Medeiros 26 Nov '15

26 Nov '15

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v2: Add Copyright text Use diff to expose ui codes not used --- Makefile.am | 1 + check_ui_code_errors.sh | 31 ++++++++++++++++++++++++++ src/wok/plugins/kimchi/Makefile.am | 2 +- src/wok/plugins/kimchi/check_ui_code_errors.sh | 31 ++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/vms.py | 6 ++--- 5 files changed, 67 insertions(+), 4 deletions(-) create mode 100755 check_ui_code_errors.sh create mode 100755 src/wok/plugins/kimchi/check_ui_code_errors.sh diff --git a/Makefile.am b/Makefile.am index 027344f..106a577 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ check-local: $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . + /bin/bash check_ui_code_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh new file mode 100755 index 0000000..58e5990 --- /dev/null +++ b/check_ui_code_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)" +uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" + +# all errors on i18n are present in js/html files: success +if [ "$errors" == "$uiErrors" ]; then + echo "UI errors codes are correct" +else + echo "Error while checking UI errors codes." + diff <(echo "$errors" ) <(echo "$uiErrors") +fi diff --git a/src/wok/plugins/kimchi/Makefile.am b/src/wok/plugins/kimchi/Makefile.am index 8a55b23..250dc83 100644 --- a/src/wok/plugins/kimchi/Makefile.am +++ b/src/wok/plugins/kimchi/Makefile.am @@ -65,7 +65,7 @@ check-local: $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . - + ./check_ui_code_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/src/wok/plugins/kimchi/check_ui_code_errors.sh b/src/wok/plugins/kimchi/check_ui_code_errors.sh new file mode 100755 index 0000000..e44c688 --- /dev/null +++ b/src/wok/plugins/kimchi/check_ui_code_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'KCH[0-9A-Z]*'| sort)" +uiErrors="$(grep -Ro 'KCH[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" + +# all errors on i18n are present in js/html files: success +if [ "$errors" == "$uiErrors" ]; then + echo "UI errors codes are correct" +else + echo "Error while checking UI errors codes." + diff <(echo "$errors" ) <(echo "$uiErrors") +fi diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 7e12b91..366f1b4 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -1520,9 +1520,9 @@ class VMModel(object): def migration_pre_check(self, remote_host, user, password): self._check_if_host_not_localhost(remote_host) self._check_if_password_less_login_enabled( - remote_host, - user, - password + remote_host, + user, + password ) self._check_if_migrating_same_arch_hypervisor(remote_host, user) -- 2.1.0

2 1

[PATCH] Add OVS bridges recognition support
by Lucio Correia 26 Nov '15

26 Nov '15

In some distributions, i.e. Fedora, the directories "bridge" and "brif" are not created for OVS bridges, and they are the method Kimchi uses to detect bridges. This patch fixes that by recognizing OVS bridges through OVS commands, allowing networks to be created using OVS bridges in those distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/networks.py | 2 +- src/wok/plugins/kimchi/netinfo.py | 55 ++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..d78b88e 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -167,7 +167,7 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) self._ensure_iface_up(iface) - if netinfo.is_bridge(iface): + if netinfo.is_bridge(iface) or netinfo.is_ovs_bridge(iface): if 'vlan_id' in params: raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface diff --git a/src/wok/plugins/kimchi/netinfo.py b/src/wok/plugins/kimchi/netinfo.py index c5746d7..f210da8 100644 --- a/src/wok/plugins/kimchi/netinfo.py +++ b/src/wok/plugins/kimchi/netinfo.py @@ -21,6 +21,8 @@ import ethtool import glob import os +from distutils.spawn import find_executable +from wok.utils import run_command NET_PATH = '/sys/class/net' NIC_PATH = '/sys/class/net/*/device' @@ -79,6 +81,39 @@ def bridges(): def is_bridge(iface): return iface in bridges() +# OVS bridges need special handling because in some distributions, like Fedora, +# the files bridge and brif are not created under /sys/class/net/<ovsbridge>. +def ovs_bridges(): + ovs_cmd = find_executable("ovs-vsctl") + + # OVS not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-br']) + if rc != 0 or len(out) == 0: + return [] + + return list(set(out.split('\n')) - set([''])) + + +def is_ovs_bridge(iface): + return iface in ovs_bridges() + + +def ovs_bridge_ports(ovsbr): + ovs_cmd = find_executable("ovs-vsctl") + + # OVS not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-ports', ovsbr]) + if rc != 0 or len(out) == 0: + return [] + + return list(set(out.split('\n')) - set([''])) + def all_interfaces(): return [d.rsplit("/", 1)[-1] for d in glob.glob(NET_PATH + '/*')] @@ -91,7 +126,12 @@ def slaves(bonding): def ports(bridge): - return os.listdir(BRIDGE_PORTS % bridge) + if bridge in bridges(): + return os.listdir(BRIDGE_PORTS % bridge) + elif bridge in ovs_bridges(): + return ovs_bridge_ports(bridge) + + raise ValueError('unknown bridge %s' % bridge) def is_brport(nic): @@ -136,9 +176,11 @@ def get_vlan_device(vlan): def get_bridge_port_device(bridge): """Return the nics list that belongs to bridge.""" - # br --- v --- bond --- nic1 - if bridge not in bridges(): + + if bridge not in bridges() and bridge not in ovs_bridges(): raise ValueError('unknown bridge %s' % bridge) + + # br --- v --- bond --- nic1 nics = [] for port in ports(bridge): if port in vlans(): @@ -155,9 +197,10 @@ def get_bridge_port_device(bridge): def aggregated_bridges(): - return [bridge for bridge in bridges() if - (set(get_bridge_port_device(bridge)) & set(nics()))] + all_bridges = list(set(bridges() + ovs_bridges())) + return [bridge for bridge in all_bridges if + (set(get_bridge_port_device(bridge)) & set(nics()))] def bare_nics(): "The nic is not a port of a bridge or a slave of bond." @@ -184,7 +227,7 @@ def get_interface_type(iface): return "nic" if is_bonding(iface): return "bonding" - if is_bridge(iface): + if is_bridge(iface) or is_ovs_bridge(iface): return "bridge" if is_vlan(iface): return "vlan" -- 1.9.1

3 3

[PATCH V3] Support Linux Bridge creation
by Lucio Correia 26 Nov '15

26 Nov '15

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> This commit adds a new option to bridged network creation API: "macvtap". When it is chosen, the usual behavior for option "bridge" will be applied. This commit also changes the behavior for the already existing "bridge" option. Now, when that option is chosen, a Linux bridge will be created, not a macvtap one. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> V3: - applied code review (including API change) Test case results in ubuntu (no additional error added): MASTER: Ran 108 tests in 340.323s FAILED (failures=2, errors=2, skipped=7) This branch: Ran 110 tests in 344.527s FAILED (failures=2, errors=2, skipped=7) IMPORTANT: This patch only changes backend. UI needs to be adapted in a further patch. --- src/wok/plugins/kimchi/API.json | 2 +- src/wok/plugins/kimchi/docs/API.md | 11 +- src/wok/plugins/kimchi/i18n.py | 5 +- src/wok/plugins/kimchi/model/networks.py | 114 +++++++++++++++------ src/wok/plugins/kimchi/tests/test_mock_network.py | 16 ++- src/wok/plugins/kimchi/tests/test_model_network.py | 2 + src/wok/plugins/kimchi/tests/test_networkxml.py | 24 +++++ src/wok/plugins/kimchi/xmlutils/network.py | 25 +++++ 8 files changed, 161 insertions(+), 38 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index 961f35f..5b86ee1 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -342,7 +342,7 @@ "connection": { "description": "Specifies how this network should be connected to the other networks", "type": "string", - "pattern": "^isolated|nat|bridge$", + "pattern": "^isolated|nat|bridge|macvtap$", "required": true, "error": "KCHNET0012E" }, diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 52368b7..6cbe913 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -623,13 +623,16 @@ A interface represents available interface on host. networks visible to this host. * isolated: Create a private, isolated virtual network. * nat: Outgoing traffic will be routed through the host. - * bridge: All traffic on this network will be bridged through the indicated - interface. + * macvtap: All traffic on this network will be bridged through the + specified interface. + * bridge: All traffic on this network will be bridged through a Linux + bridged, which is created upon specified interface in case + it is not already a Linux bridge. * subnet *(optional)*: Network segment in slash-separated format with ip address and prefix or netmask used to create nat network. * interface *(optional)*: The name of a network interface on the host. - For bridge network, the interface can be a bridge or nic/bonding - device. + For "macvtap" and "bridge" connections, the + interface can be a nic, bridge or bonding device. * vlan_id *(optional)*: VLAN tagging ID for the bridge network. ### Resource: Network diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index 59b61de..8de3a19 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -242,7 +242,7 @@ messages = { "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), "KCHNET0010E": _("The interface %(iface)s already exists."), "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"), - "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), + "KCHNET0012E": _("Supported network types are isolated, NAT, macvtap and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), @@ -253,6 +253,9 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), + "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), + "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), + "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..54cb0ea 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -21,19 +21,21 @@ import ipaddr import libvirt import sys import time +from libvirt import VIR_INTERFACE_XML_INACTIVE from xml.sax.saxutils import escape from wok.config import PluginPaths from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml +from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml from wok.plugins.kimchi.xmlutils.network import to_network_xml @@ -90,7 +92,7 @@ class NetworksModel(object): self._set_network_subnet(params) # only bridge network need bridge(linux bridge) or interface(macvtap) - if connection == 'bridge': + if connection in ['bridge', 'macvtap']: self._set_network_bridge(params) params['name'] = escape(params['name']) @@ -159,6 +161,7 @@ class NetworksModel(object): def _set_network_bridge(self, params): try: + # fails if host interface is already in use by a libvirt network iface = params['interface'] if iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} @@ -166,11 +169,23 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) + # Linux bridges cannot be the trunk device of a VLAN + if 'vlan_id' in params and \ + (netinfo.is_bridge(iface) or params['connection'] == "bridge"): + raise InvalidParameter('KCHNET0019E', {'name': iface}) + + # User specified bridge interface, simply use it self._ensure_iface_up(iface) if netinfo.is_bridge(iface): - if 'vlan_id' in params: - raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface + + # User wants Linux bridge network, but didn't specify bridge interface + elif params['connection'] == "bridge": + # create Linux bridge interface first and use it as actual iface + iface = self._create_linux_bridge(iface) + params['bridge'] = iface + + # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: params['forward']['dev'] = iface @@ -190,42 +205,79 @@ class NetworksModel(object): xml = network.XMLDesc(0) net_dict = NetworkModel.get_network_from_xml(xml) forward = net_dict['forward'] - (forward['mode'] == 'bridge' and forward['interface'] and + (forward['mode'] == 'macvtap' and forward['interface'] and interfaces.append(forward['interface'][0]) is None or interfaces.extend(forward['interface'] + forward['pf'])) net_dict['bridge'] and interfaces.append(net_dict['bridge']) return interfaces + def _create_bridge(self, name, xml): + conn = self.conn.get() + + # check if name exists + if name in netinfo.all_interfaces(): + raise InvalidOperation("KCHNET0010E", {'iface': name}) + + # create bridge through libvirt + try: + bridge = conn.interfaceDefineXML(xml) + bridge.create() + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0025E", {'name': name, + 'err': e.get_error_message()}) + + def _create_linux_bridge(self, interface): + # get xml definition of interface + iface_xml = self._get_interface_desc_xml(interface) + + # Truncate the interface name if it exceeds 13 characters to make sure + # the length of bridge name is less than 15 (its maximum value). + br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] + br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) + + # drop network config from interface + self._redefine_iface_no_network(interface) + + # create and start bridge + self._create_bridge(br_name, br_xml) + + return br_name + def _create_vlan_tagged_bridge(self, interface, vlan_id): # Truncate the interface name if it exceeds 8 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-8:] + '-' + vlan_id br_xml = create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) + + self._create_bridge(br_name, br_xml) + + return br_name + + def _get_interface_desc_xml(self, name): conn = self.conn.get() - bridges = [] - for net in conn.listAllNetworks(): - # Bridged networks do not have a bridge name - # So in those cases, libvirt raises an error when trying to get - # the bridge name - try: - bridges.append(net.bridgeName()) - except libvirt.libvirtError, e: - wok_log.error(e.message) + try: + iface = conn.interfaceLookupByName(name) + xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0023E", + {'name': name, 'err': e.get_error_message()}) - if br_name in bridges: - raise InvalidOperation("KCHNET0010E", {'iface': br_name}) + return xml - with RollbackContext() as rollback: - try: - vlan_tagged_br = conn.interfaceDefineXML(br_xml, 0) - rollback.prependDefer(vlan_tagged_br.destroy) - vlan_tagged_br.create(0) - except libvirt.libvirtError as e: - raise OperationFailed(e.message) - else: - return br_name + def _redefine_iface_no_network(self, name): + conn = self.conn.get() + # drop network config from definition of interface + iface_xml = self._get_interface_desc_xml(name) + xml = get_no_network_config_xml(iface_xml.encode("utf-8")) + + try: + # redefine interface + iface = conn.interfaceDefineXML(xml.encode("utf-8")) + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0024E", {'name': name, + 'err': e.get_error_message()}) class NetworkModel(object): def __init__(self, **kargs): @@ -243,10 +295,12 @@ class NetworkModel(object): connection = forward['mode'] or "isolated" # FIXME, if we want to support other forward mode well. - if connection == 'bridge': - # macvtap bridge + # macvtap + if connection == 'macvtap': interface = interface or forward['interface'][0] - # exposing the network on linux bridge or macvtap interface + + # exposing the network on Linux bridge or macvtap interface + if connection in ['bridge', 'macvtap']: interface_subnet = knetwork.get_dev_netaddr(interface) subnet = subnet if subnet else interface_subnet @@ -333,7 +387,7 @@ class NetworkModel(object): if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) - self._remove_vlan_tagged_bridge(network) + self._remove_bridge(network) network.undefine() @staticmethod @@ -369,7 +423,7 @@ class NetworkModel(object): 'interface': forward_if, 'pf': forward_pf}} - def _remove_vlan_tagged_bridge(self, network): + def _remove_bridge(self, network): try: bridge = network.bridgeName() except libvirt.libvirtError: diff --git a/src/wok/plugins/kimchi/tests/test_mock_network.py b/src/wok/plugins/kimchi/tests/test_mock_network.py index 4e2a939..e47f8ec 100644 --- a/src/wok/plugins/kimchi/tests/test_mock_network.py +++ b/src/wok/plugins/kimchi/tests/test_mock_network.py @@ -68,6 +68,18 @@ class MockNetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] - _do_network_test(self, model, {'name': u'bridge-network', - 'connection': 'bridge', + _do_network_test(self, model, {'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface, 'vlan_id': 987}) + + def test_linux_bridge(self): + # Verify the current system has at least one interface to create a + # bridged network + interfaces = json.loads( + self.request('/plugins/kimchi/interfaces?type=nic').read() + ) + if len(interfaces) > 0: + iface = interfaces[0]['name'] + _do_network_test(self, model, {'name': u'bridged-network', + 'connection': 'bridge', + 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_model_network.py b/src/wok/plugins/kimchi/tests/test_model_network.py index e4cf5ef..aad8a95 100644 --- a/src/wok/plugins/kimchi/tests/test_model_network.py +++ b/src/wok/plugins/kimchi/tests/test_model_network.py @@ -142,6 +142,8 @@ class NetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] + networks.append({'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface}) networks.append({'name': u'bridge-network', 'connection': 'bridge', 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_networkxml.py b/src/wok/plugins/kimchi/tests/test_networkxml.py index a64b6c2..e9485a8 100644 --- a/src/wok/plugins/kimchi/tests/test_networkxml.py +++ b/src/wok/plugins/kimchi/tests/test_networkxml.py @@ -170,3 +170,27 @@ class InterfaceXmlTests(unittest.TestCase): """ actual_xml = nxml.create_vlan_tagged_bridge_xml('br10', 'em1', '10') self.assertEquals(actual_xml, utils.normalize_xml(expected_xml)) + + def test_linux_bridge_no_ip(self): + em1_xml = """ + <interface type='ethernet' name='em1'> + <start mode='onboot'/> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + expected_xml = """ + <interface type='bridge' name='br10'> + <start mode='onboot'/> + <bridge> + <interface type='ethernet' name='em1' /> + </bridge> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + actual_xml = nxml.create_linux_bridge_xml('br10', 'em1', + utils.normalize_xml(em1_xml)) + self.assertEquals(actual_xml, utils.normalize_xml(expected_xml)) diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index c73aad9..14c7e13 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -120,3 +120,28 @@ def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): type='bridge', name=bridge) return ET.tostring(m) + +def create_linux_bridge_xml(bridge, interface, iface_xml): + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + type='ethernet', + name=interface)), + type='bridge', + name=bridge) + + # use same network configuration of lower interface + iface = ET.fromstring(iface_xml) + for element in iface.iter("protocol"): + m.append(element) + + return ET.tostring(m) + +def get_no_network_config_xml(iface_xml): + # remove all protocol elements from interface xml + xml = ET.fromstring(iface_xml) + for element in xml.iter("protocol"): + element.getparent().remove(element) + + return ET.tostring(xml) -- 1.9.1

2 4

[PATCH V3] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> V2 -V3: Changed test_host.py to check memory(Aline) added description for get_total_cpus() of lscpu(Rodrigo) V1 to V2 changes: Changed cpus and memory object to be same across all platforms(aline) Changed API.md and lookup as per review comments(aline & abhiram) As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set from Chandra will include UI changes to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine(ppc o/p will be similar to x86): curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":{ "offline":0, "online":7933902848 } } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus also includes shared and dedicated cpus for s390x split memory to show online and offline additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 18 +- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 60 ++++++ src/wok/plugins/gingerbase/model/host.py | 259 ++++++++++++++++++++++---- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 307 insertions(+), 43 deletions(-) -- 2.1.0

3 4

[PATCH V2] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> V1 to V2 changes: Changed cpus and memory object to be same across all platforms(aline) Changed API.md and lookup as per review comments(aline & abhiram) As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set for UI changes will follow to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine(ppc o/p will be similar to x86): curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":{ "offline":0, "online":7933902848 } } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus also includes shared and dedicated cpus for s390x split memory to show online and offline additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 18 +- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 60 ++++++ src/wok/plugins/gingerbase/model/host.py | 259 ++++++++++++++++++++++---- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 307 insertions(+), 43 deletions(-) -- 2.1.0

5 8

Fwd: Re: [PATCH] Dbginfo report generation
by Megha Smriti 26 Nov '15

26 Nov '15

-------- Forwarded Message -------- Subject: Re: [PATCH] Dbginfo report generation Date: Wed, 25 Nov 2015 11:27:20 +0530 From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> To: Aline Manera <alinefm(a)linux.vnet.ibm.com> Hi Aline, Please find my comments inline and few suggestions. Thanks & Regards, Megha Smriti On 17/11/2015 20:05, mesmriti(a)linux.vnet.ibm.com wrote: > From: root <root(a)localhost.localdomain> > > Signed-off-by: root <root(a)localhost.localdomain> > --- > src/wok/plugins/gingerbase/i18n.py | 4 +- > src/wok/plugins/gingerbase/model/debugreports.py | 212 > ++++++++++++++++++----- > 2 files changed, 167 insertions(+), 49 deletions(-) > > diff --git a/src/wok/plugins/gingerbase/i18n.py > b/src/wok/plugins/gingerbase/i18n.py > index af75c70..6ff783b 100644 > --- a/src/wok/plugins/gingerbase/i18n.py > +++ b/src/wok/plugins/gingerbase/i18n.py > @@ -36,7 +36,9 @@ messages = { > "GGBDR0007E": _("Debug report name must be a string. Only > letters, digits, underscore ('_') and " > "hyphen ('-') are allowed."), > "GGBDR0008E": _("The debug report with specified name > \"%(name)s\" already exists. Please use another one."), > - > + "GGBDR0009E": _("Unable to create dbginfo report with > %(retcode)s. Details: %(err)s"), > + "GGBDR0010E": _("Unable to compress the final debug report tar > file with %(retcode)s. Details: %(error)s"), > + "GGBDR0011E": _("Unable to generate final debug report %(name)s. > Details: %(err)s"), > "GGBHOST0001E": _("Unable to shutdown host machine as there are > running virtual machines"), > "GGBHOST0002E": _("Unable to reboot host machine as there are > running virtual machines"), > "GGBHOST0003E": _("There may be virtual machines running on the > host"), > diff --git a/src/wok/plugins/gingerbase/model/debugreports.py > b/src/wok/plugins/gingerbase/model/debugreports.py > index 94ab7fe..927e173 100644 > --- a/src/wok/plugins/gingerbase/model/debugreports.py > +++ b/src/wok/plugins/gingerbase/model/debugreports.py > @@ -19,13 +19,14 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA > > -import fnmatch > import glob > import logging > import os > import shutil > import subprocess > import time > +import platform > +import re > > from wok.exception import InvalidParameter, NotFoundError, > OperationFailed > from wok.exception import WokException > @@ -71,54 +72,109 @@ class DebugReportsModel(object): > raise OperationFailed("GGBDR0002E") > > @staticmethod > - def sosreport_generate(cb, name): > + def debugreport_generate(cb, name): > def log_error(e): > log = logging.getLogger('Model') > log.warning('Exception in generating debug file: %s', e) I know it is already there prior to your patch, but we should use wok_log to log the errors. This special wrapper can be removed. I will incorporate this in my next patch > try: > - command = ['sosreport', '--batch', '--name=%s' % name] > - output, error, retcode = run_command(command) > - > - if retcode != 0: > - raise OperationFailed("GGBDR0003E", {'name': name, > - 'err': retcode}) > - > - # SOSREPORT might create file in /tmp or /var/tmp > - # FIXME: The right way should be passing the tar.xz file > directory > - # though the parameter '--tmp-dir', but it is failing in > Fedora 20 > - patterns = ['/tmp/sosreport-%s-*', > '/var/tmp/sosreport-%s-*'] > - reports = [] > - reportFile = None > - for p in patterns: > - reports = reports + [f for f in glob.glob(p % name)] > - for f in reports: > - if not fnmatch.fnmatch(f, '*.md5'): > - reportFile = f > - break > - # Some error in sosreport happened > - if reportFile is None: > - wok_log.error('Debug report file not found. See > sosreport ' > - 'output for detail:\n%s', output) > - fname = (patterns[0] % name).split('/')[-1] > - raise OperationFailed('GGBDR0004E', {'name': fname}) > - > - md5_report_file = reportFile + '.md5' > - report_file_extension = '.' + reportFile.split('.', 1)[1] > + # Sosreport generation > + sosreport_file = sosreport_collection(name) > + md5_report_file = sosreport_file + '.md5' > + report_file_extension = '.' + sosreport_file.split('.', > 1)[1] > + # If the platform is a system Z machine. > + if platform.machine().startswith('s390'): The debugreport_generate() function will be called only if the system has the dbginfo command So you don't need to rely in the system arch to decide on that. So the 'if' statement above can be safely removed. Will take care of this in my next patch. > + path_debugreport = '/var/tmp/' > + dbgreport_regex = '(\S+\s+)(' + path_debugreport + \ > + 'DBGINFO-[\d+]{4}-[\d+]{2}' \ > + '-[\d+]{2}-[\d+]{2}-[\d+]{2}' \ > + '-[\d+]{2}-\w+-\d+\S+)(\s+\S+)' > + command = ['/usr/sbin/dbginfo.sh', '-d', > path_debugreport] > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0009E", > + {'retcode': retcode, 'err': > error}) > + output = output.splitlines() > + dbginfo_report = None > + for line in output: > + line = line.strip() > + n = re.match(dbgreport_regex, line) > + if n: > + dbginfo_report = n.groups()[1] > + break > + final_tar_report_name = name + report_file_extension > + if dbginfo_report is not None: > + sosreport_tar = sosreport_file.split('/', 3)[3] > + dbginfo_tar = dbginfo_report.split('/', 3)[3] > + msg = 'Compressing the sosreport and debug info > files into ' \ > + 'final report file' > + wok_log.info(msg) > + # Compressing the sosreport and dbginfo reports > into one > + # tar file > + command = ['tar', '-cvzf', '%s' % > final_tar_report_name, > + '-C', path_debugreport, dbginfo_tar, > + sosreport_tar] You can use final_tar_report_name with the right debug report location to avoid need to move the file after that. Instead of the direct location compressing it would be good to do in var/tmp and then moving it to target directory rather trying to do any operation on the target directory. In some cases if developer makes a mistake it is possible that previous reports might get deleted . Please correct me if any other suggestions. > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0010E", > + {'retcode': retcode, > + 'error': error}) > + path = config.get_debugreports_path() > + dbg_target = os.path.join(path, > + name + > report_file_extension) Use the dbg_target value while running the 'tar' command above. So we don't need to move the file. Same as my comment above. > + # Moving final tar file to debugreports path > + msg = 'Moving final debug report file "%s" to > "%s"' % \ > + (final_tar_report_name, dbg_target) > + wok_log.info(msg) > + shutil.move(final_tar_report_name, dbg_target) The above block can be removed. > + # Deleting the sosreport md5 file > + delete_the_sosreport_md5_file(md5_report_file) > + # Deleting the dbingo report file > + msg = 'Deleting the dbginfo file "%s" ' \ > + % dbginfo_report > + wok_log.info(msg) > + os.remove(dbginfo_report) > + # Deleting the sosreport file > + msg = 'Deleting the sosreport file "%s" ' % > sosreport_file > + wok_log.info(msg) > + os.remove(sosreport_file) > + wok_log.info('The debug report file has been moved') > + cb('OK', True) > + return > + > + except WokException as e: > + log_error(e) > + raise > + > + except OSError as e: > + log_error(e) > + raise > + > + except Exception, e: > + # No need to call cb to update the task status here. > + # The task object will catch the exception raised here > + # and update the task status there > + log_error(e) > + raise OperationFailed("GGBDR0011E", {'name': name, 'err': > e}) > + > + @staticmethod > + def sosreport_generate(cb, name): > + def log_error(e): > + log = logging.getLogger('Model') > + log.warning('Exception in generating debug file: %s', e) The same I commented before. We can use wok_log to log the errors. I will incorporate this in my next patch > + try: > + # Sosreport collection > + sosreport_file = sosreport_collection(name) > + md5_report_file = sosreport_file + '.md5' > + report_file_extension = '.' + sosreport_file.split('.', > 1)[1] > path = config.get_debugreports_path() > - target = os.path.join(path, name + report_file_extension) > - # Moving report > - msg = 'Moving debug report file "%s" to "%s"' % (reportFile, > - target) > + sosreport_target = os.path.join(path, > + name + > report_file_extension) > + msg = 'Moving debug report file "%s" to "%s"' \ > + % (sosreport_file, sosreport_target) > wok_log.info(msg) > - shutil.move(reportFile, target) > - # Deleting md5 > - msg = 'Deleting report md5 file: "%s"' % (md5_report_file) > - wok_log.info(msg) > - with open(md5_report_file) as f: > - md5 = f.read().strip() > - wok_log.info('Md5 file content: "%s"', md5) > - os.remove(md5_report_file) > + shutil.move(sosreport_file, sosreport_target) As we are using --tmp-dir option, we know exactly where the sosreport will be saved. So we don't need to move the file around. When the sosreport is generated md5 file is generated along with the sosreport. That is why we generate the sosreport in a var/tmp dir and remove the md5 file and then move the final file to the target location to avoid doing all the operations on the target directory. > + delete_the_sosreport_md5_file(md5_report_file) > cb('OK', True) > return > > @@ -142,17 +198,27 @@ class DebugReportsModel(object): > # Please add new possible debug report command here > # and implement the report generating function > # based on the new report command > - report_tools = ({'cmd': 'sosreport --help', > + report_tools = ({'cmd': '/usr/sbin/dbginfo.sh --help', > + 'fn': DebugReportsModel.debugreport_generate}, > + {'cmd': 'sosreport --help', > 'fn': DebugReportsModel.sosreport_generate},) > > # check if the command can be found by shell one by one > for helper_tool in report_tools: > try: > - retcode = subprocess.call(helper_tool['cmd'], > shell=True, > - stdout=subprocess.PIPE, > - stderr=subprocess.PIPE) > - if retcode == 0: > - return helper_tool['fn'] > + if 'cmd' == '/usr/sbin/dbginfo.sh --help': > + retcode = subprocess.call(helper_tool['cmd'], > shell=True, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > + if retcode == 0: > + return helper_tool['fn'] You don't need to a special condition to cover the dbginfo command. The former code already does that. I ll make the changes. > + else: > + > + retcode = subprocess.call(helper_tool['cmd'], > shell=True, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > + if retcode == 0: > + return helper_tool['fn'] > except Exception, e: > wok_log.info('Exception running command: %s', e) > > @@ -213,3 +279,53 @@ class DebugReportContentModel(object): > > def lookup(self, name): > return self._debugreport.lookup(name) > + > + > +def delete_the_sosreport_md5_file(md5_file): > + """ > + Deleting md5 file and displaying the contents of the same. > + """ > + msg = 'Deleting report md5 file: "%s"' % md5_file > + wok_log.info(msg) > + with open(md5_file) as f: > + md5 = f.read().strip() > + wok_log.info('Md5 file content: "%s"', md5) > + os.remove(md5_file) > + > + > +def sosreport_collection(name): > + """ > + Code for the collection of sosreport n the path > + /var/tmp as specified in the command. > + """ > + path_sosreport = '/var/tmp/' > + command = ['sosreport', '--batch', '--name=%s' % name, > + '--tmp-dir=%s' % path_sosreport] > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0003E", {'name': name, > + 'err': retcode}) > + > + # SOSREPORT might create file in /tmp or /var/tmp > + # FIXME: The right way should be passing the tar.xz file directory > + # though the parameter '--tmp-dir', but it is failing in Fedora 20 You can remove this comment. > + sosreport_name = name.replace('_', '') The same I commented before. We should not change the user input without informing user about it. So it is better to block underscore in the debug report name. Please, update API.json accordingly. I ll make the required changes. > + sosreport_name_regex = '(\s+)(' + path_sosreport + \ > + ')(sosreport-' +\ > + sosreport_name + '-\d+.tar.xz)' > + sosreport_file = None > + output = output.splitlines() > + for line in output: > + if line: > + matched_name = re.match(sosreport_name_regex, line) > + if matched_name: > + path = matched_name.groups()[1] > + fname = matched_name.groups()[2] > + sosreport_file = path + fname While using --tmp-dir you know exactly where the sosreport file will be: <tmp-dir>-sosreport-<name>.tar.gz So you can need to parse the command output. I will take care of this in the next patch. > + break > + # Some error in sosreport happened > + if sosreport_file is None: > + wok_log.error('Debug report file not found. See sosreport ' > + 'output for detail:\n%s', output) > + raise OperationFailed('GGBDR0004E', {'name': name}) > + return sosreport_file

3 4

[PATCH] Fix ISO error messages
by Ramon Medeiros 25 Nov '15

25 Nov '15

Make distinct "no ISO found" and "invalid iso format". Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index 283d94d..0c35611 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -130,11 +130,15 @@ class VMTemplate(object): iso_prefixes = ['/', 'http', 'https', 'ftp', 'ftps', 'tftp'] if len(filter(iso.startswith, iso_prefixes)) == 0: raise InvalidParameter("KCHTMPL0006E", {'param': iso}) + else: + if not os.path.exists(iso): + raise InvalidParameter("KCHISO0001E", {'filename': iso}) + try: iso_img = IsoImage(iso) return iso_img.probe() except IsoFormatError: - raise InvalidParameter("KCHISO0001E", {'filename': iso}) + raise InvalidParameter("KCHISO0007E", {'filename': iso}) def _get_cdrom_xml(self, libvirt_stream_protocols): if 'cdrom' not in self.info: -- 2.1.0

1 1

[RFC] Usage of jquery boot grid implementation (http://www.jquery-bootgrid.com/) for plugins ginger, gingers390x new ui developments
by Chandra Shekhar Reddy Potula 25 Nov '15

25 Nov '15

Hi All, I would like propose the use of jquery boot grid implementation (http://www.jquery-bootgrid.com/) for displaying the data tables which support features like individual, multiple row selects, column sorting, Search based on filters, for plugins ginger, gingers390x new ui developments. Nice thing about the code is, it is seamlessly fitting in to the current UI designs we already implemented in other areas. Official Github location of jquery bootgrid implementation is @ https://github.com/rstaib/jquery-bootgrid. jquery bootgrid code is of license type MIT so I guess it can be used safely. Please feel free to comment on this topic and have your opinion. Thanks in advance, Regards Chandra

2 1

[PATCH 0/3] Fix UI code errors and messages
by Ramon Medeiros 25 Nov '15

25 Nov '15

Ramon Medeiros (3): Remove unused messages in Kimchi UI Fix WOK UI error messages Add checking for UI codes when running make check-local Makefile.am | 1 + check_ui_code_errors.sh | 11 ++ src/wok/plugins/kimchi/Makefile.am | 2 +- src/wok/plugins/kimchi/check_ui_code_errors.sh | 11 ++ src/wok/plugins/kimchi/model/vms.py | 6 +- src/wok/plugins/kimchi/ui/pages/i18n.json.tmpl | 81 ------------ ui/js/src/wok.confirm.js | 4 +- ui/js/src/wok.grid.js | 10 +- ui/js/src/wok.line-chart.js | 2 +- ui/js/src/wok.list.js | 10 +- ui/js/src/wok.main.js | 2 +- ui/js/widgets/filter-select.js | 4 +- ui/pages/i18n.json.tmpl | 168 ++----------------------- 13 files changed, 52 insertions(+), 260 deletions(-) create mode 100755 check_ui_code_errors.sh create mode 100755 src/wok/plugins/kimchi/check_ui_code_errors.sh -- 2.1.0

3 7

[PATCH 0/2] Add support to update guest maxMemory {backend}
by Rodrigo Trujillo 25 Nov '15

25 Nov '15

V1: In order to test, you can run something like this command: curl -k -u <U>:<PW> -H "Content-Type: application/json" -H "Accept: application/json" "<HOST>/plugins/kimchi/vms/<VM>" -X PUT -d '{"maxmemory": 3072}' Rodrigo Trujillo (2): Implement support to change guest maxMemory tag Add and fixes tests for maxMemory tag src/wok/plugins/kimchi/API.json | 6 ++ src/wok/plugins/kimchi/i18n.py | 6 +- src/wok/plugins/kimchi/model/vms.py | 119 +++++++++++++++++------------- src/wok/plugins/kimchi/tests/test_rest.py | 23 ++++++ 4 files changed, 101 insertions(+), 53 deletions(-) -- 2.1.0

2 3

[PATCH] [new-ui] Edit Guests
by sguimaraes943＠gmail.com 25 Nov '15

25 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> New-UI added to Edit Guest modal window. This patch includes guest IP address from previous patches (added enough space for IPV6 addresses). Includes some minor fixes such as: *Added doctype to wok-ui.html.tmpl *Fixed Edit Templates modal window in Firefox *Some minor fixes to wok.message instances showing behind modal windows samhenri (1): [new-ui] Edit Guests modal window .../kimchi/ui/css/theme-default/guest-edit.css | 420 ---------------- .../ui/css/theme-default/guest-storage-add.css | 81 --- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 6 +- .../kimchi/ui/js/src/kimchi.guest_edit_main.js | 550 +++++++++++---------- .../ui/js/src/kimchi.guest_storage_add.main.js | 39 +- .../plugins/kimchi/ui/pages/guest-edit.html.tmpl | 257 +++++----- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 99 ++-- ui/css/src/modules/_edit-guests.scss | 362 ++++++++++++++ ui/css/src/modules/_modal-flat.scss | 19 +- ui/css/src/modules/_templates.scss | 16 +- ui/css/src/wok.scss | 2 + ui/pages/wok-ui.html.tmpl | 1 + 12 files changed, 873 insertions(+), 979 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-edit.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-storage-add.css create mode 100644 ui/css/src/modules/_edit-guests.scss -- 1.9.3

2 3

[PATCH] [new-ui] Edit Guests v2
by sguimaraes943＠gmail.com 25 Nov '15

25 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> New-UI added to Edit Guest modal window. This patch includes guest IP address from previous patches (added enough space for IPV6 addresses). Includes some minor fixes such as: *Added doctype to wok-ui.html.tmpl *Fixed Edit Templates modal window in Firefox *Some minor fixes to wok.message instances showing behind modal windows V2 *Fixed new navigation bar to work with HTML5 strict mode. (markup was camelcase, CSS in lowercase) *Other minor CSS issues with Storages and Network samhenri (1): [new-ui] Edit Guests modal window .../kimchi/ui/css/theme-default/guest-edit.css | 420 ---------------- .../ui/css/theme-default/guest-storage-add.css | 81 --- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 6 +- .../kimchi/ui/js/src/kimchi.guest_edit_main.js | 550 +++++++++++---------- .../ui/js/src/kimchi.guest_storage_add.main.js | 39 +- .../plugins/kimchi/ui/pages/guest-edit.html.tmpl | 257 +++++----- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 99 ++-- ui/css/src/modules/_edit-guests.scss | 362 ++++++++++++++ ui/css/src/modules/_modal-flat.scss | 19 +- ui/css/src/modules/_network.scss | 1 - ui/css/src/modules/_storage.scss | 2 - ui/css/src/modules/_templates.scss | 16 +- ui/css/src/modules/_toolbar.scss | 46 +- ui/css/src/wok.scss | 2 + ui/js/src/wok.main.js | 13 +- ui/pages/wok-ui.html.tmpl | 1 + 16 files changed, 897 insertions(+), 1017 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-edit.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-storage-add.css create mode 100644 ui/css/src/modules/_edit-guests.scss -- 1.9.3

2 2

[RFC] Add disk type checking while creating template
by Ramon Medeiros 25 Nov '15

25 Nov '15

At template creation, add a checking to verify if the ISO or the disk match the correct format, to avoid mistake like creating a disk template with ISO. Doubts: Which disk types we are going to support? (raw, qcow2)? There is only one type of ISO supported? (ISO 9600) ? Thanks -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH V3] Add OVS bridges recognition support
by Lucio Correia 25 Nov '15

25 Nov '15

Allow bridged networks to be created from OVS bridges, and adapt VM XML to work with OVS networks. In some distributions, i.e. Fedora, the directories "bridge" and "brif" are not created for OVS bridges, and they are the method Kimchi uses to detect bridges. This patch also fixes that by recognizing OVS bridges through OVS commands, allowing networks to be created using OVS bridges in those distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> This patch depends on [PATCH V4] Support Linux Bridge creation. Changes in V3: - Added error KCHNET0026E --- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/networks.py | 8 +++++ src/wok/plugins/kimchi/netinfo.py | 53 ++++++++++++++++++++++++++++-- src/wok/plugins/kimchi/xmlutils/network.py | 5 +++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index a72f1ee..de7962a 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -270,6 +270,7 @@ messages = { "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), + "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 89c8c3a..3e75d7f 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -178,9 +178,17 @@ class NetworksModel(object): # User specified bridge interface, simply use it self._ensure_iface_up(iface) + params['ovs'] = False if netinfo.is_bridge(iface): params['bridge'] = iface + if netinfo.is_ovs_bridge(iface): + params['ovs'] = True + + # OVS bridges don't work with macvtap + if params['connection'] != "bridge": + raise InvalidParameter('KCHNET0026E') + # User wants Linux bridge network, but didn't specify bridge interface elif params['connection'] == "bridge": # create Linux bridge interface first and use it as actual iface diff --git a/src/wok/plugins/kimchi/netinfo.py b/src/wok/plugins/kimchi/netinfo.py index c5746d7..ff91489 100644 --- a/src/wok/plugins/kimchi/netinfo.py +++ b/src/wok/plugins/kimchi/netinfo.py @@ -21,6 +21,9 @@ import ethtool import glob import os +from distutils.spawn import find_executable +from wok.utils import run_command +from wok.utils import wok_log NET_PATH = '/sys/class/net' NIC_PATH = '/sys/class/net/*/device' @@ -73,13 +76,51 @@ def is_vlan(iface): def bridges(): - return [b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + return list(set([b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + + ovs_bridges())) def is_bridge(iface): return iface in bridges() +# In some distributions, like Fedora, the files bridge and brif are not created +# under /sys/class/net/<ovsbridge> for OVS bridges. These specific functions +# allows one to differentiate OVS bridges from other types of bridges. +def ovs_bridges(): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-br']) + if rc != 0: + wok_log.info("Error listing OVS bridges") + return [] + + return list(set(out.split('\n')) - set([''])) + + +def is_ovs_bridge(iface): + return iface in ovs_bridges() + + +def ovs_bridge_ports(ovsbr): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-ports', ovsbr]) + if rc != 0: + wok_log.info("Error listing OVS bridge ports for %s" % str(ovsbr)) + return [] + + return list(set(out.split('\n')) - set([''])) + + def all_interfaces(): return [d.rsplit("/", 1)[-1] for d in glob.glob(NET_PATH + '/*')] @@ -91,11 +132,19 @@ def slaves(bonding): def ports(bridge): + if bridge in ovs_bridges(): + return ovs_bridge_ports(bridge) + return os.listdir(BRIDGE_PORTS % bridge) def is_brport(nic): - return os.path.exists(NET_BRPORT % nic) + ovs_brports = [] + + for ovsbr in ovs_bridges(): + ovs_brports += ovs_bridge_ports(ovsbr) + + return os.path.exists(NET_BRPORT % nic) or nic in ovs_brports def is_bondlave(nic): diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index 14c7e13..f9594e6 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -95,6 +95,11 @@ def to_network_xml(**kwargs): if bridge: network.append(E.bridge(name=bridge)) + # Add virtualport element for openvswitch bridges + ovs = kwargs.get('ovs') + if ovs: + network.append(E.virtualport(type='openvswitch')) + # None means is Isolated network, {} means default mode nat params = kwargs.get('forward', {"mode": None}) forward = _get_forward_elem(**params) -- 1.9.1

2 1

[PATCH] Add support for serial console
by Ramon Medeiros 25 Nov '15

25 Nov '15

Automatically create serial console device. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 7 +++++- src/wok/plugins/kimchi/xmlutils/serial.py | 40 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/kimchi/xmlutils/serial.py diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index 283d94d..d8f2f7f 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -37,7 +37,7 @@ from wok.plugins.kimchi.xmlutils.disk import get_disk_xml from wok.plugins.kimchi.xmlutils.graphics import get_graphics_xml from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.qemucmdline import get_qemucmdline_xml - +from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): def __init__(self, args, scan=False): @@ -312,6 +312,10 @@ class VMTemplate(object): params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) + params['serial'] = '' + if params['arch'] not in ['ppc', 'ppc64']: + params['serial'] = get_serial_xml() + graphics = dict(self.info['graphics']) graphics.update(kwargs.get('graphics', {})) params['graphics'] = get_graphics_xml(graphics) @@ -365,6 +369,7 @@ class VMTemplate(object): %(networks)s %(graphics)s %(input_output)s + %(serial)s <memballoon model='virtio' /> </devices> </domain> diff --git a/src/wok/plugins/kimchi/xmlutils/serial.py b/src/wok/plugins/kimchi/xmlutils/serial.py new file mode 100644 index 0000000..2892c45 --- /dev/null +++ b/src/wok/plugins/kimchi/xmlutils/serial.py @@ -0,0 +1,40 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import lxml.etree as ET +from lxml.builder import E + +def get_serial_xml(): + """ + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + """ + serial = E.serial(type="pty") + serial.append(E.target(port='0')) + console = E.console(type="pty") + console.append(E.target(type="serial", port='0')) + return ET.tostring(serial, encoding='utf-8', pretty_print=True) + \ + ET.tostring(console, encoding='utf-8', pretty_print=True) + + + -- 2.1.0

3 4

[PATCH V4] Support Linux Bridge creation
by Lucio Correia 25 Nov '15

25 Nov '15

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> This commit adds a new option to bridged network creation API: "macvtap". When it is chosen, the usual behavior for option "bridge" will be applied. This commit also changes the behavior for the already existing "bridge" option. Now, when that option is chosen, a Linux bridge will be created, not a macvtap one. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>i Changes in V4: - Fixed tests - Fixed macvtap use case --- src/wok/plugins/kimchi/API.json | 2 +- src/wok/plugins/kimchi/docs/API.md | 11 ++- src/wok/plugins/kimchi/i18n.py | 5 +- src/wok/plugins/kimchi/model/networks.py | 108 +++++++++++++++------ src/wok/plugins/kimchi/tests/test_mock_network.py | 4 +- src/wok/plugins/kimchi/tests/test_model_network.py | 5 + src/wok/plugins/kimchi/tests/test_networkxml.py | 24 +++++ src/wok/plugins/kimchi/xmlutils/network.py | 25 +++++ 8 files changed, 149 insertions(+), 35 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index ab9ac9b..7addfc7 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -353,7 +353,7 @@ "connection": { "description": "Specifies how this network should be connected to the other networks", "type": "string", - "pattern": "^isolated|nat|bridge$", + "pattern": "^isolated|nat|bridge|macvtap$", "required": true, "error": "KCHNET0012E" }, diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 5787755..e1c9396 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -627,13 +627,16 @@ A interface represents available interface on host. networks visible to this host. * isolated: Create a private, isolated virtual network. * nat: Outgoing traffic will be routed through the host. - * bridge: All traffic on this network will be bridged through the indicated - interface. + * macvtap: All traffic on this network will be bridged through the + specified interface. + * bridge: All traffic on this network will be bridged through a Linux + bridged, which is created upon specified interface in case + it is not already a Linux bridge. * subnet *(optional)*: Network segment in slash-separated format with ip address and prefix or netmask used to create nat network. * interface *(optional)*: The name of a network interface on the host. - For bridge network, the interface can be a bridge or nic/bonding - device. + For "macvtap" and "bridge" connections, the + interface can be a nic, bridge or bonding device. * vlan_id *(optional)*: VLAN tagging ID for the bridge network. ### Resource: Network diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index aede103..a72f1ee 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -256,7 +256,7 @@ messages = { "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), "KCHNET0010E": _("The interface %(iface)s already exists."), "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"), - "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), + "KCHNET0012E": _("Supported network types are isolated, NAT, macvtap and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), @@ -267,6 +267,9 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), + "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), + "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), + "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..89c8c3a 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -21,19 +21,21 @@ import ipaddr import libvirt import sys import time +from libvirt import VIR_INTERFACE_XML_INACTIVE from xml.sax.saxutils import escape from wok.config import PluginPaths from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml +from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml from wok.plugins.kimchi.xmlutils.network import to_network_xml @@ -82,7 +84,9 @@ class NetworksModel(object): connection = params["connection"] # set forward mode, isolated do not need forward - if connection != 'isolated': + if connection == 'macvtap': + params['forward'] = {'mode': 'bridge'} + elif connection != 'isolated': params['forward'] = {'mode': connection} # set subnet, bridge network do not need subnet @@ -90,7 +94,7 @@ class NetworksModel(object): self._set_network_subnet(params) # only bridge network need bridge(linux bridge) or interface(macvtap) - if connection == 'bridge': + if connection in ['bridge', 'macvtap']: self._set_network_bridge(params) params['name'] = escape(params['name']) @@ -159,6 +163,7 @@ class NetworksModel(object): def _set_network_bridge(self, params): try: + # fails if host interface is already in use by a libvirt network iface = params['interface'] if iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} @@ -166,11 +171,23 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) + # Linux bridges cannot be the trunk device of a VLAN + if 'vlan_id' in params and \ + (netinfo.is_bridge(iface) or params['connection'] == "bridge"): + raise InvalidParameter('KCHNET0019E', {'name': iface}) + + # User specified bridge interface, simply use it self._ensure_iface_up(iface) if netinfo.is_bridge(iface): - if 'vlan_id' in params: - raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface + + # User wants Linux bridge network, but didn't specify bridge interface + elif params['connection'] == "bridge": + # create Linux bridge interface first and use it as actual iface + iface = self._create_linux_bridge(iface) + params['bridge'] = iface + + # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: params['forward']['dev'] = iface @@ -196,36 +213,73 @@ class NetworksModel(object): net_dict['bridge'] and interfaces.append(net_dict['bridge']) return interfaces + def _create_bridge(self, name, xml): + conn = self.conn.get() + + # check if name exists + if name in netinfo.all_interfaces(): + raise InvalidOperation("KCHNET0010E", {'iface': name}) + + # create bridge through libvirt + try: + bridge = conn.interfaceDefineXML(xml) + bridge.create() + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0025E", {'name': name, + 'err': e.get_error_message()}) + + def _create_linux_bridge(self, interface): + # get xml definition of interface + iface_xml = self._get_interface_desc_xml(interface) + + # Truncate the interface name if it exceeds 13 characters to make sure + # the length of bridge name is less than 15 (its maximum value). + br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] + br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) + + # drop network config from interface + self._redefine_iface_no_network(interface) + + # create and start bridge + self._create_bridge(br_name, br_xml) + + return br_name + def _create_vlan_tagged_bridge(self, interface, vlan_id): # Truncate the interface name if it exceeds 8 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-8:] + '-' + vlan_id br_xml = create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) + + self._create_bridge(br_name, br_xml) + + return br_name + + def _get_interface_desc_xml(self, name): conn = self.conn.get() - bridges = [] - for net in conn.listAllNetworks(): - # Bridged networks do not have a bridge name - # So in those cases, libvirt raises an error when trying to get - # the bridge name - try: - bridges.append(net.bridgeName()) - except libvirt.libvirtError, e: - wok_log.error(e.message) + try: + iface = conn.interfaceLookupByName(name) + xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0023E", + {'name': name, 'err': e.get_error_message()}) - if br_name in bridges: - raise InvalidOperation("KCHNET0010E", {'iface': br_name}) + return xml - with RollbackContext() as rollback: - try: - vlan_tagged_br = conn.interfaceDefineXML(br_xml, 0) - rollback.prependDefer(vlan_tagged_br.destroy) - vlan_tagged_br.create(0) - except libvirt.libvirtError as e: - raise OperationFailed(e.message) - else: - return br_name + def _redefine_iface_no_network(self, name): + conn = self.conn.get() + # drop network config from definition of interface + iface_xml = self._get_interface_desc_xml(name) + xml = get_no_network_config_xml(iface_xml.encode("utf-8")) + + try: + # redefine interface + iface = conn.interfaceDefineXML(xml.encode("utf-8")) + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0024E", {'name': name, + 'err': e.get_error_message()}) class NetworkModel(object): def __init__(self, **kargs): @@ -333,7 +387,7 @@ class NetworkModel(object): if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) - self._remove_vlan_tagged_bridge(network) + self._remove_bridge(network) network.undefine() @staticmethod @@ -369,7 +423,7 @@ class NetworkModel(object): 'interface': forward_if, 'pf': forward_pf}} - def _remove_vlan_tagged_bridge(self, network): + def _remove_bridge(self, network): try: bridge = network.bridgeName() except libvirt.libvirtError: diff --git a/src/wok/plugins/kimchi/tests/test_mock_network.py b/src/wok/plugins/kimchi/tests/test_mock_network.py index 8368ced..4b0a284 100644 --- a/src/wok/plugins/kimchi/tests/test_mock_network.py +++ b/src/wok/plugins/kimchi/tests/test_mock_network.py @@ -69,6 +69,6 @@ class MockNetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] - _do_network_test(self, model, {'name': u'bridge-network', - 'connection': 'bridge', + _do_network_test(self, model, {'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface, 'vlan_id': 987}) diff --git a/src/wok/plugins/kimchi/tests/test_model_network.py b/src/wok/plugins/kimchi/tests/test_model_network.py index 6be2d39..776e69e 100644 --- a/src/wok/plugins/kimchi/tests/test_model_network.py +++ b/src/wok/plugins/kimchi/tests/test_model_network.py @@ -142,6 +142,11 @@ class NetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] + networks.append({'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface}) + + if len(interfaces) > 1: + iface = interfaces[1]['name'] networks.append({'name': u'bridge-network', 'connection': 'bridge', 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_networkxml.py b/src/wok/plugins/kimchi/tests/test_networkxml.py index 69965e6..d4e2c3f 100644 --- a/src/wok/plugins/kimchi/tests/test_networkxml.py +++ b/src/wok/plugins/kimchi/tests/test_networkxml.py @@ -171,3 +171,27 @@ class InterfaceXmlTests(unittest.TestCase): """ actual_xml = nxml.create_vlan_tagged_bridge_xml('br10', 'em1', '10') self.assertEquals(actual_xml, normalize_xml(expected_xml)) + + def test_linux_bridge_no_ip(self): + em1_xml = """ + <interface type='ethernet' name='em1'> + <start mode='onboot'/> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + expected_xml = """ + <interface type='bridge' name='br10'> + <start mode='onboot'/> + <bridge> + <interface type='ethernet' name='em1' /> + </bridge> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + actual_xml = nxml.create_linux_bridge_xml('br10', 'em1', + normalize_xml(em1_xml)) + self.assertEquals(actual_xml, normalize_xml(expected_xml)) diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index c73aad9..14c7e13 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -120,3 +120,28 @@ def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): type='bridge', name=bridge) return ET.tostring(m) + +def create_linux_bridge_xml(bridge, interface, iface_xml): + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + type='ethernet', + name=interface)), + type='bridge', + name=bridge) + + # use same network configuration of lower interface + iface = ET.fromstring(iface_xml) + for element in iface.iter("protocol"): + m.append(element) + + return ET.tostring(m) + +def get_no_network_config_xml(iface_xml): + # remove all protocol elements from interface xml + xml = ET.fromstring(iface_xml) + for element in xml.iter("protocol"): + element.getparent().remove(element) + + return ET.tostring(xml) -- 1.9.1

2 1

[PATCH] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 25 Nov '15

25 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set for UI changes will follow to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine: curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":7933902848 } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } 3) For Power(Expected Output): { "os_distro":<os distro>, "cpus":<cpu count>, "cpu_model":<cpu model>, "os_version":<os version>, "host":<host name>, "os_codename":<os codename>, "architecture":"ppc", "memory":<memory> } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus(for x86 and s390x) split memory to show online and offline memory(for s390x) additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 22 ++- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 59 ++++++ src/wok/plugins/gingerbase/model/host.py | 256 +++++++++++++++++++++++--- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 320 insertions(+), 30 deletions(-) -- 2.1.0

4 9

[PATCH v2] Add support for serial console
by Ramon Medeiros 24 Nov '15

24 Nov '15

Changes: v2: Add ppc rules to serial.py Correct date on "Copyright" Automatically create serial console device. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 13 ++------ src/wok/plugins/kimchi/xmlutils/serial.py | 55 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 src/wok/plugins/kimchi/xmlutils/serial.py diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index d653665..34bf38b 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -38,7 +38,7 @@ from wok.plugins.kimchi.xmlutils.disk import get_disk_xml from wok.plugins.kimchi.xmlutils.graphics import get_graphics_xml from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.qemucmdline import get_qemucmdline_xml - +from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): def __init__(self, args, scan=False): @@ -312,6 +312,7 @@ class VMTemplate(object): params['qemu-stream-cmdline'] = '' params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) + params['serial'] = get_serial_xml(params) graphics = dict(self.info['graphics']) graphics.update(kwargs.get('graphics', {})) @@ -371,20 +372,12 @@ class VMTemplate(object): %(networks)s %(graphics)s %(input_output)s + %(serial)s <memballoon model='virtio' /> </devices> </domain> """ % params - # Adding PPC console configuration - if params['arch'] in ['ppc', 'ppc64']: - ppc_console = """<memballoon model='virtio' /> - <console type='pty'> - <target type='serial' port='1'/> - <address type='spapr-vio' reg='0x30001000'/> - </console>""" - xml = xml.replace("<memballoon model='virtio' />", ppc_console) - return xml def validate(self): diff --git a/src/wok/plugins/kimchi/xmlutils/serial.py b/src/wok/plugins/kimchi/xmlutils/serial.py new file mode 100644 index 0000000..869a971 --- /dev/null +++ b/src/wok/plugins/kimchi/xmlutils/serial.py @@ -0,0 +1,55 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import lxml.etree as ET +from lxml.builder import E + +def get_serial_xml(params): + """ + For X + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + + For ppc + <console type='pty'> + <target type='serial' port='1'/> + <address type='spapr-vio' reg='0x30001000'/> + </console> + """ + # pcc serial console + if params["arch"] in ["ppc", "ppc64"]: + console = E.console(type="pty") + console.append(E.target(type="serial", port='1')) + console.append(E.address(type="spapr-vio", reg="0x30001000")) + return ET.tostring(console, encoding='utf-8', pretty_print=True) + + # for x + else: + serial = E.serial(type="pty") + serial.append(E.target(port='0')) + console = E.console(type="pty") + console.append(E.target(type="serial", port='0')) + return ET.tostring(serial, encoding='utf-8', pretty_print=True) + \ + ET.tostring(console, encoding='utf-8', pretty_print=True) + + return '' -- 2.1.0

2 1

[PATCH] Add python-mock to README.md
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

Supported distributions provide python-mock. This patch updates README.md with this information. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/docs/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wok/plugins/kimchi/docs/README.md b/src/wok/plugins/kimchi/docs/README.md index 16fd1e5..23db018 100644 --- a/src/wok/plugins/kimchi/docs/README.md +++ b/src/wok/plugins/kimchi/docs/README.md @@ -63,8 +63,7 @@ Install Dependencies $ sudo service libvirtd restart # These dependencies are only required if you want to run the tests: - $ sudo yum install pyflakes python-pep8 python-requests - $ sudo pip install mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock *Note for RHEL users*: Some of the above packages are located in the Red Hat @@ -85,7 +84,7 @@ channel at RHN Classic or Red Hat Satellite. python-magic python-paramiko \ # These dependencies are only required if you want to run the tests: - $ sudo apt-get install pep8 pyflakes python-requests + $ sudo apt-get install pep8 pyflakes python-requests python-mock **For openSUSE:** @@ -97,7 +96,7 @@ channel at RHN Classic or Red Hat Satellite. novnc python-magic # These dependencies are only required if you want to run the tests: - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock *Note for openSUSE users*: Some of the above packages are located in different openSUSE repositories. See -- 2.1.0

3 2

[PATCH] Fix memory add aligment to 256 in PowerPC
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

This patch fixes an error in the 'if' that checks the system architecture. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/vms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 5623879..7e12b91 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -238,9 +238,9 @@ class VMModel(object): vm_locks[name] = lock with lock: - # make sure memory is alingned in 256MiB + # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if 'memory' in params and distro != "IBM_PowerKVM": + if 'memory' in params and distro == "IBM_PowerKVM": if params['memory'] % PPC_MEM_ALIGN != 0: raise InvalidParameter('KCHVM0071E', {'mem': str(params['memory']), -- 2.1.0

2 1

[PATCH v2] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V2 Fixes: Review comments from Aline taken care 1. alignement of second level navigation with first level navigation 2. second level tab color to fit the window Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 3

[PATCH V4] Create logical pool from existing VG
by Aline Manera 24 Nov '15

24 Nov '15

V3 - V4: - Use run_command instead of subprocess.Popen (by Daniel) Aline Manera (1): Create logical pool from existing VG src/wok/plugins/kimchi/API.json | 5 + src/wok/plugins/kimchi/control/host.py | 22 ++++ src/wok/plugins/kimchi/disks.py | 127 ++++++++++++++++++--- src/wok/plugins/kimchi/docs/API.md | 25 +++- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 27 +++++ src/wok/plugins/kimchi/model/host.py | 27 +++++ src/wok/plugins/kimchi/model/libvirtstoragepool.py | 9 +- src/wok/plugins/kimchi/model/storagepools.py | 30 +++-- .../plugins/kimchi/tests/test_mock_storagepool.py | 8 +- 10 files changed, 255 insertions(+), 30 deletions(-) -- 2.5.0

2 3

[PATCH v3] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V3 Fixes: Review comments from Aline taken care Implementing same color for all tabs in kimchi Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 2

[PATCH] Moved disks.py file from kimchi plugin to gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Moved disks.py file from kimchi plugin to gingerbase plugin src/wok/plugins/gingerbase/disks.py | 196 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

7 11

[PATCH v2] Moved disks.py file from kimchi plugin to Gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2 changes: Updated license header to project Ginger Base v1: This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Updated license header to include Project Gingerbase src/wok/plugins/gingerbase/disks.py | 198 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

3 3