June 2015 - Kimchi-devel - oVirt List Archives

[PATCH V2] Bug fix: Allow user creates multiple templates
by Aline Manera 11 Jun '15

11 Jun '15

V1 - V2: - Enclose the guest creation code with the lock Aline Manera (1): Bug fix: Allow user creates multiple templates src/kimchi/kvmusertests.py | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) -- 2.1.0

2 3

[PATCH 0/3 v4] Removing Yum API from Kimchi
by Daniel Henrique Barboza 10 Jun '15

10 Jun '15

v4: - simplified the code of YumRepoObj class x3: - skipping yumparser tests in Ubuntu - make check-local fixes The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++-------- src/kimchi/swupdate.py | 16 ++- src/kimchi/yumparser.py | 248 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 111 ++++++++++++++++++++ 4 files changed, 385 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 5

[PATCH] Fix bug #647: Properly set qxl as video model for Fedora 22
by Aline Manera 10 Jun '15

10 Jun '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 6 ++++++ src/kimchi/vmtemplate.py | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 35aa594..78eb828 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -68,6 +68,9 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', memory=1280)}} +custom_specs = {'fedora': {'22': dict(video_model='qxl')}} + + modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', @@ -199,6 +202,9 @@ def lookup(distro, version): params['os_distro'] = params['os_version'] = "unknown" params.update(template_specs[arch]['old']) + # Get custom specifications + params.update(custom_specs.get(distro, {}).get(version, {})) + if distro in icon_available_distros: params['icon'] = 'images/icon-%s.png' % distro else: diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4143839..79e04ed 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -259,6 +259,12 @@ class VMTemplate(object): <input type='tablet' bus='%(kbd_bus)s'> </input> """ + video = """ + <video> + <model type='%(video_model)s'/> + </video> + """ + input_output = "" if 'mouse_bus' in self.info.keys(): input_output += mouse % self.info @@ -268,6 +274,8 @@ class VMTemplate(object): input_output += tablet % self.info if 'sound_model' in self.info.keys(): input_output += sound % self.info + if 'video_model' in self.info.keys(): + input_output += video % self.info return input_output def _get_cpu_xml(self): -- 2.1.0

2 2

