- Kimchi-devel - oVirt List Archives

[PATCH] [Wok 3/3] Use past verbs
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/i18n.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index d3342fc..4fc21f1 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -56,8 +56,8 @@ messages = { "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), # These messages (ending with L) are for user log purposes - "WOKCOL0001L": _("Request on collection"), - "WOKRES0001L": _("Request on resource"), - "WOKROOT0001L": _("User '%(username)s' login"), - "WOKROOT0002L": _("User '%(username)s' logout"), + "WOKCOL0001L": _("Request made on collection"), + "WOKRES0001L": _("Request made on resource"), + "WOKROOT0001L": _("User '%(username)s' logged in"), + "WOKROOT0002L": _("User '%(username)s' logged out"), } -- 1.9.1

1 0

[PATCH] [Wok 2/3] Add support and translate user request log messages
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 17 ++++++++++++----- src/wok/i18n.py | 6 ++++++ src/wok/root.py | 13 +++++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 29b43ac..be5f618 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -33,13 +33,14 @@ from wok.control.utils import validate_params from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError from wok.exception import OperationFailed, UnauthorizedError, WokException +from wok.message import WokMessage from wok.reqlogger import RequestRecord from wok.utils import get_plugin_from_request, utf8_dict, wok_log # Default request log messages -COLLECTION_DEFAULT_LOG = "request on collection" -RESOURCE_DEFAULT_LOG = "request on resource" +COLLECTION_DEFAULT_LOG = "WOKCOL0001L" +RESOURCE_DEFAULT_LOG = "WOKRES0001L" LOG_DISABLED_METHODS = ['GET'] @@ -138,9 +139,11 @@ class Resource(object): action_result = action_fn(*model_args) # log request + code = self.getRequestMessage(method, action_name) reqParams = utf8_dict(self.log_args, request) + msg = WokMessage(code, reqParams).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, action_name) % reqParams, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') @@ -218,8 +221,10 @@ class Resource(object): # log request if method not in LOG_DISABLED_METHODS: + code = self.getRequestMessage(method) + msg = WokMessage(code, self.log_args).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method) % self.log_args, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') @@ -437,9 +442,11 @@ class Collection(object): result = self.create(params, *args) # log request + code = self.getRequestMessage(method) reqParams = utf8_dict(self.log_args, params) + msg = WokMessage(code, reqParams).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method) % reqParams, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') diff --git a/src/wok/i18n.py b/src/wok/i18n.py index 5a2876f..d3342fc 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -54,4 +54,10 @@ messages = { "WOKUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"), "WOKUTILS0004E": _("Invalid data value '%(value)s'"), "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), + + # These messages (ending with L) are for user log purposes + "WOKCOL0001L": _("Request on collection"), + "WOKRES0001L": _("Request on resource"), + "WOKROOT0001L": _("User '%(username)s' login"), + "WOKROOT0002L": _("User '%(username)s' logout"), } diff --git a/src/wok/root.py b/src/wok/root.py index d1a2cc9..29ea657 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -32,14 +32,15 @@ from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request from wok.exception import MissingParameter, OperationFailed +from wok.message import WokMessage from wok.reqlogger import RequestRecord from wok.utils import get_plugin_from_request ROOT_REQUESTS = { 'POST': { - 'login': "User '%(username)s' login", - 'logout': "User '%(username)s' logout", + 'login': "WOKROOT0001L", + 'logout': "WOKROOT0002L", }, } @@ -165,8 +166,10 @@ class WokRoot(Root): raise cherrypy.HTTPError(401) finally: method = 'POST' + code = self.getRequestMessage(method, 'login') + msg = WokMessage(code, params).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, 'login') % params, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(auth.USER_NAME, 'N/A') @@ -177,9 +180,11 @@ class WokRoot(Root): @cherrypy.expose def logout(self): method = 'POST' + code = self.getRequestMessage(method, 'logout') params = {'username': cherrypy.session.get(auth.USER_NAME, 'N/A')} + msg = WokMessage(code, params).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, 'logout') % params, + msg, app=get_plugin_from_request(), req=method, user=params['username'] -- 1.9.1

1 0

[PATCH] [Wok 1/3] Add option to get Wok message text without code
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/message.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wok/message.py b/src/wok/message.py index a3794d0..a7162c7 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -78,7 +78,11 @@ class WokMessage(object): return translation.gettext(text) - def get_text(self): + def get_text(self, prepend_code=True): msg = self._get_translation() msg = unicode(msg, 'utf-8') % self.args - return "%s: %s" % (self.code, msg) + + if prepend_code: + return "%s: %s" % (self.code, msg) + + return msg -- 1.9.1

1 0

[PATCH] [Wok 0/3] Add translation support to user log
by Lucio Correia 13 May '16

13 May '16

Lucio Correia (3): Add option to get Wok message text without code Add support and translate user request log messages Use past verbs src/wok/control/base.py | 17 ++++++++++++----- src/wok/i18n.py | 6 ++++++ src/wok/message.py | 8 ++++++-- src/wok/root.py | 13 +++++++++---- 4 files changed, 33 insertions(+), 11 deletions(-) -- 1.9.1

1 0

[PATCH v2] [Kimchi] Check if qemu/libvirt user has permission to use the image
by Jose Ricardo Ziviani 13 May '16

13 May '16

- Based on this check this patch returns a new field to the interface be able to disable such ISO before creating any templates with it. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- v2: - check permission is now generic for any image control/storagevolumes.py | 3 ++- docs/API.md | 2 ++ mockmodel.py | 6 ++++-- model/storagevolumes.py | 10 ++++++++-- tests/test_model_storagevolume.py | 2 +- tests/test_rest.py | 1 + 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/control/storagevolumes.py b/control/storagevolumes.py index a04ad35..e7f5b54 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -83,7 +83,8 @@ class StorageVolume(Resource): 'path': self.info['path'], 'used_by': self.info['used_by'], 'format': self.info['format'], - 'isvalid': self.info['isvalid']} + 'isvalid': self.info['isvalid'], + 'has_permission': self.info['has_permission']} for key in ('os_version', 'os_distro', 'bootable', 'base'): val = self.info.get(key) diff --git a/docs/API.md b/docs/API.md index 6d502a9..83f9d38 100644 --- a/docs/API.md +++ b/docs/API.md @@ -614,6 +614,8 @@ A interface represents available network interface on VM. * bootable *(optional)*: True if iso image is bootable and not corrupted. * used_by: Name of vms which use this volume. * isvalid: True if is a valid volume. + * has_permission: qemu/libvirt user has the right permission to + to use the image * **DELETE**: Remove the Storage Volume * **POST**: *See Storage Volume Actions* diff --git a/mockmodel.py b/mockmodel.py index 142e81f..38d08b5 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -476,14 +476,16 @@ class MockStorageVolumes(object): 'type': 'block', 'path': base_path + '1', 'used_by': [], - 'isvalid': True}, + 'isvalid': True, + 'has_permission': True}, 'unit:0:0:2': {'capacity': 2048, 'format': 'unknown', 'allocation': 512, 'type': 'block', 'path': base_path + '2', 'used_by': [], - 'isvalid': True}} + 'isvalid': True, + 'has_permission': True}} class MockVolumeGroups(object): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index e037e35..da42e85 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -30,12 +30,14 @@ from lxml.builder import E from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.utils import add_task, get_unique_file_name, wok_log +from wok.utils import add_task, get_unique_file_name +from wok.utils import probe_file_permission_as_user, wok_log from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.isoinfo import IsoImage +from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel @@ -273,6 +275,7 @@ class StorageVolumeModel(object): self.task = TaskModel(**kargs) self.storagevolumes = StorageVolumesModel(**kargs) self.storagepool = StoragePoolModel(**kargs) + self.libvirt_user = UserTests().probe_user() @staticmethod def get_storagevolume(poolname, name, conn): @@ -329,13 +332,15 @@ class StorageVolumeModel(object): isvalid = False used_by = get_disk_used_by(self.objstore, self.conn, path) + ret, _ = probe_file_permission_as_user(path, self.libvirt_user) res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], path=path, used_by=used_by, format=fmt, - isvalid=isvalid) + isvalid=isvalid, + has_permission=ret) if fmt == 'iso': if os.path.islink(path): path = os.path.join(os.path.dirname(path), os.readlink(path)) @@ -347,6 +352,7 @@ class StorageVolumeModel(object): bootable = True except IsoFormatError: bootable = False + res.update( dict(os_distro=os_distro, os_version=os_version, path=path, bootable=bootable)) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index 7dbda97..56dda8f 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -258,7 +258,7 @@ class StorageVolumeTests(unittest.TestCase): self.assertEquals(200, resp.status) keys = [u'name', u'type', u'capacity', u'allocation', u'path', - u'used_by', u'format', u'isvalid'] + u'used_by', u'format', u'isvalid', u'has_permission'] for vol in json.loads(resp.read()): resp = self.request(uri + '/' + vol['name']) self.assertEquals(200, resp.status) diff --git a/tests/test_rest.py b/tests/test_rest.py index c1294ee..cae196e 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1174,6 +1174,7 @@ class RestTests(unittest.TestCase): self.assertEquals('17', storagevolume['os_version']) self.assertEquals('fedora', storagevolume['os_distro']) self.assertEquals(True, storagevolume['bootable']) + self.assertEquals(True, storagevolume['has_permission']) # Create a template # In real model os distro/version can be omitted -- 2.7.4

