- Kimchi-devel - oVirt List Archives

[PATCH][Kimchi 2/2] Modify tests to support mem devs with different sizes
by Rodrigo Trujillo 19 May '16

19 May '16

This patch makes the changes and add tests to check new memory behavior. It should add (hotplug) a memory device with the additional memory device amount (instead of devs of 1GB as before). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_model.py | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 737b39c..6b72bd0 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import grp +import lxml.etree as ET import os import pwd import re @@ -34,7 +35,7 @@ from wok.config import config from wok.exception import InvalidOperation from wok.exception import InvalidParameter, NotFoundError, OperationFailed from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, get_task_id +from wok.utils import add_task, convert_data_size, get_task_id from wok.xmlutils.utils import xpath_get_text from wok.plugins.gingerbase import netinfo @@ -58,7 +59,7 @@ NON_NUMA_XML = """ <domain type='kvm'> <name>non-numa-kimchi-test</name> <maxMemory slots='2' unit='GiB'>4</maxMemory> - <memory unit='GiB'>2</memory> + <memory unit='GiB'>1</memory> <os> <type arch='ppc64'>hvm</type> <boot dev='hd'/> @@ -805,7 +806,7 @@ class ModelTests(unittest.TestCase): config.set("authentication", "method", "pam") inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', - 'memory': {'current': 1024, 'maxmemory': 3072}, + 'memory': {'current': 1024, 'maxmemory': 4096}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}} inst.templates_create(orig_params) @@ -827,9 +828,77 @@ class ModelTests(unittest.TestCase): inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, 'kimchi-vm1') - params['memory']['maxmemory'] = 3072 + params['memory']['maxmemory'] = 4096 self.assertEquals(params['memory'], inst.vm_lookup('kimchi-vm1')['memory']) + + params['memory']['current'] = 4096 + del params['memory']['maxmemory'] + inst.vm_update('kimchi-vm1', params) + vm = inst.vm_lookup('kimchi-vm1') + self.assertEquals(4096, vm['memory']['current']) + + # Test memory devices + conn = inst.conn.get() + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(3072, totMemDevs) + + inst.vm_poweroff('kimchi-vm1') + # Remove all devs: + params = {'memory': {'current': 1024}} + inst.vm_update('kimchi-vm1', params) + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory') + self.assertEquals(0, len(devs)) + + # Hotplug 1G DIMM , 512M , 256M and 256M + inst.vm_start('kimchi-vm1') + params = {'memory': {'current': 2048}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 2560}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 2816}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 3072}} + inst.vm_update('kimchi-vm1', params) + + vm = inst.vm_lookup('kimchi-vm1') + self.assertEquals(3072, vm['memory']['current']) + + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(4, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(2048, totMemDevs) + + inst.vm_poweroff('kimchi-vm1') + # Remove 2x256M + 1x512M ... then sum 256M to virtual memory + params = {'memory': {'current': 2304}} + inst.vm_update('kimchi-vm1', params) + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(1, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(1024, totMemDevs) else: self.assertRaises(InvalidOperation, inst.vm_update, 'kimchi-vm1', params) @@ -856,11 +925,25 @@ class ModelTests(unittest.TestCase): self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(1, len(devs)) + self.assertEquals(2048 << 10, int(devs[0].text)) + params = {'memory': {'current': 4096}} inst.vm_update(vm, params) self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + self.assertEquals(1024 << 10, int(devs[1].text)) + self.assertEquals(3072 << 10, + int(devs[0].text) + int(devs[1].text)) + # Stop vm and test persistence inst.vm_poweroff(vm) self.assertEquals(params['memory']['current'], -- 2.1.0

1 0

[PATCH][Kimchi 1/2] Change memory hotplug to support more than 32GB
by Rodrigo Trujillo 19 May '16

19 May '16

This patch removes the restriction of only allow 32 memory devices of 1GB. Now, Kimchi is going to add an unique memory device with the amount of memory to be increased (per request). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 3 +- model/vms.py | 120 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 59 insertions(+), 64 deletions(-) diff --git a/i18n.py b/i18n.py index cfbc81e..0340303 100644 --- a/i18n.py +++ b/i18n.py @@ -97,8 +97,7 @@ messages = { "KCHVM0041E": _("Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib."), "KCHVM0042E": _("Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature."), "KCHVM0043E": _("Only increase memory is allowed in active VMs"), - "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"), - "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."), + "KCHVM0045E": _("There are not enough free slots to add a new memory device."), "KCHVM0046E": _("Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1."), "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"), "KCHVM0048E": _("Cannot start %(name)s. Virtual machine is already running."), diff --git a/model/vms.py b/model/vms.py index ef53e38..0108381 100644 --- a/model/vms.py +++ b/model/vms.py @@ -837,23 +837,26 @@ class VMModel(object): # Adjust memory devices to new memory, if necessary memDevs = root.findall('./devices/memory') + memDevsAmount = self._get_mem_dev_total_size(ET.tostring(root)) + if len(memDevs) != 0 and hasMem: - if newMem == newMaxMem: + if newMem > (oldMem << 10): + newMem = newMem - memDevsAmount + elif newMem < (oldMem << 10): + memDevs.reverse() + totRemoved = 0 for dev in memDevs: + size = dev.find('./target/size') + totRemoved += int(convert_data_size(size.text, + size.get('unit'), + 'KiB')) root.find('./devices').remove(dev) - elif newMem > (oldMem << 10): - newMem = newMem - (len(memDevs) * (1024 << 10)) - elif newMem < (oldMem << 10): - devsRemove = len(memDevs) - (oldMem - (newMem >> 10))/1024 - 1 - for dev in enumerate(memDevs): - if dev[0] > devsRemove: - root.find('./devices').remove(dev[1]) - newMem = \ - newMem - ( - len(root.findall('./devices/memory')) * 1024 << 10 - ) + if ((oldMem << 10) - totRemoved) <= newMem: + newMem = newMem - self._get_mem_dev_total_size( + ET.tostring(root)) + break elif newMem == (oldMem << 10): - newMem = newMem - ((len(memDevs) * 1024) << 10) + newMem = newMem - memDevsAmount def _get_slots(mem, maxMem): slots = (maxMem - mem) >> 10 >> 10 @@ -893,8 +896,11 @@ class VMModel(object): maxMemTag.text = str(newMaxMem) maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) elif (maxMemTag is not None) and (newMem == newMaxMem): - # Remove the tag - root.remove(maxMemTag) + if self._get_mem_dev_total_size(ET.tostring(root)) == 0: + # Remove the tag + root.remove(maxMemTag) + else: + maxMemTag.text = str(newMaxMem) # Update memory, if necessary if hasMem: @@ -919,7 +925,8 @@ class VMModel(object): memory.text = str(newMem) if (maxMemTag is not None) and (not hasMaxMem): - if newMem == newMaxMem: + if (newMem == newMaxMem and + (self._get_mem_dev_total_size(ET.tostring(root)) == 0)): root.remove(maxMemTag) else: maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) @@ -971,6 +978,15 @@ class VMModel(object): dom.isActive()): self._update_memory_live(dom, params) + def _get_mem_dev_total_size(self, xml): + root = ET.fromstring(xml) + totMemDevs = 0 + for size in root.findall('./devices/memory/target/size'): + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'KiB') + return int(totMemDevs) + def _update_memory_live(self, dom, params): # Check if host supports memory device if not self.caps.mem_hotplug_support: @@ -979,56 +995,42 @@ class VMModel(object): xml = dom.XMLDesc(0) max_mem = xpath_get_text(xml, './maxMemory') if max_mem == []: - raise OperationFailed('KCHVM0042E', {'name': dom.name()}) + raise InvalidOperation('KCHVM0042E', {'name': dom.name()}) - # Memory live update must be done in chunks of 1024 Mib or 1Gib new_mem = params['memory']['current'] old_mem = int(xpath_get_text(xml, XPATH_DOMAIN_MEMORY)[0]) >> 10 - if new_mem < old_mem: - raise OperationFailed('KCHVM0043E') - if (new_mem - old_mem) % 1024 != 0: - raise OperationFailed('KCHVM0044E') + memory = new_mem - old_mem + flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE - # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if (distro == "IBM_PowerKVM" and new_mem % PPC_MEM_ALIGN != 0): - raise InvalidParameter('KCHVM0071E', - {'param': "Memory", - 'mem': str(new_mem), - 'alignment': str(PPC_MEM_ALIGN)}) - - # Check slot spaces: - total_slots = int(xpath_get_text(xml, './maxMemory/@slots')[0]) - needed_slots = (new_mem - old_mem) >> 10 - used_slots = len(xpath_get_text(xml, './devices/memory')) - if needed_slots > (total_slots - used_slots): - raise OperationFailed('KCHVM0045E') - elif needed_slots == 0: - # New memory value is same that current memory set + if distro == "IBM_PowerKVM": + # make sure memory is alingned in 256MiB in PowerPC + if (new_mem % PPC_MEM_ALIGN != 0): + raise InvalidParameter('KCHVM0071E', + {'param': "Memory", + 'mem': str(new_mem), + 'alignment': str(PPC_MEM_ALIGN)}) + # PPC suports only 32 memory slots + if len(xpath_get_text(xml, './devices/memory')) == 32: + raise InvalidOperation('KCHVM0045E') + + if memory == 0: + # Nothing to do return + if memory < 0: + raise InvalidOperation('KCHVM0043E') - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM" and needed_slots > 32: - raise OperationFailed('KCHVM0045E') - - # Finally, we are ok to hot add the memory devices + # Finally HotPlug operation ( memory > 0 ) try: - self._hot_add_memory_devices(dom, needed_slots) + # Create memory device xml + tmp_xml = E.memory(E.target(E.size(str(memory), + unit='MiB')), model='dimm') + if has_cpu_numa(dom): + tmp_xml.find('target').append(E.node('0')) + dom.attachDeviceFlags(etree.tostring(tmp_xml), flags) except Exception as e: raise OperationFailed("KCHVM0047E", {'error': e.message}) - def _hot_add_memory_devices(self, dom, amount): - # 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 - 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) - def _has_video(self, dom): dom = ElementTree.fromstring(dom.XMLDesc(0)) return dom.find('devices/video') is not None @@ -1217,13 +1219,7 @@ class VMModel(object): 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 = curr_mem + totMemDevs + memory = curr_mem + (self._get_mem_dev_total_size(xml) >> 10) # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

1 0

Re: [Kimchi-devel] [PATCH] [Wok 2/2] fix for issue #114
by Suresh Babu Angadi 19 May '16

19 May '16

On 05/18/2016 07:47 AM, Aline Manera wrote: > > > On 05/16/2016 06:11 AM, sureshab(a)linux.vnet.ibm.com wrote: >> From: Suresh Babu Angadi <sureshab(a)in.ibm.com> >> >> added dita-hepl.xsl, css file for help pages and >> help page for "Settings" tab. >> >> Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> >> --- >> ui/pages/help/dita-help.xsl | 44 ++++++++ >> ui/pages/help/en_US/settings.dita | 43 ++++++++ >> ui/pages/help/wok.css | 208 >> ++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 295 insertions(+) >> create mode 100644 ui/pages/help/dita-help.xsl >> create mode 100644 ui/pages/help/en_US/settings.dita >> create mode 100644 ui/pages/help/wok.css >> >> diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl >> new file mode 100644 >> index 0000000..fa75bf2 >> --- /dev/null >> +++ b/ui/pages/help/dita-help.xsl >> @@ -0,0 +1,44 @@ >> +<?xml version="1.0" encoding="UTF-8"?> >> + >> +<xsl:stylesheet version="1.0" >> + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >> + xmlns="http://www.w3.org/1999/xhtml"> >> + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> >> + >> + <xsl:template match="/"> >> + <html> >> + <head> >> + <title><xsl:value-of select="/cshelp/title" /></title> >> + <meta charset="UTF-8" /> >> + <link rel="shortcut icon" >> href="../../images/logo.ico" /> >> + <link rel="stylesheet" type="text/css" >> href="../wok.css" /> >> + </head> >> + <body> >> + <xsl:apply-templates select="//cshelp" /> >> + </body> >> + </html> >> + </xsl:template> >> + >> + <xsl:template match="cshelp"> >> + <h1><xsl:value-of select="title" /></h1> >> + <p class="shortdesc"><xsl:value-of select="shortdesc" /></p> >> + <p class="csbody"><xsl:copy-of select="csbody/node()" /></p> >> + </xsl:template> >> +</xsl:stylesheet> >> diff --git a/ui/pages/help/en_US/settings.dita >> b/ui/pages/help/en_US/settings.dita >> new file mode 100644 >> index 0000000..e5b8465 >> --- /dev/null >> +++ b/ui/pages/help/en_US/settings.dita >> @@ -0,0 +1,43 @@ >> +<?xml version="1.0" encoding="UTF-8"?> >> + >> + >> +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" >> + "..\dtd\cshelp.dtd"> >> +<?Pub Sty _display FontColor="red"?> >> +<?Pub Inc?> >> + >> +<cshelp id="settings" xml:lang="en-us"> >> +<title>Settings</title> >> +<csbody> >> +<dl><dlentry> >> +<dt>User Activity Log</dt> >> +<dd>This section is used to display activity log of all users.</dd> > > This section displays user log activity on Wok and its plugins. I would use - This section displays user activity log on Wok and its plugins. > >> +<dd>Supported operations on User activity log:</dd> >> +<dd>Advanced Search: Use this option to search logs of particular >> application(such as wok, ginger, gingerbase) or user, or with request >> type, or within particular time range.</dd> > > I'd replace the above 2 lines to something like: > > "To get any specific log result, please use the 'Advanced Search' > option. You can specify a particular application (such as wok, ginger, > gingerbase, kimchi), an user, request type or even date range." ok > > >> +<dd>Select "Reset to Default" option to clear the search criteria.</dd> >> +<dd>Download: Use this option to download user activity log.</dd> > > There is an extra space between 'activity' and 'log' thanks, will remove it. > >> +</dlentry> >> +</dl><?Pub Caret 2101?> >> +</csbody> >> +</cshelp> >> +<?Pub *0000003732?> >> diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css >> new file mode 100644 >> index 0000000..e98eae8 >> --- /dev/null >> +++ b/ui/pages/help/wok.css >> @@ -0,0 +1,208 @@ >> +/* >> + * Project Wok >> + * >> + * Copyright IBM Corp, 2016 >> + * > > Is it a copy of a Kimchi/Ginger file ? If so, please add an > appropriated note to inform this code was derived from other project. okay > >> + * Licensed under the Apache License, Version 2.0 (the "License"); >> + * you may not use this file except in compliance with the License. >> + * You may obtain a copy of the License at >> + * >> + * http://www.apache.org/licenses/LICENSE-2.0 >> + * >> + * Unless required by applicable law or agreed to in writing, software >> + * distributed under the License is distributed on an "AS IS" BASIS, >> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >> implied. >> + * See the License for the specific language governing permissions and >> + * limitations under the License. >> + */ >> +BODY { >> + background: #FFFFFF; >> + margin-bottom: 1em; >> + margin-left: .5em; >> +} >> + >> +bold { >> + font-weight: bold; >> +} >> + >> +boldItalic { >> + font-weight: bold; >> + font-style: italic; >> +} >> + >> +italic { >> + font-style: italic; >> +} >> + >> +underlined { >> + text-decoration: underline; >> +} >> + >> +uicontrol { >> + font-weight: bold; >> +} >> + >> +filepath { >> + font-family: monospace, monospace; >> +}.option { >> + font-family: monospace, monospace; >> +} >> + >> +cmdname { >> + font-weight: bold; >> + font-family: monospace, monospace; >> +} >> + >> +.defparmname { >> + font-weight: bold; >> + text-decoration: underline; >> + font-family: monospace, monospace; >> +} >> + >> +.kwd { >> + font-weight: bold; >> +} >> + >> +.defkwd { >> + font-weight: bold; >> + text-decoration: underline; >> +} >> + >> +var { >> + font-style : italic; >> +} >> + >> +strongwintitle { >> + font-weight : bold; >> +} >> + >> +parmname { >> + font-weight: bold; >> + font-family: monospace, monospace; >> + white-space: nowrap; >> +} >> + >> +code { >> + font-family: monospace, monospace; >> +} >> + >> +pre { >> + font-family: monospace, monospace; >> +} >> + >> +CITE { >> + font-style: italic; >> +} >> + >> +EM { >> + font-style: italic; >> +} >> + >> +STRONG { >> + font-weight: bold; >> +} >> + >> +VAR { >> + font-style: italic; >> +} >> + >> +dt { >> + font-weight: bold; >> +} >> + >> +/*********************************************************** >> + * Basic fonts >> + ***********************************************************/ >> +body, >> +td, >> +th, >> +caption { >> + font-family: Verdana, Arial, Helvetica, sans-serif; >> + font-size: 10pt; >> +} >> + >> +pre, code { >> + font-family: MS Courier New, Courier, monospace; >> +} >> + >> +h1, h2, h3 { >> + font-size: 12pt; >> + font-weight: bold; >> + color: #336699; >> +} >> + >> +h4 { >> + font-size: 10pt; >> + font-weight: bold; >> + color: #336699; >> +} >> + >> +/*********************************************************** >> + * Basic indents, padding, and margin >> + ***********************************************************/ >> +body { >> + color: black; >> + background-color: white; >> + margin: 0; >> + padding-top: 0.2em; >> + padding-left: 0.6em; >> + padding-right: 0.2em; >> + padding-bottom: 1em; >> +} >> + >> +h1, >> +h2, >> +h3, >> +h4, >> +h5, >> +h6 { >> + padding: 0; >> + margin-top: 1em; >> + margin-bottom: 0.75em; >> + margin-left: 0; >> + margin-right: 0; >> +} >> + >> +address, >> +dl, >> +li, >> +p { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 0; >> + margin-right: 0; >> + line-height: 125%; >> +} >> + >> +td dl { >> + margin-left: 2em; >> +} >> + >> +pre { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 2em; >> + margin-right: 0; >> +} >> + >> +ol, >> +ul { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 2.00em; >> + margin-right: 0; >> +} >> + >> +dd { >> + margin-left: 3.00em; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> +} >> + >> +dt { >> + margin-left: 1.00em; >> + margin-top: 0.75em; >> +} > -- Regards, Suresh Babu Angadi

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Isolate unit tests execution.
by Aline Manera 18 May '16

18 May '16

On 05/16/2016 11:16 PM, pvital(a)linux.vnet.ibm.com wrote: > From: Paulo Vital <pvital(a)linux.vnet.ibm.com> > > This patch isolates each unit test execution reducing the occurrences of tests > using data from previous unit tests and making results not reliable. > > In addition, it also simplifies the output of tests execution, printing the tags > PASSED and FAILED and the error/failed banners only when necessary. > > Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> > --- > tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ > 1 file changed, 41 insertions(+), 12 deletions(-) > > diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in > index 68dfa2e..d9c2661 100644 > --- a/tests/run_tests.sh.in > +++ b/tests/run_tests.sh.in > @@ -21,6 +21,10 @@ > HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ > PYTHON_VER=@PYTHON_VERSION@ > > +RED='\033[0;31m' > +GREEN='\033[0;32m' > +NC='\033[0m' # No Color > + > if [ "$1" = "-v" ]; then > OPTS="-v" > shift > @@ -40,19 +44,44 @@ else > CMD="python -m unittest" > fi > > -LIST=($ARGS) > -MODEL_LIST=() > -MOCK_LIST=() > -for ((i=0;i<${#LIST[@]};i++)); do > - > - if [[ ${LIST[$i]} == test_model* ]]; then > - MODEL_LIST+=(${LIST[$i]}) > +NUM_TESTS=0 > +TIME=0 > +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE > +for UT in $ARGS; do > + OUTPUT_FILE=$(mktemp) > + echo -n "***** Running unit test: $UT... " > + # ../../../../../ refers to the project root > + # ../../../../ refers to wok directory > + # ../../../ refers to plugins directory > + PYTHONPATH=../../../../../:../../../../:../../../ \ > + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ > + $CMD $OPTS $UT &> $OUTPUT_FILE You can do: output=$($CMD $OPTS $UT) to get the test output. That way we don't need to create multiple temporary files. > + RES=$? > + if [ $RES -ne 0 ]; then > + # unit test has failed, so keep the OUTPUT_FILE and print the results > + echo -e "\t ${RED}FAILED${NC}" > + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) > + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) > + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE > + FAILED_UT+=([$UT]=$OUTPUT_FILE) > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) Following my suggestion to do not use temporary files, all the above block will be replace by: FAILED_UT+=$output > else > - MOCK_LIST+=(${LIST[$i]}) > + # unit test has passed, so print the results and delete the OUTPUT_FILE > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) > + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" > + rm -rf $OUTPUT_FILE > fi > + TES=$(echo $OUTPUT | cut -d" " -f2) > + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) > + TES=$(echo $OUTPUT | cut -d" " -f5) > + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) > done > > -# ../../../../../ refers to the project root > -# ../../../../ refers to wok directory > -# ../../../ refers to plugins directory > -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} > +# Print summary results > +echo -e "======================================================================" > +echo -e "===================== Kimchi Unit Tests Summary ======================" > +echo -e "Ran $NUM_TESTS tests in $TIME seconds." > +for i in "${!FAILED_UT[@]}"; do > + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) > + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" > +done > -- > 2.5.5

1 0

[PATCH v2] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by dhbarboza82＠gmail.com 18 May '16

18 May '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - used interface now being displayed in UI and backend - fixed an issue where the newly created network would appear as 'passthrough' in the UI until a page refresh This patch set adds a new forward mode called 'passthrough' to the 'macvtap' network. Docs, model, test and UI changes included. Daniel Henrique Barboza (3): Adding 'passthrough' forward mode to Macvtap: doc changes Adding 'passthrough' forward mode to Macvtap: model and test changes Adding 'passthrough' forward mode to Macvtap: UI changes API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 1 + model/networks.py | 5 +++-- tests/test_networkxml.py | 14 ++++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 12 ++++++++++-- ui/pages/network-add.html.tmpl | 3 ++- 8 files changed, 38 insertions(+), 5 deletions(-) -- 2.5.5

1 3

[PATCH] [Wok] Clear search when 'Reset to Default' button is clicked
by Lucio Correia 18 May '16

18 May '16

After a click in 'Reset to Default' button, the file downloaded through 'Download' button was still relative to the last 'Advanced search' done. This patch resets the search to default one (no search parameters). Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/wok.user-log.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index dd61748..e787ee6 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -229,6 +229,7 @@ wok.initUserLogWindow = function() { $("#"+wok.opts_user_log['gridId']).bootgrid("clear"); $("#"+wok.opts_user_log['gridId']).bootgrid("append", result); $("#reset-button").addClass('hidden'); + $("#download-button").data('search', ''); }, function(error) { wok.message.error(error.responseJSON.reason, '#message-container-area'); wok.hideBootgridLoading(wok.opts_user_log); -- 1.9.1

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by Daniel Henrique Barboza 18 May '16

18 May '16

On 05/18/2016 12:23 PM, Aline Manera wrote: > > Hi Daniel, > > The patch set looks good for me. > > I'd only recommend to you keep in touch with Socorro as it will impact > the edit virtual networks UI that she is working on. Just talked with her. She'll provide her inputs here when she is done rebasing/testing her work with the work I've done in this patch set. > > Please, send appropriate details on which is needed to edit a macvtap > passthrough mode if there is any difference from a macvtap bridge > network. There is no difference. The only difference is that the previous macvtap network provides a bridge to the guests, this new one will passthrough the network device to it. Usage is the same. > > Thanks, > Aline Manera > > On 05/17/2016 03:08 PM, dhbarboza82(a)gmail.com wrote: >> From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> >> >> This patch set adds a new forward mode called 'passthrough' to >> the 'macvtap' network. >> >> Docs, model, test and UI changes included. >> >> Daniel Henrique Barboza (3): >> Adding 'passthrough' forward mode to Macvtap: doc changes >> Adding 'passthrough' forward mode to Macvtap: model and test changes >> Adding 'passthrough' forward mode to Macvtap: UI changes >> >> API.json | 6 ++++++ >> docs/API.md | 1 + >> i18n.py | 1 + >> model/networks.py | 3 ++- >> tests/test_networkxml.py | 14 ++++++++++++++ >> ui/js/src/kimchi.network.js | 1 + >> ui/js/src/kimchi.network_add_main.js | 11 +++++++++-- >> ui/pages/network-add.html.tmpl | 3 ++- >> 8 files changed, 36 insertions(+), 4 deletions(-) >> >

2 4

[PATCH] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by dhbarboza82＠gmail.com 18 May '16

18 May '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set adds a new forward mode called 'passthrough' to the 'macvtap' network. Docs, model, test and UI changes included. Daniel Henrique Barboza (3): Adding 'passthrough' forward mode to Macvtap: doc changes Adding 'passthrough' forward mode to Macvtap: model and test changes Adding 'passthrough' forward mode to Macvtap: UI changes API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 1 + model/networks.py | 3 ++- tests/test_networkxml.py | 14 ++++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 11 +++++++++-- ui/pages/network-add.html.tmpl | 3 ++- 8 files changed, 36 insertions(+), 4 deletions(-) -- 2.5.5

3 5

[RFC] All plug-ins: accessibility changes in wok.message
by Daniel Henrique Barboza 18 May '16

18 May '16

Hi everyone, There is an accessibility issue in WoK concerning all messages launched by wok.message method: https://github.com/kimchi-project/wok/issues/79 Problem is that the message may disappear and the user might lose information. If we increase the timeout too much then the message becomes an annoyance. My proposal is to make *all* messages closeable by user interaction. This is made at this moment by the 'closeable' flag in the method: wok.message = function(msg, level, node, closeable, onclick) What I want to do is to get rid of the 'closeable' flag, together with the code that makes the message fade with timeout. After that, all WoK messages from all plug-ins would have the "X" icon to be closed manually. This will require changes in all plug-ins that instantiate any wok.message.* method. I am willing to do those changes too. Thoughts?

3 3

[PATCH][Kimchi] Update Fedora iso url to fix test
by Rodrigo Trujillo 18 May '16

18 May '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_rest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_rest.py b/tests/test_rest.py index b395bbb..0cbcc0e 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -811,8 +811,8 @@ class RestTests(unittest.TestCase): os.remove('/tmp/attach-volume') # Change path of storage cdrom - cdrom = u'http://mirrors.kernel.org/fedora/releases/21/Live/'\ - 'x86_64/Fedora-Live-KDE-x86_64-21-5.iso' + cdrom = u'http://mirrors.kernel.org/fedora/releases/23/Live/'\ + 'x86_64/Fedora-Live-KDE-x86_64-23-10.iso' req = json.dumps({'path': cdrom}) resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev, req, 'PUT') -- 2.1.0

2 1