[PATCH 0/6 - V2][Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 10 Jun '15

10 Jun '15

V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (6): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Memory device control and model classes [Memory HotPlug] Add parameters checking and documentation to memory device API [Memory HotPlug] Fix VM offline memory update and fix slots assignment [Memory HotPlug] Fix test and adds slot test docs/API.md | 16 +++++++ src/kimchi/API.json | 14 +++++- src/kimchi/control/vm/memdevices.py | 47 +++++++++++++++++++ src/kimchi/i18n.py | 5 ++ src/kimchi/mockmodel.py | 7 +++ src/kimchi/model/config.py | 3 ++ src/kimchi/model/featuretests.py | 43 +++++++++++++++++ src/kimchi/model/vmmemdevices.py | 94 +++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 85 ++++++++++++++++++++++++++++----- src/kimchi/vmtemplate.py | 40 ++++++++++++---- tests/test_model.py | 2 +- tests/test_rest.py | 4 +- tests/test_vmtemplate.py | 5 +- 13 files changed, 338 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/control/vm/memdevices.py create mode 100644 src/kimchi/model/vmmemdevices.py -- 2.1.0

2 22

[PATCH v2] Fix make install for systemd systems
by Ramon Medeiros 09 Jun '15

09 Jun '15

Make install now will install firewalld and systemctl service. Also, it will create base file structure to run kimchi (what was being created at rpm spec). Changes: v2: Use macros to determine systemd directory Do not use root permissions on make install script (like rebooting systemctl) --- Makefile.am | 50 +++++++++++++++++++++++++++---------------- configure.ac | 9 ++++++++ contrib/kimchi.spec.fedora.in | 16 -------------- contrib/kimchi.spec.suse.in | 18 ---------------- 4 files changed, 41 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index 91a0fa2..46b0b5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,27 +115,41 @@ ChangeLog: fi install-data-local: - @if test -d /usr/lib/systemd/system/ ; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -d /etc/systemd/system; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /etc/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - else \ - $(INSTALL_DATA) contrib/kimchid.sysvinit /etc/init.d/kimchid; \ - chmod +x /etc/init.d/kimchid; \ - fi + @if test -d $(systemdsystemunitdir) ; then \ + mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ + else \ + mkdir -p $(DESTDIR)/etc/init.d/ \ + $(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \ + chmod +x $(DESTDIR)/etc/init.d/kimchid; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} + touch $(DESTDIR)/var/lib/kimchi/objectstore + mkdir -p $(DESTDIR)/var/log/kimchi/ + touch $(DESTDIR)/var/log/kimchi/kimchi-access.log + touch $(DESTDIR)/var/log/kimchi/kimchi-error.log + mkdir -p $(DESTDIR)/etc/kimchi/ + touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: - @if test -f /usr/lib/systemd/system/kimchid.service; then \ - $(RM) /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -f /etc/systemd/system/kimchid.service; then \ - $(RM) /etc/systemd/system/kimchid.service; \ + @if test -f $(systemdsystemunitdir)/kimchid.service; then \ + $(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ elif test -f /etc/init.d/kimchid; then \ - $(RM) /etc/init.d/kimchid; \ - fi - + $(RM) $(DESTDIR)/etc/init.d/kimchid; \ + $(RM) $(DESTDIR)/etc/init/kimchi.conf; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + $(RM) -rf $(DESTDIR)/var/lib/kimchi + $(RM) -rf $(DESTDIR)/var/log/kimchi + $(RM) -rf $(DESTDIR)/etc/kimchi + $(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf + VERSION: @if test -d .git; then \ git describe --abbrev=0 > $@; \ diff --git a/configure.ac b/configure.ac index f5091b8..0261b5f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,15 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +# check for systemd +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi + AC_ARG_WITH( [spice-html5], [AS_HELP_STRING([--with-spice-html5], diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 30f8417..dc5533a 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -85,22 +85,6 @@ make DESTDIR=%{buildroot} install %if 0%{?with_systemd} -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_sharedstatedir}/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_sharedstatedir}/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the systemd scripts -install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service -install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index bf85661..5681a60 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -54,24 +54,6 @@ make rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_var}/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_var}/lib/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ - -# create nginx configuration -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the SysV init scripts -install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid - %post chkconfig kimchid on -- 2.1.0

2 10

Entering code freeze for Kimchi 1.5
by Aline Manera 09 Jun '15

09 Jun '15

Hi all, We are entering the code freeze phase for 1.5 release. That means only bug fixes will be merged from now on until the release announcement. Please, any help for testing Kimchi in the various Linux distributions is more than welcome. The test matrix is already updated: https://github.com/kimchi-project/kimchi/wiki/Testing-1.5 Please, update it according to your tests. I'd also want to ask your help to update the translations files. Regards, Aline Manera

2 2

[PATCH 0/4 v3][Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 09 Jun '15

09 Jun '15

v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix test and adds slot test src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 43 +++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 2 +- tests/test_rest.py | 4 +- tests/test_vmtemplate.py | 5 +- 10 files changed, 279 insertions(+), 26 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

3 7

[PATCH V2] Resize Actions button
by Socorro Stoppler 09 Jun '15

09 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> V1 - V2: Changed Actions button width to span all 3 buttons above it Socorro Stoppler (1): Change button behavior for pause/resume VM ui/css/theme-default/list.css | 2 +- ui/js/src/kimchi.guest_main.js | 4 +++- ui/pages/guest.html.tmpl | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) -- 1.9.1

2 3

[PATCH] Bug fix: Allow user creates multiple templates
by Aline Manera 09 Jun '15

09 Jun '15

While trying to create multiple templates I got the following error on console: [08/Jun/2015:12:57:23] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 670, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 217, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 61, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 330, in index return self.create(parse_request(), *args) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 262, in create name = create(*args) File "/home/alinefm/kimchi/src/kimchi/model/templates.py", line 48, in create user = UserTests().probe_user() File "/home/alinefm/kimchi/src/kimchi/kvmusertests.py", line 55, in probe_user flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 3424, in createXML if ret is None:raise libvirtError('virDomainCreateXML() failed', conn=self) libvirtError: operation failed: domain 'KVMUSERTEST_VM' already exists with uuid 2be4b2e8-f57a-4f87-8c24-5ac59d4bb4af The error happens because of a race condition while trying to get the kvm user (to validate the ISO file permissions). To avoid this problem, a lock was added to ensure the code is run once at a time. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 37a80d7..315354e 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -18,6 +18,7 @@ import platform import psutil +import threading import libvirt @@ -36,18 +37,21 @@ class UserTests(object): <boot dev='hd'/> </os> </domain>""" + lock = threading.Lock() user = None @classmethod def probe_user(cls): - if cls.user: - return cls.user + with cls.lock: + if cls.user: + return cls.user arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() xml = cls.SIMPLE_VM_XML % {'name': KVMUSERTEST_VM_NAME, 'arch': arch} + cls.lock.acquire() with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) @@ -67,6 +71,7 @@ class UserTests(object): else: cls.user = p.username + cls.lock.release() return cls.user -- 2.1.0

2 2

[PATCH] List IPs of VM Ifaces
by Christy Perez 09 Jun '15

09 Jun '15

Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/mockmodel.py | 9 +++++++++ src/kimchi/model/vmifaces.py | 28 ++++++++++++++++++++++++++++ tests/test_rest.py | 6 ++++++ 4 files changed, 44 insertions(+) diff --git a/docs/API.md b/docs/API.md index e022c9e..10e80ac 100644 --- a/docs/API.md +++ b/docs/API.md @@ -299,6 +299,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. + * ips: A list of IP addresses associated with this MAC. * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index aaf1af2..3f74b80 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -24,6 +24,7 @@ import random import time import kimchi.model.cpuinfo +import kimchi.model.vmifaces from lxml import objectify from lxml.builder import E @@ -76,6 +77,7 @@ class MockModel(Model): kimchi.model.cpuinfo.get_topo_capabilities = \ MockModel.get_topo_capabilities + kimchi.model.vmifaces.getDHCPLeases = MockModel.getDHCPLeases libvirt.virConnect.defineXML = MockModel.domainDefineXML libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain @@ -235,6 +237,13 @@ class MockModel(Model): pool = vol.storagePoolLookupByVolume() pool.createXML(new_xml) + @staticmethod + def getDHCPLeases(net, mac): + return [{'iface': 'virbr1', 'ipaddr': '192.168.0.167', + 'hostname': 'kimchi', 'expirytime': 1433285036L, + 'prefix': 24, 'clientid': '01:%s' % mac, + 'mac': mac, 'iaid': None, 'type': 0}] + def _probe_image(self, path): return ('unknown', 'unknown') diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 93a769b..630e4dc 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -29,6 +29,14 @@ from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.xmlutils.interface import get_iface_xml +def getDHCPLeases(net, mac): + try: + leases = net.DHCPLeases(mac) + return leases + except libvirt.libvirtError: + return [] + + class VMIfacesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -132,9 +140,29 @@ class VMIfaceModel(object): info['network'] = iface.source.get('network') if info['type'] == 'bridge': info['bridge'] = iface.source.get('bridge') + info['ips'] = self._get_ips(info['mac'], info['network']) return info + def _get_ips(self, mac, network): + ips = [] + conn = self.conn.get() + # An iface may have multiple IPs + # An IP could have been assigned without libvirt. + # First check the ARP cache. + with open('/proc/net/arp') as f: + ips = [line.split()[0] for line in f.xreadlines() if mac in line] + # Some ifaces may be inactive, so if the ARP cache didn't have them, + # and they happen to be assigned via DHCP, we can check there too. + net = conn.networkLookupByName(network) + leases = getDHCPLeases(net, mac) + for lease in leases: + ip = lease.get('ipaddr') + if ip not in ips: + ips.append(ip) + + return ips + def delete(self, vm, mac): dom = VMModel.get_vm(vm, self.conn) iface = self._get_vmiface(vm, mac) diff --git a/tests/test_rest.py b/tests/test_rest.py index 7fe6831..2145d00 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -707,6 +707,7 @@ class RestTests(unittest.TestCase): self.assertEquals(17, len(res['mac'])) self.assertEquals(get_template_default('old', 'nic_model'), res['model']) + self.assertTrue('ips' in res) # try to attach an interface without specifying 'model' req = json.dumps({'type': 'network'}) @@ -737,6 +738,11 @@ class RestTests(unittest.TestCase): newMacAddr).read()) self.assertEquals(newMacAddr, iface['mac']) + # Check for an IP address + iface = json.loads(self.request('/vms/test-vm/ifaces/%s' % + newMacAddr).read()) + self.assertTrue(len(iface['ips']) > 0) + # detach network interface from vm resp = self.request('/vms/test-vm/ifaces/%s' % iface['mac'], '{}', 'DELETE') -- 2.1.0

3 3

[PATCH 0/3 v3] Removing Yum API from Kimchi
by Daniel Henrique Barboza 09 Jun '15

09 Jun '15

x3: - skipping yumparser tests in Ubuntu - make check-local fixes The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 111 +++++++++++++++++++ 4 files changed, 408 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 6

[PATCH] Change behavior of pause VM button
by Socorro Stoppler 08 Jun '15

08 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> Make the Pause button behave like the Reset button Make the Resume icon in the tile more visible when hovering over it This addresses the following: https://github.com/kimchi-project/kimchi/issues/649#issuecomment-107569954 Socorro Stoppler (1): Change button behavior for pause/resume VM ui/css/theme-default/list.css | 2 +- ui/js/src/kimchi.guest_main.js | 4 +++- ui/pages/guest.html.tmpl | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) -- 1.9.1

3 5

[PATCH 0/4 v5] [Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v5: - Fix vmtemplate test in PPC v4: - Fix issues with tests - Add new memory hotplug test v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix tests, adds slot and memory hotplug tests src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 50 +++++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 31 +++++++- tests/test_rest.py | 12 +++- tests/test_vmtemplate.py | 9 ++- 10 files changed, 326 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

2 5

[PATCH 0/3 v2] Removing Yum API from Kimchi
by Daniel Henrique Barboza 05 Jun '15

05 Jun '15

The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 109 ++++++++++++++++++ 4 files changed, 406 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 4

[PATCH] Fix issue: Kimchi always create qcow2 disk images
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

If the user change disk format in template.conf, templates are going to be created correctly and vm xml as well. But, when the disk is created, the format is always qcow2. Removing the line: "fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2'" fixes the issue, since same checking is being done in __init__ in line 78. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index e047228..e73c487 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -192,7 +192,6 @@ class VMTemplate(object): def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() - fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' ret = [] for i, d in enumerate(self.info['disks']): index = d.get('index', i) @@ -200,11 +199,11 @@ class VMTemplate(object): info = {'name': volume, 'capacity': d['size'], - 'format': fmt, + 'format': d['format'], 'path': '%s/%s' % (storage_path, volume)} if 'logical' == self._get_storage_type() or \ - fmt not in ['qcow2', 'raw']: + d['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: info['allocation'] = 0 -- 2.1.0

2 2

[PATCH 0/4 v4] [Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v4: - Fix issues with tests - Add new memory hotplug test v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix tests, adds slot and memory hotplug tests src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 50 +++++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 31 +++++++- tests/test_rest.py | 12 +++- tests/test_vmtemplate.py | 5 +- 10 files changed, 322 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

1 4

[PATCH] pep8 fixes
by Daniel Henrique Barboza 05 Jun '15

05 Jun '15

pep8 version 1.6.2 added a rule in which the logical operand must be before a line break, not after: "W503 line break before binary operator" Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- contrib/check_i18n.py | 4 ++-- src/kimchi/control/base.py | 4 ++-- src/kimchi/model/vms.py | 4 ++-- src/kimchi/model/vmstorages.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/check_i18n.py b/contrib/check_i18n.py index a7eeef6..6a2603c 100755 --- a/contrib/check_i18n.py +++ b/contrib/check_i18n.py @@ -55,8 +55,8 @@ def check_obsolete_messages(path, messages): for root, dirs, files in os.walk(path): for f in files: fname = os.path.join(root, f) - if (not fname.endswith("i18n.py") and fname.endswith(".py") - or fname.endswith(".json")): + if (not fname.endswith("i18n.py") and fname.endswith(".py") or + fname.endswith(".json")): with open(fname) as f: string = "".join(f.readlines()) if k in string: diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index b9520c0..006a6f7 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -112,8 +112,8 @@ class Resource(object): action_fn = getattr(self.model, model_fn(self, action_name)) action_result = action_fn(*model_args) if destructive is False or \ - ('persistent' in self.info.keys() - and self.info['persistent'] is True): + ('persistent' in self.info.keys() and + self.info['persistent'] is True): return render_fn(self, action_result) except MissingParameter, e: raise cherrypy.HTTPError(400, e.message) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index ed1500e..2ef274c 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -598,8 +598,8 @@ class VMModel(object): expire = params['graphics'].get("passwdValidTo") to = graphics.attrib.get('passwdValidTo') if to is not None: - if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) - - time.time() <= 0): + if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) - + time.time() <= 0): expire = expire if expire is not None else 30 if expire is not None: diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index d3d4a8b..142b177 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -97,8 +97,8 @@ class VMStoragesModel(object): char = dev_list.pop()[2] params['index'] = string.ascii_lowercase.index(char) + 1 - if (params['bus'] not in HOTPLUG_TYPE - and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): + if (params['bus'] not in HOTPLUG_TYPE and + DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') if params.get('vol'): -- 2.1.0

2 1

[PATCH v3] UI-Template Edit: Enable user to change disk format
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v3: Implements suggestions from Aline: - Removed loops - Create IDs for SELECT elements v2: Implements suggestions from Cristian v1: Initial version Rodrigo Trujillo (1): UI-Template Edit: Enable user to change disk format ui/css/theme-default/template-edit.css | 8 ++++++-- ui/js/src/kimchi.template_edit_main.js | 37 ++++++++++++++++++++++++++++------ ui/pages/template-edit.html.tmpl | 18 ++++++++++++++++- 3 files changed, 54 insertions(+), 9 deletions(-) -- 2.1.0

2 2

[PATCH v4] Supress error messages while checking vm metadata
by Ramon Medeiros 05 Jun '15

05 Jun '15

The function FeatureTests.disable_libvirt_error_logging only removes the error message that will be displayed on the console. Libvirt also logs errors on messages log. To avoid flood messages log with metadata errors, it will be verified manually if the xml has the tag. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v4: Fix make check-local errors v3: Discard all code writed before. Aline suggested me a nice workaround, check if the xml has metadata tag. --- src/kimchi/model/utils.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 0c9d519..7f27edd 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -22,7 +22,6 @@ from lxml import etree, objectify from lxml.builder import E, ElementMaker from kimchi.exception import OperationFailed -from kimchi.model.featuretests import FeatureTests KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi" KIMCHI_NAMESPACE = "kimchi" @@ -84,7 +83,8 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): - FeatureTests.disable_libvirt_error_logging() + if not metadata_exists(dom): + return None try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -92,8 +92,6 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): return etree.fromstring(xml) except libvirt.libvirtError: return None - finally: - FeatureTests.enable_libvirt_error_logging() def set_metadata_node(dom, node, metadata_support, mode="all"): @@ -151,3 +149,12 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + + +def metadata_exists(dom): + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + root = etree.fromstring(xml) + + if root.find("metadata") is None: + return False + return True -- 2.1.0

3 2

[PATCH 0/3] Removing Yum API from Kimchi
by Daniel Henrique Barboza 04 Jun '15

04 Jun '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmmail.com> The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 109 ++++++++++++++++++ 4 files changed, 406 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

1 4

[PATCH v3] Supress error messages while checking vm metadata
by Ramon Medeiros 04 Jun '15

04 Jun '15

The function FeatureTests.disable_libvirt_error_logging only removes the error message that will be displayed on the console. Libvirt also logs errors on messages log. To avoid flood messages log with metadata errors, it will be verified manually if the xml has the tag. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v3: Discard all code writed before. Aline suggested me a nice workaround, check if the xml has metadata tag. --- src/kimchi/model/utils.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 0c9d519..d4994d5 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -84,7 +84,8 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): - FeatureTests.disable_libvirt_error_logging() + if not metadata_exists(dom): + return None try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -92,8 +93,6 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): return etree.fromstring(xml) except libvirt.libvirtError: return None - finally: - FeatureTests.enable_libvirt_error_logging() def set_metadata_node(dom, node, metadata_support, mode="all"): @@ -151,3 +150,12 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + +def metadata_exists(dom): + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + root = etree.fromstring(xml) + + if root.find("metadata") == None: + return False + return True + -- 2.1.0

1 1

[PATCH V2]
by Socorro Stoppler 02 Jun '15

02 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> V1 - V2: - The image in the tile section is no longer shifted down when VM is paused. - Removed tabs and replaced with spaces throughout the code. Socorro Stoppler (1): Add support for Pause/Resume UI ui/css/theme-default/button.css | 20 +++++ ui/css/theme-default/list.css | 24 +++++- ui/images/theme-default/ac22_pause.png | Bin 0 -> 1219 bytes ui/images/theme-default/ac22_pause_grey.png | Bin 0 -> 1175 bytes ui/images/theme-default/ac24_resume.png | Bin 0 -> 1341 bytes ui/images/theme-default/ac24_resume_grey.png | Bin 0 -> 1282 bytes ui/js/src/kimchi.api.js | 22 ++++++ ui/js/src/kimchi.guest_main.js | 109 +++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 4 + 9 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 ui/images/theme-default/ac22_pause.png create mode 100644 ui/images/theme-default/ac22_pause_grey.png create mode 100644 ui/images/theme-default/ac24_resume.png create mode 100644 ui/images/theme-default/ac24_resume_grey.png -- 1.9.1

3 7

[PATCH 0/2] Pause/resume support in UI
by Socorro Stoppler 02 Jun '15

02 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> Add support for pause/resume VM via the UI Socorro Stoppler (2): First changes for pause/resume UI Add support for Pause/Resume UI ui/css/theme-default/button.css | 20 +++++ ui/css/theme-default/list.css | 6 ++ ui/images/theme-default/ac22_pause.png | Bin 0 -> 1219 bytes ui/images/theme-default/ac22_pause_grey.png | Bin 0 -> 1175 bytes ui/images/theme-default/ac24_resume.png | Bin 0 -> 1341 bytes ui/images/theme-default/ac24_resume_grey.png | Bin 0 -> 1282 bytes ui/js/src/kimchi.api.js | 23 ++++++ ui/js/src/kimchi.guest_main.js | 114 +++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 4 + 9 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 ui/images/theme-default/ac22_pause.png create mode 100644 ui/images/theme-default/ac22_pause_grey.png create mode 100644 ui/images/theme-default/ac24_resume.png create mode 100644 ui/images/theme-default/ac24_resume_grey.png -- 1.9.1

4 12

[PATCH 0/3 V2] Storage volume upload UI
by Aline Manera 01 Jun '15

01 Jun '15

V1 - V2: - Deal with non-existing file and read permission errors Aline Manera (3): Storage volume upload: Keep the task tracking to update the UI Storage volume upload: Let the 'format' parameter be an empty string Enable storage volume upload on UI src/kimchi/API.json | 2 +- src/kimchi/mockmodel.py | 3 +- src/kimchi/model/storagevolumes.py | 20 +++++-- tests/test_model_storagevolume.py | 2 +- ui/js/src/kimchi.api.js | 25 +++++++-- ui/js/src/kimchi.storagepool_add_volume_main.js | 73 ++++++++++++++++++++++--- ui/pages/i18n.json.tmpl | 2 + ui/pages/storagepool-add-volume.html.tmpl | 4 +- 8 files changed, 107 insertions(+), 24 deletions(-) -- 2.1.0

2 7

[PATCH v3] Does not list non-bootable images
by Ramon Medeiros 01 Jun '15

01 Jun '15

Also fix tests that were using non-bootable isos. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v3: Fix errors listed by make check-local v2: Fix tests that were listing non-bootable isos --- src/kimchi/model/storagevolumes.py | 2 +- tests/test_rest.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 9165946..4cc3a0d 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -527,7 +527,7 @@ class IsoVolumesModel(object): for volume in volumes: res = self.storagevolume.lookup(pool_name, volume.decode("utf-8")) - if res['format'] == 'iso': + if res['format'] == 'iso' and res['bootable']: res['name'] = '%s' % volume iso_volumes.append(res) return iso_volumes diff --git a/tests/test_rest.py b/tests/test_rest.py index 72ff14f..7fe6831 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -61,12 +61,15 @@ def setUpModule(): # Create fake ISO to do the tests iso_gen.construct_fake_iso(fake_iso, True, '12.04', 'ubuntu') + iso_gen.construct_fake_iso("/var/lib/libvirt/images/fedora.iso", True, + "17", "fedora") def tearDownModule(): test_server.stop() os.unlink('/tmp/obj-store-test') os.unlink(fake_iso) + os.unlink("/var/lib/libvirt/images/fedora.iso") class RestTests(unittest.TestCase): @@ -928,9 +931,9 @@ class RestTests(unittest.TestCase): storagevolume['path']) self.assertEquals(1073741824, storagevolume['capacity']) # 1 GiB self.assertEquals(0, storagevolume['allocation']) - self.assertEquals('unknown', storagevolume['os_version']) - self.assertEquals('unknown', storagevolume['os_distro']) - self.assertEquals(False, storagevolume['bootable']) + self.assertEquals('17', storagevolume['os_version']) + self.assertEquals('fedora', storagevolume['os_distro']) + self.assertEquals(True, storagevolume['bootable']) # Create a template # In real model os distro/version can be omitted @@ -945,8 +948,8 @@ class RestTests(unittest.TestCase): # Verify the template t = json.loads(self.request('/templates/test').read()) self.assertEquals('test', t['name']) - self.assertEquals('unknown', t['os_distro']) - self.assertEquals('unknown', t['os_version']) + self.assertEquals('fedora', t['os_distro']) + self.assertEquals('17', t['os_version']) self.assertEquals(get_template_default('old', 'memory'), t['memory']) # Deactivate or destroy scan pool return 405 -- 2.1.0

2 1