2 1

Links for accessibility
by Samuel Henrique De Oliveira Guimaraes 13 May '16

13 May '16

Hi team, I've seen some issues on Github regarding accessibility and I found some articles that may help us dealing with new features or bug fixes in the future: - http://www.sitepoint.com/accessible-web-components/ - http://webaim.org/techniques/aria/ - http://heydonworks.com/practical_aria_examples/ - https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Test_C… And most important, some real use case examples with source code: - http://oaa-accessibility.org/ Thanks, Samuel

1 0

[PATCH][Kimchi 1/2] Implements support to memory hotplug in non-NUMA guests
by Rodrigo Trujillo 12 May '16

12 May '16

This patch makes necessary changes in Kimchi guest update to support memory hotplug operations in non-numa guests, due to latest Libvirt changes. --- model/utils.py | 18 ++++++++++++++++++ model/vms.py | 53 +++++++++++++++++------------------------------------ 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/model/utils.py b/model/utils.py index b7ea82e..da62971 100644 --- a/model/utils.py +++ b/model/utils.py @@ -129,3 +129,21 @@ def metadata_exists(dom): if root.find("metadata") is None: return False return True + + +def has_cpu_numa(dom): + """ + Verify if domain has NUMA configuration + Returns: True or False + """ + root = etree.fromstring(dom.XMLDesc(0)) + return (root.find('./cpu/numa') is not None) + + +def set_numa_memory(mem, root): + """ + Set new NUMA memory value + Returns: etree element updated + """ + root.find('./cpu/numa/cell').set('memory', str(mem)) + return root diff --git a/model/vms.py b/model/vms.py index cf40ad1..f88cfdb 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,9 +61,9 @@ from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.screenshot import VMScreenshot from wok.plugins.kimchi.utils import get_next_clone_name from wok.plugins.kimchi.utils import template_name_from_uri -from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml, get_numa_xml from wok.plugins.kimchi.xmlutils.cpu import get_topology_xml from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks +from utils import has_cpu_numa, set_numa_memory DOM_STATE_MAP = {0: 'nostate', @@ -769,10 +769,10 @@ class VMModel(object): # topology is being undefined: remove it new_xml = xml_item_remove(new_xml, XPATH_TOPOLOGY) - # Updating memory and NUMA if necessary, if vm is offline + # Updating memory if vm is offline if (not dom.isActive() and 'memory' in params and params['memory'] != {}): - new_xml = self._update_memory_config(new_xml, params) + new_xml = self._update_memory_config(new_xml, params, dom) if 'graphics' in params: new_xml = self._update_graphics(dom, new_xml, params) @@ -810,7 +810,7 @@ class VMModel(object): vm_name = name return (nonascii_name if nonascii_name is not None else vm_name, dom) - def _update_memory_config(self, xml, params): + def _update_memory_config(self, xml, params, dom): # Cannot pass max memory if there is not support to memory hotplug # Then set max memory as memory, just to continue with the update if not self.caps.mem_hotplug_support: @@ -905,16 +905,18 @@ class VMModel(object): root.remove(currentMem) memory = root.find('.memory') - # If host/guest does not support memory hot plug, then there is - # NUMA configure, we must update the tag directly - if not self.caps.mem_hotplug_support: - if memory is not None: - memory.text = str(newMem) - else: + # Set NUMA parameterers if necessary. NUMA is not required for CPU + # and Memory hotplug anymore + if has_cpu_numa(dom): if memory is not None: # Libvirt is going to set the value automatically with # the value configured in NUMA tag root.remove(memory) + root = set_numa_memory(newMem, root) + else: + # update the memory tag directly + if memory is not None: + memory.text = str(newMem) if (maxMemTag is not None) and (not hasMaxMem): if newMem == newMaxMem: @@ -922,22 +924,6 @@ class VMModel(object): else: maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) - # Set NUMA parameterers and create it if does not exist - # CPU tag DO NOT exist? Create it - cpu = root.find(XPATH_CPU) - if cpu is None: - cpu = get_cpu_xml(0, newMem) - root.insert(0, ET.fromstring(cpu)) - else: - # Does NUMA tag exist ? - numaTag = cpu.find('./numa') - if numaTag is None: - numa_element = get_numa_xml(0, newMem) - cpu.insert(0, ET.fromstring(numa_element)) - else: - cellTag = cpu.find('./numa/cell') - cellTag.set('memory', str(newMem)) - # Setting memory hard limit to max_memory + 1GiB memtune = root.find('memtune') if memtune is not None: @@ -990,12 +976,9 @@ class VMModel(object): if not self.caps.mem_hotplug_support: raise InvalidOperation("KCHVM0046E") - # Check if the vm xml supports memory hotplug, if not, static update - # must be done firstly, then Kimchi is going to update the xml xml = dom.XMLDesc(0) - numa_mem = xpath_get_text(xml, XPATH_NUMA_CELL + '/@memory') max_mem = xpath_get_text(xml, './maxMemory') - if numa_mem == [] or max_mem == []: + if max_mem == []: raise OperationFailed('KCHVM0042E', {'name': dom.name()}) # Memory live update must be done in chunks of 1024 Mib or 1Gib @@ -1038,12 +1021,10 @@ class VMModel(object): # Hot add given number of memory devices in the guest flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE # Create memory device xml - mem_dev_xml = etree.tostring( - E.memory( - E.target( - E.size('1', unit='GiB'), - E.node('0')), - model='dimm')) + tmp_xml = E.memory(E.target(E.size('1', unit='GiB')), model='dimm') + if has_cpu_numa(dom): + tmp_xml.find('target').append(E.node('0')) + mem_dev_xml = etree.tostring(tmp_xml) # Add chunks of 1G of memory for i in range(amount): dom.attachDeviceFlags(mem_dev_xml, flags) -- 2.1.0

2 2

[PATCH v2] [Kimchi 0/2] Filtering VEPA interfaces
by dhbarboza82＠gmail.com 12 May '16

12 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v2: - fixed issue found by Aline This patch set filters the VEPA interfaces to be used in network creation by eliminating the ConnectX-4 cards. Unit tests, docs and UI changes included. Daniel Henrique Barboza (2): Filter VEPA interfaces: adding 'module' to interfaces API Filter VEPA interfaces: JS changes control/interfaces.py | 3 ++- docs/API.md | 2 ++ tests/test_rest.py | 2 +- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.network_add_main.js | 12 ++++++++++-- 5 files changed, 29 insertions(+), 4 deletions(-) -- 2.5.5

2 3

[PATCH][Kimchi] Fix memory return in vm with memory devices hotplugged
by Rodrigo Trujillo 12 May '16

12 May '16

Libvirt is updating 'currentmemory' and 'memory' if its values are equal, when user attaches a memory device. So, we can use the function maxMemory() of Libvirt API to retrieve the value of memory. Kimchi does not use currentMemory tag, but once it is the amount seen inside a running guest, if it was changed outside kimchi, we must sum the memory devices values (if any) to have the right value seen inside guest. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/model/vms.py b/model/vms.py index 7bf4c77..2374d31 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1210,24 +1210,21 @@ class VMModel(object): 'threads': threads, } - if state == 'shutoff': - val = xpath_get_text(xml, XPATH_DOMAIN_MEMORY)[0] - unit_list = xpath_get_text(xml, XPATH_DOMAIN_MEMORY_UNIT) - if len(unit_list) > 0: - unit = unit_list[0] - else: - unit = 'KiB' - memory = convert_data_size(val, unit, 'MiB') - else: - # Return current memory plus the amount of memory given by memory - # devices + # Kimchi does not make use of 'currentMemory' tag, it only updates + # NUMA memory config or 'memory' tag directly. In memory hotplug, + # Libvirt always updates 'memory', so we can use this tag retrieving + # from Libvirt API maxMemory() function, regardeless of the VM state + # Case VM changed currentMemory outside Kimchi, sum mem devs + memory = dom.maxMemory() >> 10 + curr_mem = (info[2] >> 10) + if memory != curr_mem: root = ET.fromstring(xml) totMemDevs = 0 for size in root.findall('./devices/memory/target/size'): totMemDevs += convert_data_size(size.text, size.get('unit'), 'MiB') - memory = (info[2] >> 10) + totMemDevs + memory = curr_mem + totMemDevs # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

2 1

[PATCH][Kimchi] Does not use slot in memory device removal
by Rodrigo Trujillo 12 May '16

12 May '16

Latest Libvirt version changed, and does not add anymore automatically address/slots for memory devices hotplugged. Kimchi tries to remove memory devices by theirs slot number, when virtual machine is offline, and if it has memory devices configured. This behavior will raise an error, so this patch fix this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model/vms.py b/model/vms.py index b617b1d..7bf4c77 100644 --- a/model/vms.py +++ b/model/vms.py @@ -846,9 +846,9 @@ class VMModel(object): newMem = newMem - (len(memDevs) * (1024 << 10)) elif newMem < (oldMem << 10): devsRemove = len(memDevs) - (oldMem - (newMem >> 10))/1024 - 1 - for dev in memDevs: - if int(dev.xpath('./address/@slot')[0]) > devsRemove: - root.find('./devices').remove(dev) + for dev in enumerate(memDevs): + if dev[0] > devsRemove: + root.find('./devices').remove(dev[1]) newMem = \ newMem - ( len(root.findall('./devices/memory')) * 1024 << 10 -- 2.1.0

2 1