April 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Disable Template when it has invalid parameters
by peterpnns＠gmail.com 05 May '16

05 May '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds a block behavior on the action to select invalid templates when creating a guest peterpennings (1): Disable Template when it has invalid parameters ui/css/kimchi.css | 28 ++++++++++++++++++--- ui/css/src/modules/_guests.scss | 6 +++++ ui/css/src/modules/_templates.scss | 18 +++++++++++--- ui/js/src/kimchi.guest_add_main.js | 8 ++++++ ui/js/src/kimchi.network_add_main.js | 48 +++++++++++++++++++++++++----------- ui/js/src/kimchi.template_main.js | 9 +++++-- ui/pages/guest-add.html.tmpl | 7 +++--- ui/pages/tabs/templates.html.tmpl | 6 +++-- 8 files changed, 102 insertions(+), 28 deletions(-) -- 2.5.0

2 4

Wok Debian/Ubuntu integration
by Frederic Bonnard 03 May '16

03 May '16

Hi, with the new version 2.1.0 of wok/kimchi/gingerbase, I updated my packaging. I'm still having a few issues and as there is a github issue concerning having wok related projects inside Ubuntu, I'd like to share some concerns so far. Here are the details : https://github.com/kimchi-project/wok/issues/25#issuecomment-211483696 - For the "relative URLs" issue, I've got some packages done and installed. Anyone could help on fixing those ? I've got a server I can give access to a wok developer, or I can send the .deb to someone willing to install them on his machine. - For the second issue, is it worth I send an updated patch against wok, or do you see other ways of doing to disable launching a specific instance of nginx ? F.

2 1

[PATCH v2] [Kimchi] Disable Template when it has invalid parameters
by sguimaraes943＠gmail.com 03 May '16

03 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds a block behavior on the action to select invalid templates when creating a guest peterpennings (1): Disable Template when it has invalid parameters Samuel Guimarães (1): Disable Template when it has invalid parameters v2: - Removed reference to kimchi.network_add_main.js - Fixed warning icon position in list and gallery views - Remoed tooltip when template is valid - Added front-end form validation when user attempts to save invalid storage pool (must apply "Enabled .has-feedback icons" patch sent to Wok first) - Added form control error class when template has invalid cdrom (reported issue #933 for vm-image not showing in invalid key) ui/css/kimchi.css | 97 ++++++++++++++++++++++++++++++++-- ui/css/src/modules/_guests.scss | 6 +++ ui/css/src/modules/_iso-list.scss | 22 +++++++- ui/css/src/modules/_templates.scss | 53 +++++++++++++++++-- ui/js/src/kimchi.guest_add_main.js | 7 +++ ui/js/src/kimchi.template_edit_main.js | 52 ++++++++++++++---- ui/js/src/kimchi.template_main.js | 9 +++- ui/pages/guest-add.html.tmpl | 11 ++-- ui/pages/i18n.json.tmpl | 1 + ui/pages/tabs/templates.html.tmpl | 24 +++++---- ui/pages/template-edit.html.tmpl | 6 ++- 11 files changed, 255 insertions(+), 33 deletions(-) -- 1.9.3

2 3

[PATCH] [Wok] Form validation: Enabled .has-feedback icons
by sguimaraes943＠gmail.com 02 May '16

02 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch enables Font-Awesome icons when a .from-group has .has-feedback and .has-error or .has-warning classes. This is required to "Disable Template when it has invalid parameters" v2 that will be sent in this list. Samuel Guimarães (1): Enabled .has-feedback icons ui/css/src/modules/_wok-forms.scss | 6 ++++++ ui/css/wok.css | 6 ++++++ 2 files changed, 12 insertions(+) -- 1.9.3

2 2

[PATCH][Wok] Sort user request log output
by Rodrigo Trujillo 30 Apr '16

30 Apr '16

There is an issue in user request log output when you have backup files in your system. The values from backup logs are included in the return list and showed before latest events. Then user has to use UI sort buttons in order to see what is happening. This patch sorts the output, ensuring that latest events will be returned on 'top' of the list and be showed firstly in the UI. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 1294be1..1145dbd 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -105,7 +105,9 @@ class RequestParser(object): filename = ".".join([self.baseFile, str(count + 1)]) records.extend(self.getRecordsFromFile(filename)) - return records + # Return ordered by latest events first + return sorted(records, key=lambda k: k['date'] + k['time'], + reverse=True) def getRecordsFromFile(self, filename): """ -- 2.1.0

3 2

[PATCH][Wok] Move local log path from 'log' to 'data/logs'
by Rodrigo Trujillo 30 Apr '16

30 Apr '16

When run wok from local build (not installed), use data/logs as the default log directory. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/config.py.in | 2 +- tests/test_config.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 6bc0c1e..0c3acdd 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -91,7 +91,7 @@ class Paths(object): else: self.nginx_conf_dir = self.add_prefix('src/nginx') self.state_dir = self.add_prefix('data') - self.log_dir = self.add_prefix('log') + self.log_dir = self.add_prefix('data/logs') self.conf_dir = self.add_prefix('src') self.src_dir = self.add_prefix('src/wok') self.plugins_dir = self.add_prefix('src/wok/plugins') diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 3020c53..1e7cc72 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -57,7 +57,7 @@ class ConfigTests(unittest.TestCase): Paths.get_prefix = lambda self: '/home/user/wok' paths = Paths() self.assertEquals(paths.state_dir, '/home/user/wok/data') - self.assertEquals(paths.log_dir, '/home/user/wok/log') + self.assertEquals(paths.log_dir, '/home/user/wok/data/logs') self.assertEquals(paths.conf_dir, '/home/user/wok/src') self.assertEquals(paths.src_dir, '/home/user/wok/src/wok') self.assertEquals(paths.plugins_dir, '/home/user/wok/src/wok/plugins') -- 2.1.0

3 2

[PATCH][Kimchi] Fix logging and error messages in objectstore upgrade
by Rodrigo Trujillo 30 Apr '16

30 Apr '16

There are bugs in excepts in objectstore upgrade functions: - wok_log is in wrong position, after raise, and is never called; - log message misses '%s' operator Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils.py b/utils.py index 3837e74..c4cd07d 100644 --- a/utils.py +++ b/utils.py @@ -111,8 +111,8 @@ def upgrade_objectstore_data(item, old_uri, new_uri): except sqlite3.Error, e: if conn: conn.rollback() + wok_log.error("Error while upgrading objectstore data: %s", e.args[0]) raise OperationFailed("KCHUTILS0006E") - wok_log.error("Error while upgrading objectstore data:", e.args[0]) finally: if conn: conn.close() @@ -157,8 +157,8 @@ def upgrade_objectstore_template_disks(libv_conn): except sqlite3.Error, e: if conn: conn.rollback() + wok_log.error("Error while upgrading objectstore data: %s", e.args[0]) raise OperationFailed("KCHUTILS0006E") - wok_log.error("Error while upgrading objectstore data:", e.args[0]) finally: if conn: conn.close() @@ -200,8 +200,8 @@ def upgrade_objectstore_memory(): except sqlite3.Error, e: if conn: conn.rollback() + wok_log.error("Error while upgrading objectstore data: %s", e.args[0]) raise OperationFailed("KCHUTILS0006E") - wok_log.error("Error while upgrading objectstore data:", e.args[0]) finally: if conn: conn.close() -- 2.1.0

3 2

[PATCH v3] [Wok] Changes in wok.list.js widget to allow multiple selection
by sguimaraes943＠gmail.com 28 Apr '16

28 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates wok.list.js widget to allow multiple selection in Debug Reports and Repositories in Gingerbase. Another patch was sent to Ginger Dev List covering the changes necessary. This patch also includes changes in Wok SCSS and CSS aiming accessibility and responsive design. v2 - Displays checkbox on all screen sizes and platforms. Fixed spinner icon position when generating a new log. v3 - Fixed spinner position in desktop. Samuel Guimarães (1): Changes in wok.list.js widget to allow multiple selection ui/css/bootstrap.custom.css | 8 +- ui/css/src/modules/_buttons.scss | 8 ++ ui/css/src/modules/_wok-forms.scss | 1 + ui/css/src/modules/_wok-grid.scss | 250 +++++++++++++++++++++++++++----- ui/css/src/modules/_wok-variables.scss | 4 +- ui/css/wok.css | 254 ++++++++++++++++++++++++++++----- ui/js/src/wok.list.js | 174 +++++++++++----------- 7 files changed, 531 insertions(+), 168 deletions(-) -- 1.9.3

3 4

[PATCH v3] [Wok] Changes in wok.list.js widget to allow multiple selection
by sguimaraes943＠gmail.com 28 Apr '16

28 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates wok.list.js widget to allow multiple selection in Debug Reports and Repositories in Gingerbase. Another patch was sent to Ginger Dev List covering the changes necessary. This patch also includes changes in Wok SCSS and CSS aiming accessibility and responsive design. v2 - Displays checkbox on all screen sizes and platforms. Fixed spinner icon position when generating a new log. v3 - Fixed spinner position in desktop. Samuel Guimarães (1): Changes in wok.list.js widget to allow multiple selection ui/css/bootstrap.custom.css | 8 +- ui/css/src/modules/_buttons.scss | 8 ++ ui/css/src/modules/_wok-forms.scss | 1 + ui/css/src/modules/_wok-grid.scss | 250 +++++++++++++++++++++++++++----- ui/css/src/modules/_wok-variables.scss | 4 +- ui/css/wok.css | 254 ++++++++++++++++++++++++++++----- ui/js/src/wok.list.js | 174 +++++++++++----------- 7 files changed, 531 insertions(+), 168 deletions(-) -- 1.9.3

2 2

[RFC] Issue 201 - Kimchi should handle libvirt connection failures
by Paulo Ricardo Paz Vital 28 Apr '16

28 Apr '16

Today, Kimchi (and Ginger) has a strong dependency with Libvirt, well described in the kimchid.service.{fedora,ubuntu} file that extends the wokd.service configuration to make it dependent of libvirt service. The current configuration stops wokd service automatically if libvirt service is stopped. To prevent wokd to stop automatically if libvirt stops, a new configuration must be set up and loaded, making wokd service still available to user. This is the easiest part to solve this issue. The real issue is that most of the Kimchi operations need to connect to libvirt service and the current implementation, simple stops the cherrypy server if a connection is not available (after 10 seconds trying to connect), causing a "502 bad gateway" error from NGINX. With this implementation from Kimchi, Wok and GingerBase (and Ginger if installed) will not be available to user even though they don't depend on the libvirt service. Basically, the proposal to solve the issue is: 1) Modify the kimchid.service.{fedora,ubuntu} files to "reduce" the dependency on libvirt service while wokd is already running - none change will modify the start up dependency; and 2) Modify how Kimchi handle the missing libvirt connection to no stop the cherrypy server and provide information to user by Virtualization tab and its sub-tabs, keeping all other plugins enabled and operating. Feel free to make any suggestion. Patches will be submitted by the end of this week. Thanks and best regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

3 6

[Wok][RFC] Issue 104 Multi-culture support for formatting numbers and datetime
by Pooja Kulkarni 28 Apr '16

28 Apr '16

Hi Team, In order to provide multi-culture support, we must format the numbers and datetime data as per the user's locale. For example, when a french user selects the UI language as English, he/she must still see the numbers and datetime in french format. The user's locale may be obtained in two ways: 1. Fetch the language setting of user's browser: This approach involves fetching the language setting of user's browser either by using 'accept-language' header that is sent to the server or navigator.language 2. Have another drop down menu for user's locale: This approach involves having two drop down menus, one for the translation language and another for the locale. The locale drop down menu can contain languages that may or may not be included in the translation language drop down menu. By default, the language selected in the translation drop down can be selected in the locale drop down as well. However, the first approach is not reliable and may vary from one browser to another (some may not support navigator method). So I would prefer the second approach. Any thoughts or comments? Regards Pooja

2 1

[PATCH v2] [Wok] Changes in wok.list.js widget to allow multiple selection
by sguimaraes943＠gmail.com 28 Apr '16

28 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates wok.list.js widget to allow multiple selection in Debug Reports and Repositories in Gingerbase. Another patch was sent to Ginger Dev List covering the changes necessary. This patch also includes changes in Wok SCSS and CSS aiming accessibility and responsive design. v2 - Displays checkbox on all screen sizes and platforms. Fixed spinner icon position when generating a new log. No need to update patch sent to Gingerbase mailing list for now. Samuel Guimarães (1): Changes in wok.list.js widget to allow multiple selection ui/css/bootstrap.custom.css | 8 +- ui/css/src/modules/_buttons.scss | 8 ++ ui/css/src/modules/_wok-forms.scss | 1 + ui/css/src/modules/_wok-grid.scss | 250 +++++++++++++++++++++++++++----- ui/css/src/modules/_wok-variables.scss | 4 +- ui/css/wok.css | 254 ++++++++++++++++++++++++++++----- ui/js/src/wok.list.js | 174 +++++++++++----------- 7 files changed, 531 insertions(+), 168 deletions(-) -- 1.9.3

3 3

[PATCH ][Wok]Issue # 317 : Ginger should NOT depeden on
by atreyee＠linux.vnet.ibm.com 28 Apr '16

28 Apr '16

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This change will make any plugin UI extended by another. Gingers390x related changes will be imported dynamically to ginger when ginger390x plugin is installed. Atreyee Mukhopadhyay (1): Issue # 317: Ginger should NOT depeden on Ginger s390x src/wok/root.py | 8 ++++++++ src/wok/template.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.1.0

3 4

[PATCH V6] [Kimchi 0/4] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 27 Apr '16

27 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V6: * Make sure only valid information is stored in objectstore * Modified VMTemplate constructor to receive one new argument: netboot=False V5: * Improved the changes in API for source_media * Added two new test cases * Updated UI to reflect the changes in template API V4: * Changed API of source_media to be a dictionary with type and path * Adapted source code to the new API V3: * set network as third default option to boot order V2: * Adapted patch to new template API (automatic detection of cdrom) V1: This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. Reference: http://miud.in/1Ht3 To test, use the curl commands (look the parameters used): $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot", "source_media": {"type": "netboot", "path": "/var/lib/libvirt/images/netboot"}}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":null, "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":{ "current":1024, "maxmemory":1024 }, "folder":[] } $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"Provisioning storages for new VM", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } $ sudo virsh dumpxml 1netboot-test <domain type='kvm'> <name>1netboot-test</name> <uuid>5c9fa5b3-3203-4c93-92d6-2b4103fe7b40</uuid> <metadata> <kimchi:metadata xmlns:kimchi="https://github.com/kimchi-project/kimchi"> <kimchi:os version="unknown" distro="unknown"/> </kimchi:metadata> </metadata> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <memtune> <hard_limit unit='KiB'>2097152</hard_limit> </memtune> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-i440fx-2.4'>hvm</type> <boot dev='hd'/> <boot dev='cdrom'/> <boot dev='network'/> </os> <acpi/> <apic/> <pae/> </features> <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/5c9fa5b3-3203-4c93-92d6-2b4103fe7b40-0.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:ea:7e:ad'/> <source network='default'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <sound model='ich6'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> Paulo Vital (4): Add support to create netboot templates. Add support to create guests to netboot. Update test cases to support netboot. Update UI to reflect modifications in template API API.json | 18 +++++-- model/templates.py | 16 +++++- tests/test_authorization.py | 4 +- tests/test_mockmodel.py | 15 ++++-- tests/test_model.py | 73 ++++++++++++++++++++------- tests/test_rest.py | 95 ++++++++++++++++++++++++++++++----- tests/test_template.py | 53 ++++++++++++++----- tests/test_vmtemplate.py | 17 +++++++ ui/js/src/kimchi.template_add_main.js | 4 +- vmtemplate.py | 39 ++++++++------ xmlutils/bootorder.py | 39 ++++++++++++++ 11 files changed, 304 insertions(+), 69 deletions(-) create mode 100644 xmlutils/bootorder.py -- 2.5.5

2 5

[PATCH][Kimchi] Issue #931 Error when editing a template created using a disk image
by Ramon Medeiros 27 Apr '16

27 Apr '16

UI wasn't passing path to image disk when updating it, so the backend was losing the disk. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index de72452..8b5abfb 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -20,6 +20,7 @@ kimchi.template_edit_main = function() { var origDisks; var origNetworks; var templateDiskSize; + var baseImageTemplate; $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) { $('.tab-content').css('overflow','hidden'); @@ -89,6 +90,7 @@ kimchi.template_edit_main = function() { } return false; } + baseImageTemplate = isImageBasedTemplate; enableSpice(); $('#template-edit-graphics').selectpicker(); @@ -334,7 +336,9 @@ kimchi.template_edit_main = function() { var data = {}; var disks = $('.template-tab-body .item', '#form-template-storage'); var disksForUpdate = new Array(); + $.each(disks, function(index, diskEntity) { + var newDisk = { 'index' : index, 'pool' : {'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val()}, @@ -342,6 +346,11 @@ kimchi.template_edit_main = function() { 'format' : $(diskEntity).find('.template-storage-disk-format').val() }; + // image based template: add base to dictionary + if ((baseImageTemplate()) && (index == 0)) { + newDisk["base"] = $('#template-edit-vmimage-textbox').val(); + } + var storageType = $(diskEntity).find('.template-storage-type').val(); if(storageType === 'iscsi' || storageType === 'scsi') { newDisk['volume'] = newDisk['pool']['name'].split('/').pop(); -- 2.5.5

3 2

[PATCH] [Kimchi] Do not use systemd private tmp dir
by Jose Ricardo Ziviani 27 Apr '16

27 Apr '16

- systemd improves daemon security by creating an isolated tmp directory, however it breaks programs that are not yet aware and, in Kimchi particular case, all directories created under tmp are randomized, meaning that a possible attacker cannot easily guess which file/dir will be created beforehand. https://access.redhat.com/blogs/766093/posts/1976243 Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- contrib/kimchid.service.fedora | 2 +- contrib/kimchid.service.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/kimchid.service.fedora b/contrib/kimchid.service.fedora index cd8e137..d7b10d2 100644 --- a/contrib/kimchid.service.fedora +++ b/contrib/kimchid.service.fedora @@ -4,4 +4,4 @@ After=libvirtd.service wokd.service [Service] Nice=0 -PrivateTmp=yes +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu index 1c7d63f..f865987 100644 --- a/contrib/kimchid.service.ubuntu +++ b/contrib/kimchid.service.ubuntu @@ -4,4 +4,4 @@ After=libvirt-bin.service wokd.service [Service] Nice=0 -PrivateTmp=yes +PrivateTmp=no -- 2.7.4

2 1

[PATCH] [Kimchi] Make libguestfs uses direct backend instead of libvirt
by Jose Ricardo Ziviani 27 Apr '16

27 Apr '16

- there is an issue regarding libvirt socket permissions that make libguestfs fails when trying to access an image. If libguestfs access the same image directly, instead of using libvirt, it works. http://libguestfs.org/guestfs-faq.1.html Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- imageinfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/imageinfo.py b/imageinfo.py index 8874917..5a25bb7 100644 --- a/imageinfo.py +++ b/imageinfo.py @@ -50,6 +50,7 @@ def probe_image(image_path): g = guestfs.GuestFS(python_return_dict=True) g.add_drive_opts(image_path, readonly=1) + g.set_backend('direct') g.launch() try: roots = g.inspect_os() -- 2.7.4

2 2

[PATCH] [Wok] Changes in wok.list.js widget to allow multiple selection
by sguimaraes943＠gmail.com 27 Apr '16

27 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates wok.list.js widget to allow multiple selection in Debug Reports and Repositories in Gingerbase. Another patch was sent to Ginger Dev List covering the changes necessary. This patch also includes changes in Wok SCSS and CSS aiming accessibility and responsive design. Samuel Guimarães (1): Changes in wok.list.js widget to allow multiple selection ui/css/bootstrap.custom.css | 8 +- ui/css/src/modules/_buttons.scss | 8 + ui/css/src/modules/_wok-forms.scss | 1 + ui/css/src/modules/_wok-grid.scss | 254 +++++++++++++++++++++++++++----- ui/css/src/modules/_wok-variables.scss | 4 +- ui/css/wok.css | 257 ++++++++++++++++++++++++++++----- ui/js/src/wok.list.js | 174 +++++++++++----------- 7 files changed, 538 insertions(+), 168 deletions(-) -- 1.9.3

4 5

[PATCH V5] [Kimchi 0/4] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 27 Apr '16

27 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V5: * Improved the changes in API for source_media * Added two new test cases * Updated UI to reflect the changes in template API V4: * Changed API of source_media to be a dictionary with type and path * Adapted source code to the new API V3: * set network as third default option to boot order V2: * Adapted patch to new template API (automatic detection of cdrom) V1: This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. Reference: http://miud.in/1Ht3 To test, use the curl commands (look the parameters used): $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot", "source_media": {"type": "netboot", "path": "/var/lib/libvirt/images/netboot"}}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":null, "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":{ "current":1024, "maxmemory":1024 }, "folder":[] } $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"Provisioning storages for new VM", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } $ sudo virsh dumpxml 1netboot-test <domain type='kvm'> <name>1netboot-test</name> <uuid>5c9fa5b3-3203-4c93-92d6-2b4103fe7b40</uuid> <metadata> <kimchi:metadata xmlns:kimchi="https://github.com/kimchi-project/kimchi"> <kimchi:os version="unknown" distro="unknown"/> </kimchi:metadata> </metadata> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <memtune> <hard_limit unit='KiB'>2097152</hard_limit> </memtune> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-i440fx-2.4'>hvm</type> <boot dev='hd'/> <boot dev='cdrom'/> <boot dev='network'/> </os> <acpi/> <apic/> <pae/> </features> <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/5c9fa5b3-3203-4c93-92d6-2b4103fe7b40-0.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:ea:7e:ad'/> <source network='default'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <sound model='ich6'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> Paulo Vital (4): Add support to create netboot templates. Add support to create guests to netboot. Update test cases to support netboot. Update UI to reflect modifications in template API API.json | 18 +++++-- model/templates.py | 14 +++++- tests/test_authorization.py | 4 +- tests/test_mockmodel.py | 15 ++++-- tests/test_model.py | 73 ++++++++++++++++++++------- tests/test_rest.py | 95 ++++++++++++++++++++++++++++++----- tests/test_template.py | 53 ++++++++++++++----- tests/test_vmtemplate.py | 18 +++++++ ui/js/src/kimchi.template_add_main.js | 4 +- vmtemplate.py | 28 +++++++---- xmlutils/bootorder.py | 39 ++++++++++++++ 11 files changed, 298 insertions(+), 63 deletions(-) create mode 100644 xmlutils/bootorder.py -- 2.5.5

4 8

[PATCH] [Kimchi 0/2] Add VEPA network tests
by Lucio Correia 26 Apr '16

26 Apr '16

Lucio Correia (2): Update mockmodel to have one more NIC available Add VEPA network tests mockmodel.py | 41 ++++++++++++++++++++++++++++++++++++++++- tests/test_mock_network.py | 13 +++++++++++++ tests/test_model_network.py | 2 ++ 3 files changed, 55 insertions(+), 1 deletion(-) -- 1.9.1

2 4

[PATCH v2][Kimchi] Issue #931 Error when editing a template created using a disk image
by Ramon Medeiros 26 Apr '16

26 Apr '16

UI wasn't passing path to image disk when updating it, so the backend was losing the disk. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Put result from isImageBasedTemplate() in a variable, instead of pass the pointer to the function ui/js/src/kimchi.template_edit_main.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index de72452..bc3c2ef 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -20,6 +20,7 @@ kimchi.template_edit_main = function() { var origDisks; var origNetworks; var templateDiskSize; + var baseImageTemplate; $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) { $('.tab-content').css('overflow','hidden'); @@ -89,6 +90,7 @@ kimchi.template_edit_main = function() { } return false; } + baseImageTemplate = isImageBasedTemplate(); enableSpice(); $('#template-edit-graphics').selectpicker(); @@ -342,6 +344,11 @@ kimchi.template_edit_main = function() { 'format' : $(diskEntity).find('.template-storage-disk-format').val() }; + // image based template: add base to dictionary + if ((baseImageTemplate) && (index == 0)) { + newDisk["base"] = $('#template-edit-vmimage-textbox').val(); + } + var storageType = $(diskEntity).find('.template-storage-type').val(); if(storageType === 'iscsi' || storageType === 'scsi') { newDisk['volume'] = newDisk['pool']['name'].split('/').pop(); -- 2.5.5

2 1

[PATCH][Kimchi] Fix typo and integer values validation in Guest edit UI
by Rodrigo Trujillo 26 Apr '16

26 Apr '16

- UI was measuring string values instead of integer values, this was causing errors; - Changes typo in error return: thEn by thAn. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 4 ++-- ui/pages/i18n.json.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index ef6d650..66edbcb 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -746,14 +746,14 @@ kimchi.guest_edit_main = function() { } // Test memory values before submit. Avoid requests we know are going to fail - if ($('#guest-edit-memory-textbox').val() > $('#guest-edit-max-memory-textbox').val()) { + if (parseInt($('#guest-edit-memory-textbox').val()) > parseInt($('#guest-edit-max-memory-textbox').val())) { wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); $(saveButton).prop('disabled', false); return; } // Test CPU values before submit. Avoid requests we know are going to fail - if ($('#guest-edit-cores-textbox').val() > $('#guest-edit-max-processor-textbox').val()) { + if (parseInt($('#guest-edit-cores-textbox').val()) > parseInt($('#guest-edit-max-processor-textbox').val())) { wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); $(saveButton).prop('disabled', false); return; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index cb7b2a8..8da568a 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -66,8 +66,8 @@ "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", - "KCHVM0002E": "$_("Memory value cannot be higher then Max Memory value")", - "KCHVM0003E": "$_("Current CPUs value cannot be higher then Max CPU value")", + "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", + "KCHVM0003E": "$_("Current CPUs value cannot be higher than Max CPU value")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6003M": "$_("Attaching...")", -- 2.1.0

3 3

[PATCH] [Kimchi] Bug fix: Convert CPU and memory values to number before doing any data validation
by Aline Manera 26 Apr '16

26 Apr '16

The value entered for CPUs must not be greater than maximum CPUs value; and the value entered for memory must not be greater than the maximum memory value. But the input boxes return the data in string format which may cause issues while doing data validation. So convert the inputed values to number to do the input validation. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index ef6d650..47c8422 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -746,17 +746,25 @@ kimchi.guest_edit_main = function() { } // Test memory values before submit. Avoid requests we know are going to fail - if ($('#guest-edit-memory-textbox').val() > $('#guest-edit-max-memory-textbox').val()) { - wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; + var memValue = Number($('#guest-edit-memory-textbox').val()); + var maxmemValue = Number($('#guest-edit-max-memory-textbox').val()); + if (memValue !== undefined && memValue !== "" && maxmemValue !== undefined && maxmemValue !== "") { + if (memValue > maxmemValue) { + wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } } // Test CPU values before submit. Avoid requests we know are going to fail - if ($('#guest-edit-cores-textbox').val() > $('#guest-edit-max-processor-textbox').val()) { - wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; + var coresValue = Number($('#guest-edit-cores-textbox').val()); + var maxprocessorValue = Number($('#guest-edit-max-processor-textbox').val()); + if (coresValue !== undefined && coresValue !== "" && maxprocessorValue !== undefined && maxprocessorValue !== "") { + if (coresValue > maxprocessorValue) { + wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } } if (data['vcpus'] !== undefined) { -- 2.5.5

2 2

[PATCH][Wok] Return collection list without resource with lookup problems
by Rodrigo Trujillo 25 Apr '16

25 Apr '16

When a collection receives a GET request, it is going to fetch all resources names, in a list, and perform a lookup for each resource, building the return list with all data. There is a potencial race condition problem in this approach. If a given resource is removed between list of names creation and its lookup call, wok is going to fail and the exception is not treated. This patch fix this problem catching the exception, logging the problem and completing the GET request. So, the resource with problem is discarted and other resources are returned. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 7aeb844..f314d18 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -34,7 +34,7 @@ from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError from wok.exception import OperationFailed, UnauthorizedError, WokException from wok.reqlogger import RequestRecord -from wok.utils import get_plugin_from_request, utf8_dict +from wok.utils import get_plugin_from_request, utf8_dict, wok_log # Default request log messages @@ -364,7 +364,14 @@ class Collection(object): # internal text, get_list changes ident to unicode for sorted args = self.resource_args + [ident] res = self.resource(self.model, *args) - res.lookup() + try: + res.lookup() + except Exception as e: + # In case of errors when fetching a resource info, pass and + # log the error, so, other resources are returned + wok_log.error("Problem in lookup of resource '%s'. " + "Detail: %s" % (ident, e.message)) + continue res_list.append(res) return res_list except AttributeError: -- 2.1.0

3 2

[PATCH] [Wok] Added utils method for handling locale based formating of number along with Measurement format.
by archus＠linux.vnet.ibm.com 25 Apr '16

25 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added formatNumber method which set the passed locale to method and does formatting of number, and revert back the locale setting. Added formatMeasurement method which format number measurement also format as per locale. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 0e8ec05..b37518f 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -33,6 +33,7 @@ import subprocess import sys import traceback import xml.etree.ElementTree as ET +import locale from cherrypy.lib.reprconf import Parser from datetime import datetime, timedelta @@ -646,3 +647,90 @@ def decode_value(val): if not isinstance(val, unicode): val = val.decode('utf-8') return val + + +def formatMeasurement(number, settings): + ''' + Refer to "Units of information" ( + http://en.wikipedia.org/wiki/Units_of_information + ) for more information about measurement units. + + @param number The number to be normalized. + @param settings + base Measurement base, accepts 2 or 10. defaults to 2. + unit The unit of the measurement, e.g., B, Bytes/s, bps, etc. + fixed The number of digits after the decimal point. + locale The locale for formating the number if not passed + format is done as per current locale. + @returns [object] + v The number part of the measurement. + s The suffix part of the measurement including multiple and unit. + e.g., kB/s means 1000B/s, KiB/s for 1024B/s. + ''' + unitBaseMapping = {2: [{"us": 'Ki', "v": 1024}, + {"us": 'Mi', "v": 1048576}, + {"us": 'Gi', "v": 1073741824}, + {"us": 'Ti', "v": 1099511627776}, + {"us": 'Pi', "v": 1125899906842624}], + 10: [{"us": 'k', "v": 1000}, + {"us": 'M', "v": 1000000}, + {"us": 'G', "v": 1000000000}, + {"us": 'T', "v": 1000000000000}, + {"us": 'P', "v": 1000000000000000}]} + + if(not number): + return number + settings = settings or {} + unit = settings['unit'] if 'unit' in settings else 'B' + base = settings['base'] if 'base' in settings else 2 + + new_locale = settings['locale'] if 'locale' in settings else '' + + if(base != 2 and base != 10): + return encode_value(number) + unit + + fixed = settings['fixed'] + + unitMapping = unitBaseMapping[base] + for mapping in reversed(unitMapping): + suffix = mapping['us'] + startingValue = mapping['v'] + if(number < startingValue): + continue + + formatted = float(number) / startingValue + formatted = formatNumber(formatted, fixed, new_locale) + return formatted + suffix + unit + + formatted_number = formatNumber(number, fixed, new_locale) + return formatted_number+unit + + +def formatNumber(number, fixed, format_locale): + ''' + Format the number based on format_locale passed. + ''' + + # get the current locale + current_locale = locale.getlocale() + new_locale = '' + # set passed locale and set new_locale to same value. + if format_locale: + new_locale = locale.setlocale(locale.LC_ALL, format_locale) + + # Based on type of number use the correct formatter + if isinstance(number, float): + if fixed: + formatted = locale.format('%' + '.%df' % fixed, number, True) + else: + formatted = locale.format('%f', number, True) + if isinstance(number, int): + formatted = locale.format('%d', number, True) + # After formatting is done as per locale, reset the locale if changed. + if (new_locale and not current_locale[0] and not current_locale[1]): + locale.setlocale(locale.LC_ALL, 'C') + elif (new_locale): + locale.setlocale(locale.LC_ALL, current_locale[0] + "." + + current_locale[1]) + + return formatted -- 2.5.0

3 2

[RFC] [Kimchi] Add support to edit virtual networks
by Lucio Correia 25 Apr '16

25 Apr '16

Edit virtual network feature Pre-requisite: - Virtual network is stopped - Virtual network "default" is not editable *** BACKEND *** ### Resource: Network **URI:** /plugins/kimchi/networks/*:name* **Methods:** * **UPDATE**: Update a Network * name: The name of the Network * subnet: Network segment in slash-separated format with ip address and prefix * dhcp: DHCP services on the virtual network is enabled. * start: start boundary of a pool of addresses to be provided to DHCP clients. * end: end boundary of a pool of addresses to be provided to DHCP clients. * interfaces: An array of bridge network interfaces that belongs to this network All traffic on this network will be bridged through the first interface. The interface is a bridge or ethernet/bonding device. * vlan ID Not all attributes are required for all networks types. *** FRONTEND *** * Add new option Edit to Actions menu under Virtualization/Network tab, enabled only for stopped networks * When clicked, this option will open a new window for editing that virtual network, with the following fields. Based on network type, some of below fields may be disabled: Type: just a label describing the network type, not changeable. Name: all types of virtual network can be renamed Interfaces: attach/detach interfaces (enabled for VEPA) or change interface (for macvtap, bridged) Subnet/DHCP range: two IP fields: start, end (enabled for NAT, isolated) VLAN id: integer field (enabled for bridged networks) -- Lucio Correia Software Engineer IBM LTC Brazil

5 11

[PATCH V4] [Kimchi 0/3] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 25 Apr '16

25 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V4: * Changed API of source_media to be a dictionary with type and path * Adapted source code to the new API V3: * set network as third default option to boot order V2: * Adapted patch to new template API (automatic detection of cdrom) V1: This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. Reference: http://miud.in/1Ht3 To test, use the curl commands (look the parameters used): $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot", "source_media": {"type": "netboot", "path": "/var/lib/libvirt/images/netboot"}}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":null, "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":{ "current":1024, "maxmemory":1024 }, "folder":[] } $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"Provisioning storages for new VM", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } $ sudo virsh dumpxml 1netboot-test <domain type='kvm'> <name>1netboot-test</name> <uuid>5c9fa5b3-3203-4c93-92d6-2b4103fe7b40</uuid> <metadata> <kimchi:metadata xmlns:kimchi="https://github.com/kimchi-project/kimchi"> <kimchi:os version="unknown" distro="unknown"/> </kimchi:metadata> </metadata> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <memtune> <hard_limit unit='KiB'>2097152</hard_limit> </memtune> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-i440fx-2.4'>hvm</type> <boot dev='hd'/> <boot dev='cdrom'/> <boot dev='network'/> </os> <acpi/> <apic/> <pae/> </features> <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/5c9fa5b3-3203-4c93-92d6-2b4103fe7b40-0.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:ea:7e:ad'/> <source network='default'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <sound model='ich6'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> Paulo Vital (3): Add support to create netboot templates. Add support to create guests to netboot. Update test cases to support netboot. API.json | 18 +++++++++++---- i18n.py | 1 + model/templates.py | 27 ++++++++++++++++++++--- tests/test_authorization.py | 4 +++- tests/test_mockmodel.py | 15 ++++++++----- tests/test_model.py | 43 +++++++++++++++++++++--------------- tests/test_rest.py | 37 +++++++++++++++++++++---------- tests/test_template.py | 53 ++++++++++++++++++++++++++++++++++----------- tests/test_vmtemplate.py | 18 +++++++++++++++ vmtemplate.py | 28 ++++++++++++++++-------- xmlutils/bootorder.py | 39 +++++++++++++++++++++++++++++++++ 11 files changed, 219 insertions(+), 64 deletions(-) create mode 100644 xmlutils/bootorder.py -- 2.5.5

3 7

[PATCH][Kimchi] Add error message when empty disks list is passed in Template edit API
by Rodrigo Trujillo 25 Apr '16

25 Apr '16

If user gives an empty disk list "[]" when editing a Template, the json schema is going to return a standard error that has not useful meaning to end user. This patch adds a more meaningful error message. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- API.json | 3 ++- i18n.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/API.json b/API.json index 5ef4f55..380ed19 100644 --- a/API.json +++ b/API.json @@ -714,7 +714,8 @@ } }, "minItems": 1, - "uniqueItems": true + "uniqueItems": true, + "error": "KCHTMPL0033E" }, "networks": { "description": "list of which networks will be assigned to the new VM.", diff --git a/i18n.py b/i18n.py index 9a3f4a1..39f5e57 100644 --- a/i18n.py +++ b/i18n.py @@ -183,6 +183,7 @@ messages = { "KCHTMPL0030E": _("Memory expects an object with one or both parameters: 'current' and 'maxmemory'"), "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), + "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), -- 2.1.0

2 1

[PATCH] [Kimchi] Move capabilities to model constructor
by Jose Ricardo Ziviani 25 Apr '16

25 Apr '16

- This commit moves the capabilities to the class constructor to improve the speed. Only capabilities that depends on the server up will be left on cherrypy subscription. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/config.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/model/config.py b/model/config.py index f5d2792..39e4efa 100644 --- a/model/config.py +++ b/model/config.py @@ -56,10 +56,12 @@ class CapabilitiesModel(object): self.nm_running = False self.mem_hotplug_support = False + # run feature tests + self._set_capabilities() + # Subscribe function to set host capabilities to be run when cherrypy - # server is up - # It is needed because some features tests depends on the server - cherrypy.engine.subscribe('start', self._set_capabilities) + # server is up for features that depends on the server + cherrypy.engine.subscribe('start', self._set_depend_capabilities) # Subscribe function to clean any Kimchi leftovers cherrypy.engine.subscribe('stop', self._clean_leftovers) @@ -83,21 +85,27 @@ class CapabilitiesModel(object): FeatureTests.enable_libvirt_error_logging() - def _set_capabilities(self): - wok_log.info("*** Running feature tests ***") + def _set_depend_capabilities(self): + wok_log.info("*** Running dependable feature tests ***") conn = self.conn.get() self.qemu_stream = FeatureTests.qemu_supports_iso_stream() - self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn) - self.fc_host_support = FeatureTests.libvirt_support_fc_host(conn) - self.kernel_vfio = FeatureTests.kernel_support_vfio() - self.nm_running = FeatureTests.is_nm_running() - self.mem_hotplug_support = FeatureTests.has_mem_hotplug_support(conn) self.libvirt_stream_protocols = [] for p in ['http', 'https', 'ftp', 'ftps', 'tftp']: if FeatureTests.libvirt_supports_iso_stream(conn, p): self.libvirt_stream_protocols.append(p) + wok_log.info("*** Dependable feature tests completed ***") + _set_depend_capabilities.priority = 90 + + def _set_capabilities(self): + wok_log.info("*** Running feature tests ***") + conn = self.conn.get() + self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn) + self.fc_host_support = FeatureTests.libvirt_support_fc_host(conn) + self.kernel_vfio = FeatureTests.kernel_support_vfio() + self.nm_running = FeatureTests.is_nm_running() + self.mem_hotplug_support = FeatureTests.has_mem_hotplug_support(conn) wok_log.info("*** Feature tests completed ***") _set_capabilities.priority = 90 -- 1.9.1

2 1

[PATCH] [Kimchi] Change nfs host from localhost to 127.0.0.1
by Jose Ricardo Ziviani 25 Apr '16

25 Apr '16

- Using localhost was making the feature test too slow, due to use IPv6 by default in systems that has IPv6 enabled but not properly configured. For example, strace shows several attempts to send data to a socket, being droped when timed out: sendto(4, "W\34\326\267\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\4\0\0\0\3\0\0\0\0\0\0\0\0"..., 84, 0, {sa_family=AF_INET6, sin6_port=htons(111), inet_pton(AF_INET6, "::1", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 84 poll([{fd=4, events=POLLIN}], 1, 15000) = 0 (Timeout) sendto(4, "W\34\326\267\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\4\0\0\0\3\0\0\0\0\0\0\0\0"..., 84, 0, {sa_family=AF_INET6, sin6_port=htons(111), inet_pton(AF_INET6, "::1", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 84 poll([{fd=4, events=POLLIN}], 1, 15000) = 0 (Timeout) sendto(4, "W\34\326\267\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\4\0\0\0\3\0\0\0\0\0\0\0\0"..., 84, 0, {sa_family=AF_INET6, sin6_port=htons(111), inet_pton(AF_INET6, "::1", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 84 poll([{fd=4, events=POLLIN}], 1, 15000) = 0 (Timeout) sendto(4, "W\34\326\267\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\4\0\0\0\3\0\0\0\0\0\0\0\0"..., 84, 0, {sa_family=AF_INET6, sin6_port=htons(111), inet_pton(AF_INET6, "::1", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 84 poll([{fd=4, events=POLLIN}], 1, 15000) = 0 (Timeout) Both cases are similar: * showmount --no-headers --exports localhost * showmount --no-headers --exports ::1 So, passing 127.0.0.1 we are explicitly requiring a IPv4 connection and that will speed up the feature test *as well as* return the correct result, not a simply timeout: sendto(4, "W\37\256\365\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\2\0\0\0\3\0\0\0\0\0\0\0\0"..., 56, 0, {sa_family=AF_INET, sin_port=htons(111), sin_addr=inet_addr("127.0.0.1")}, 16) = 56 poll([{fd=4, events=POLLIN}], 1, 15000) = 1 ([{fd=4, revents=POLLERR}]) recvmsg(4, {msg_name(16)={sa_family=AF_INET, sin_port=htons(111), sin_addr=inet_addr("127.0.0.1")}, msg_iov(1)=[{"W\37\256\365\0\0\0\0\0\0\0\2\0\1\206\240\0\0\0\2\0\0\0\3\0\0\0\0\0\0\0\0"..., 56}], msg_controllen=48, [{cmsg_len=48, cmsg_level=SOL_IP, cmsg_type=IP_RECVERR, {ee_errno=111, ee_origin=2, ee_type=3, ee_code=3, ee_info=0, ee_data=0, offender={sa_family=AF_INET, sin_port=htons(0), sin_addr=inet_addr("127.0.0.1")}}}], msg_flags=MSG_ERRQUEUE}, MSG_ERRQUEUE) = 56 Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/featuretests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/featuretests.py b/model/featuretests.py index 23e7eeb..2b680c3 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -148,7 +148,7 @@ class FeatureTests(object): @staticmethod def libvirt_support_nfs_probe(conn): def _get_xml(): - obj = E.source(E.host(name='localhost'), E.format(type='nfs')) + obj = E.source(E.host(name='127.0.0.1'), E.format(type='nfs')) xml = ET.tostring(obj) return xml try: -- 1.9.1

2 1

[PATCH][Kimchi] Avoid race condition in vm lookup
by Rodrigo Trujillo 25 Apr '16

25 Apr '16

In guest lookup, libvirt domain is instanciated and then a info() function is called, but it is possible that the guest be removed between these two operations, raising an exception that is not treated. This patch fix this issue, catching the exception, logging and returning the correct error to the request. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 4f5d442..780e578 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1272,7 +1272,15 @@ class VMModel(object): def lookup(self, name): dom = self.get_vm(name, self.conn) - info = dom.info() + try: + # Avoid race condition, where guests may be deleted before below + # command. + info = dom.info() + except libvirt.libvirtError as e: + wok_log.error('Operation error while retrieving virtual machine ' + '"%s" information: %s', name, e.message) + raise OperationFailed('KCHVM0009E', {'name': name, + 'err': e.message}) state = DOM_STATE_MAP[info[0]] screenshot = None # (type, listen, port, passwd, passwdValidTo) -- 2.1.0

3 2

[PATCHv3] [Kimchi] Create Template UI adjustments including size and loading
by Socorro Stoppler 25 Apr '16

25 Apr '16

v3: Added loading icon since at times, it takes a while for the ISOs to load v2: Added 'Not Available' for size to be displayed when there's no value for size; otherwise, the container for the templates are showing up as different sizes due to missing value for the size field. Also moved the local/remote iso icon to bottom right corner v1: This is a brand new patch to implement create template UI without the user having to distinguish between iso and image files since the original one wasn't done quite right. Therefore, please ignore the original patch and this is v1. There are no longer any radio buttons, all the remote and local isos, if any, are displayed in the same panel and are distinguished by having a 'globe' icon for remote and a 'hdd' icon for local at the top left corner of each tile. Also, filtering by typing in the textbox has been added. Socorro Stoppler (1): Create Template UI adjustments based on feedback; added Not Available to be displayed for Size when there's no size and move remote/local iso icon to bottom right; add loading icon ui/css/kimchi.css | 36 ++++ ui/css/src/modules/_templates.scss | 30 +++ ui/js/src/kimchi.template_add_main.js | 342 +++++++--------------------------- ui/pages/i18n.json.tmpl | 1 + ui/pages/template-add.html.tmpl | 88 ++------- 5 files changed, 148 insertions(+), 349 deletions(-) -- 2.5.0

2 3

[PATCHv2] [Kimchi] Create Template UI adjustments including size
by Socorro Stoppler 25 Apr '16

25 Apr '16

v2: Added 'Not Available' for size to be displayed when there's no value for size; otherwise, the container for the templates are showing up as different sizes due to missing value for the size field. Also moved the local/remote iso icon to bottom right corner v1: This is a brand new patch to implement create template UI without the user having to distinguish between iso and image files since the original one wasn't done quite right. Therefore, please ignore the original patch and this is v1. There are no longer any radio buttons, all the remote and local isos, if any, are displayed in the same panel and are distinguished by having a 'globe' icon for remote and a 'hdd' icon for local at the top left corner of each tile. Also, filtering by typing in the textbox has been added. Socorro Stoppler (1): Create Template UI adjustments based on feedback; added Not Available to be displayed for Size when there's no size and move remote/local iso icon to bottom right ui/css/kimchi.css | 36 ++++ ui/css/src/modules/_templates.scss | 30 +++ ui/js/src/kimchi.template_add_main.js | 337 ++++++---------------------------- ui/pages/i18n.json.tmpl | 1 + ui/pages/template-add.html.tmpl | 81 ++------ 5 files changed, 136 insertions(+), 349 deletions(-) -- 2.5.0

3 6

[PATCH v4] [Kimchi] Issue #920: Template is removed if an ISO doesn't exist
by Jose Ricardo Ziviani 20 Apr '16

20 Apr '16

- This commit changes the way the template update works. Now, it really updates the existing template instead of creating a new one (and deleting the old one) Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 2 ++ model/templates.py | 35 ++++++++++++++++++++++------------- tests/test_template.py | 6 +++++- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/i18n.py b/i18n.py index 7cce796..14ae166 100644 --- a/i18n.py +++ b/i18n.py @@ -155,6 +155,7 @@ messages = { "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"), "KCHTMPL0001E": _("Template %(name)s already exists"), + "KCHTMPL0002E": _("Source media %(path)s not found"), "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"), "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"), "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."), @@ -181,6 +182,7 @@ messages = { "KCHTMPL0029E": _("Disk format must be 'raw', for logical, iscsi, and scsi pools."), "KCHTMPL0030E": _("Memory expects an object with one or both parameters: 'current' and 'maxmemory'"), "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), + "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/templates.py b/model/templates.py index a02099c..431cae0 100644 --- a/model/templates.py +++ b/model/templates.py @@ -72,8 +72,7 @@ class TemplatesModel(object): # image does not exists: raise error elif not os.path.exists(path): - raise InvalidParameter("Unable to find file %(path)s" % - {"path": path}) + raise InvalidParameter("KCHTMPL0002E", {'path': path}) # create magic object to discover file type file_type = magic.open(magic.MAGIC_NONE) @@ -204,31 +203,30 @@ class TemplateModel(object): raise OperationFailed('KCHTMPL0021E', {'err': e.message}) def update(self, name, params): - old_t = self.lookup(name) - new_t = copy.copy(old_t) + edit_template = self.lookup(name) # Merge graphics settings graph_args = params.get('graphics') if graph_args: - graphics = dict(new_t['graphics']) + graphics = dict(edit_template['graphics']) graphics.update(graph_args) params['graphics'] = graphics # Merge cpu_info settings new_cpu_info = params.get('cpu_info') if new_cpu_info: - cpu_info = dict(new_t['cpu_info']) + cpu_info = dict(edit_template['cpu_info']) cpu_info.update(new_cpu_info) params['cpu_info'] = cpu_info # Fix memory values, because method update does not work recursively new_mem = params.get('memory') if new_mem is not None: - params['memory'] = copy.copy(old_t.get('memory')) + params['memory'] = copy.copy(edit_template.get('memory')) params['memory'].update(new_mem) validate_memory(params['memory']) - new_t.update(params) + edit_template.update(params) for net_name in params.get(u'networks', []): try: @@ -238,13 +236,24 @@ class TemplateModel(object): raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) - self.delete(name) try: - ident = self.templates.save_template(new_t) - except: - ident = self.templates.save_template(old_t) + # make sure the new template will be created + t = LibvirtVMTemplate(edit_template, scan=True, conn=self.conn) + t.cpuinfo_validate() + t._validate_memory() + + # remove the current one + self.delete(name) + + # save the template + return self.templates.save_template(edit_template) + + except InvalidOperation: raise - return ident + except Exception, e: + raise OperationFailed('KCHTMPL0032E', {'err': e.message}) + + return params['name'] def validate_memory(memory): diff --git a/tests/test_template.py b/tests/test_template.py index 158bbeb..f0ef030 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -256,7 +256,11 @@ class TemplateTests(unittest.TestCase): self.assertEquals(1024, update_tmpl['memory']['maxmemory']) # Update cdrom - cdrom_data = {'cdrom': '/tmp/mock2.iso'} + cdrom_data = {'cdrom': 'inexistent.iso'} + resp = self.request(new_tmpl_uri, json.dumps(cdrom_data), 'PUT') + self.assertEquals(400, resp.status) + + cdrom_data = {'cdrom': '/tmp/existent.iso'} resp = self.request(new_tmpl_uri, json.dumps(cdrom_data), 'PUT') self.assertEquals(200, resp.status) update_tmpl = json.loads(resp.read()) -- 1.9.1

2 1

[PATCH][Kimchi] Pass disk path when template is image based
by Ramon Medeiros 20 Apr '16

20 Apr '16

UI wasn't passing path to image disk when updating it, so the backend was losing the disk. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index de72452..8b5abfb 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -20,6 +20,7 @@ kimchi.template_edit_main = function() { var origDisks; var origNetworks; var templateDiskSize; + var baseImageTemplate; $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) { $('.tab-content').css('overflow','hidden'); @@ -89,6 +90,7 @@ kimchi.template_edit_main = function() { } return false; } + baseImageTemplate = isImageBasedTemplate; enableSpice(); $('#template-edit-graphics').selectpicker(); @@ -334,7 +336,9 @@ kimchi.template_edit_main = function() { var data = {}; var disks = $('.template-tab-body .item', '#form-template-storage'); var disksForUpdate = new Array(); + $.each(disks, function(index, diskEntity) { + var newDisk = { 'index' : index, 'pool' : {'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val()}, @@ -342,6 +346,11 @@ kimchi.template_edit_main = function() { 'format' : $(diskEntity).find('.template-storage-disk-format').val() }; + // image based template: add base to dictionary + if ((baseImageTemplate()) && (index == 0)) { + newDisk["base"] = $('#template-edit-vmimage-textbox').val(); + } + var storageType = $(diskEntity).find('.template-storage-type').val(); if(storageType === 'iscsi' || storageType === 'scsi') { newDisk['volume'] = newDisk['pool']['name'].split('/').pop(); -- 2.5.5

1 1

[PATCH] [Kimchi 0/2] Add support for editing virtual networks
by Lucio Correia 20 Apr '16

20 Apr '16

Lucio Correia (2): Add backend support for editing virtual networks Add network rename tests API.json | 31 ++++++++++++++++++++++++++++ control/networks.py | 1 + docs/API.md | 8 ++++++++ i18n.py | 9 +++++--- model/networks.py | 50 ++++++++++++++++++++++++++++++++++++++++++++- tests/test_model_network.py | 13 +++++++++++- 6 files changed, 107 insertions(+), 5 deletions(-) -- 1.9.1

2 8

[PATCH V4] [Kimchi 0/2] Issue #817 - PCI attach/detach improvements.
by pvital＠linux.vnet.ibm.com 20 Apr '16

20 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V4: * Removed Libvirt events implementation. V3: * Fixed copyright line of new files. V2: This is the backend part of the solution to Issue #817. In this solution the support for handle Libvirt events is added, as well, the attach and detach functions were modified to return AsyncTasks (then frontend can be informed when a device is really attached/detached). Patch "Add support to Libvirt Events." is the third version of previous submitted patch. Patch "Make detach device return an AsyncTask" needs submitted Wok patch "Update AsyncResource class with delete method." to work. Paulo Vital (2): Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- model/vmhostdevs.py | 103 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 89 insertions(+), 20 deletions(-) -- 2.5.5

2 3

[PATCH] [Kimchi] Create Template UI adjustments based on feedback
by Socorro Stoppler 20 Apr '16

20 Apr '16

This is a brand new patch to implement create template UI without the user having to distinguish between iso and image files since the original one wasn't done quite right. Therefore, please ignore the original patch and this is v1. There are no longer any radio buttons, all the remote and local isos, if any, are displayed in the same panel and are distinguished by having a 'globe' icon for remote and a 'hdd' icon for local at the top left corner of each tile. Also, filtering by typing in the textbox has been added. Socorro Stoppler (1): Create Template UI adjustments based on feedback ui/css/kimchi.css | 29 +++ ui/css/src/modules/_templates.scss | 24 +++ ui/js/src/kimchi.template_add_main.js | 334 ++++++---------------------------- ui/pages/template-add.html.tmpl | 80 +------- 4 files changed, 118 insertions(+), 349 deletions(-) -- 2.5.0

1 2

[PATCH v3] [Kimchi] Replace backing image by clone when using template based on existing img
by Jose Ricardo Ziviani 19 Apr '16

19 Apr '16

- This commit replaces the current backing image to a complete clone when using a template based on an existing template. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/templates.py | 26 +++++++++++++++++++++++++- tests/test_rest.py | 19 +++++++++++++++---- vmtemplate.py | 8 -------- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/model/templates.py b/model/templates.py index a02099c..1cdb99b 100644 --- a/model/templates.py +++ b/model/templates.py @@ -23,6 +23,7 @@ import magic import os import platform import psutil +import shutil import stat import urlparse @@ -378,7 +379,30 @@ class LibvirtVMTemplate(VMTemplate): for v in vol_list: pool = self._get_storage_pool(v['pool']) # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + if 'base' in v and 'path' in v['base']: + conn = self.conn.get() + try: + volume_base = conn.storageVolLookupByPath( + v['base']['path']) + + except libvirt.libvirtError as e: + image_dir = os.path.dirname(v['base']['path']) + image_name = os.path.basename(v['base']['path']) + volume_dir = os.path.dirname(v['path']) + + if image_dir != volume_dir: + shutil.copy(v['base']['path'], volume_dir) + + pool.refresh() + + volume_base = pool.storageVolLookupByName(image_name) + + pool.createXMLFrom(v['xml'].encode('utf-8'), + volume_base, + 0) + else: + pool.createXML(v['xml'].encode('utf-8'), 0) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return vol_list diff --git a/tests/test_rest.py b/tests/test_rest.py index a009ed3..997611e 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1030,9 +1030,13 @@ class RestTests(unittest.TestCase): self.assertIn(u"KCHVM0012E", resp['reason']) def test_create_vm_with_img_based_template(self): + self._create_pool('pool-imgbs') + self.request('/plugins/kimchi/storagepools/pool-imgbs/activate', '{}', + 'POST') + resp = json.loads( self.request( - '/plugins/kimchi/storagepools/default-pool/storagevolumes' + '/plugins/kimchi/storagepools/pool-imgbs/storagevolumes' ).read() ) self.assertEquals(0, len(resp)) @@ -1040,8 +1044,15 @@ class RestTests(unittest.TestCase): # Create a Template mock_base = '/tmp/mock.img' os.system("qemu-img create -f qcow2 %s 10M" % mock_base) - req = json.dumps({'name': 'test', 'source_media': mock_base}) - resp = self.request('/plugins/kimchi/templates', req, 'POST') + + tmpl_params = { + 'name': 'test', 'source_media': mock_base, + 'disks': [{'pool': + {'name': '/plugins/kimchi/storagepools/pool-imgbs'}}]} + + resp = self.request('/plugins/kimchi/templates', + json.dumps(tmpl_params), + 'POST') self.assertEquals(201, resp.status) req = json.dumps({'template': '/plugins/kimchi/templates/test'}) @@ -1053,7 +1064,7 @@ class RestTests(unittest.TestCase): # Test storage volume created with backing store of base file resp = json.loads( self.request( - '/plugins/kimchi/storagepools/default-pool/storagevolumes' + '/plugins/kimchi/storagepools/pool-imgbs/storagevolumes' ).read() ) self.assertEquals(1, len(resp)) diff --git a/vmtemplate.py b/vmtemplate.py index a223beb..4ce5d19 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -264,14 +264,6 @@ class VMTemplate(object): v_tree.append(E.capacity(str(info['capacity']), unit='G')) target_fmt = info['format'] - if 'base' in d: - # target must be qcow2 in order to use a backing file - target_fmt = 'qcow2' - - v_tree.append(E.backingStore( - E.path(info['base']['path']), - E.format(type=info['base']['format']))) - target = E.target( E.format(type=target_fmt), E.path(info['path'])) v_tree.append(target) -- 1.9.1

1 1

[PATCH] [Kimchi 0/3] Issue #924: Avoid deleting storage pool in
by Jose Ricardo Ziviani 19 Apr '16

19 Apr '16

This patchset disable buttons to remove and deactivate storagepools that are currently in use by any template. Jose Ricardo Ziviani (3): Issue #924: Add field to inform front-end if storage is in use Issue #924: Disable deactivate/delete buttons if storage is in use Issue #924: Update test case with new storage pool field control/storagepools.py | 3 ++- model/storagepools.py | 3 ++- tests/test_model_storagepool.py | 2 +- ui/js/src/kimchi.storage_main.js | 13 +++++++++---- ui/pages/tabs/storage.html.tmpl | 6 +++--- 5 files changed, 17 insertions(+), 10 deletions(-) -- 1.9.1

3 5

[PATCH][Kimchi] Improve checking of cpu_info API (json schema)
by Rodrigo Trujillo 19 Apr '16

19 Apr '16

This patch adds a checking, retricting parameters expected in "cpu_info" and in "cpu_info: {topology }. Only defined parameters are allowed and new error messages are displayed if parameters do not fit requirement. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- API.json | 8 ++++++-- i18n.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/API.json b/API.json index ff505b1..590bc52 100644 --- a/API.json +++ b/API.json @@ -62,9 +62,13 @@ "minimum": 1, "error": "KCHTMPL0026E" } - } + }, + "additionalProperties": false, + "error": "KCHCPUINF0009E" } - } + }, + "additionalProperties": false, + "error": "KCHCPUINF0008E" }, "memory": { "description": "Current memory and maximum memory values", diff --git a/i18n.py b/i18n.py index 12b70fa..6491f72 100644 --- a/i18n.py +++ b/i18n.py @@ -325,6 +325,8 @@ messages = { "KCHCPUINF0005E": _("When CPU topology is defined, vCPUs must be a multiple of a product of cores and threads."), "KCHCPUINF0006E": _("The number of threads is too large for this system."), "KCHCPUINF0007E": _("When CPU topology is specified, sockets, cores and threads are required paramaters."), + "KCHCPUINF0008E": _("Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'."), + "KCHCPUINF0009E": _("Parameter 'topology' expects an object with fields among: 'sockets', 'cores', 'threads'."), "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), -- 2.1.0

4 3

[PATCH V2] [Kimchi 0/2] Add support for editing virtual networks
by Lucio Correia 19 Apr '16

19 Apr '16

Lucio Correia (2): Add backend support for editing virtual networks Add network update tests Changes in V2: - code review - bugfix in restoring original network API.json | 32 ++++++++++++++++++++++++++++++ control/networks.py | 1 + docs/API.md | 9 +++++++++ i18n.py | 8 +++++--- model/networks.py | 48 ++++++++++++++++++++++++++++++++++++++++++++- tests/test_model_network.py | 19 +++++++++++++++++- 6 files changed, 112 insertions(+), 5 deletions(-) -- 1.9.1

3 4

Looking for input on #105
by Archana Singh 19 Apr '16

19 Apr '16

Hello, I have raised issue "logging of datetime in ISO format along with timezone in *.log". I am looking for input on these aspect. Thanks, Archana

1 0

[PATCH v3] [Kimchi] Issue #920: Template is removed if an ISO doesn't exist
by Jose Ricardo Ziviani 18 Apr '16

18 Apr '16

- This commit changes the way the template update works. Now, it really updates the existing template instead of creating a new one (and deleting the old one) Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 3 +++ model/templates.py | 70 ++++++++++++++++++++++++++++++++------------------ tests/test_template.py | 6 ++++- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/i18n.py b/i18n.py index 7cce796..e4656cb 100644 --- a/i18n.py +++ b/i18n.py @@ -155,8 +155,10 @@ messages = { "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"), "KCHTMPL0001E": _("Template %(name)s already exists"), + "KCHTMPL0002E": _("Source media %(path)s not found"), "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"), "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"), + "KCHTMPL0005E": _("Template %(name)s does not exist."), "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."), "KCHTMPL0007E": _("Network %(network)s specified for template %(template)s is not active"), "KCHTMPL0008E": _("Template name must be a string"), @@ -181,6 +183,7 @@ messages = { "KCHTMPL0029E": _("Disk format must be 'raw', for logical, iscsi, and scsi pools."), "KCHTMPL0030E": _("Memory expects an object with one or both parameters: 'current' and 'maxmemory'"), "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), + "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/templates.py b/model/templates.py index a02099c..d0742ca 100644 --- a/model/templates.py +++ b/model/templates.py @@ -51,7 +51,7 @@ class TemplatesModel(object): self.objstore = kargs['objstore'] self.conn = kargs['conn'] - def create(self, params): + def _validate_template_params(self, params): name = params.get('name', '').strip() conn = self.conn.get() @@ -72,8 +72,7 @@ class TemplatesModel(object): # image does not exists: raise error elif not os.path.exists(path): - raise InvalidParameter("Unable to find file %(path)s" % - {"path": path}) + raise InvalidParameter("KCHTMPL0002E", {'path': path}) # create magic object to discover file type file_type = magic.open(magic.MAGIC_NONE) @@ -99,10 +98,6 @@ class TemplatesModel(object): params["disks"] = params.get('disks', []) params["disks"].append({"base": path}) - return self.save_template(params) - - def save_template(self, params): - # Creates the template class with necessary information t = LibvirtVMTemplate(params, scan=True, conn=self.conn) @@ -119,16 +114,18 @@ class TemplatesModel(object): if 'volume' in disk.keys(): self.template_volume_validate(volume, disk['pool']) - # template with the same name already exists: raise exception - name = params['name'] - with self.objstore as session: - if name in session.get_list('template'): - raise InvalidOperation("KCHTMPL0001E", {'name': name}) + return t + + def create(self, params): + template = self._validate_template_params(params) # Store template on objectstore + name = params['name'] try: with self.objstore as session: - session.store('template', name, t.info, + if name in session.get_list('template'): + raise InvalidOperation("KCHTMPL0001E", {'name': name}) + session.store('template', name, template.info, get_kimchi_version()) except InvalidOperation: raise @@ -191,7 +188,8 @@ class TemplateModel(object): temp = self.lookup(name) temp['name'] = clone_name - ident = self.templates.save_template(temp) + temp['source_media'] = temp.get('base', temp['cdrom']) + ident = self.templates.create(temp) return ident def delete(self, name): @@ -204,31 +202,36 @@ class TemplateModel(object): raise OperationFailed('KCHTMPL0021E', {'err': e.message}) def update(self, name, params): - old_t = self.lookup(name) - new_t = copy.copy(old_t) + edit_template = self.lookup(name) + + edit_template['source_media'] = edit_template.get( + 'base', edit_template['cdrom']) + + if 'cdrom' in params: + edit_template['source_media'] = params['cdrom'] # Merge graphics settings graph_args = params.get('graphics') if graph_args: - graphics = dict(new_t['graphics']) + graphics = dict(edit_template['graphics']) graphics.update(graph_args) params['graphics'] = graphics # Merge cpu_info settings new_cpu_info = params.get('cpu_info') if new_cpu_info: - cpu_info = dict(new_t['cpu_info']) + cpu_info = dict(edit_template['cpu_info']) cpu_info.update(new_cpu_info) params['cpu_info'] = cpu_info # Fix memory values, because method update does not work recursively new_mem = params.get('memory') if new_mem is not None: - params['memory'] = copy.copy(old_t.get('memory')) + params['memory'] = copy.copy(edit_template.get('memory')) params['memory'].update(new_mem) validate_memory(params['memory']) - new_t.update(params) + edit_template.update(params) for net_name in params.get(u'networks', []): try: @@ -238,13 +241,30 @@ class TemplateModel(object): raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) - self.delete(name) + template = self.templates._validate_template_params(edit_template) + try: - ident = self.templates.save_template(new_t) - except: - ident = self.templates.save_template(old_t) + with self.objstore as session: + if name not in session.get_list('template'): + raise InvalidOperation("KCHTMPL0005E", {'name': name}) + + if template.info['name'] != name and \ + template.info['name'] in session.get_list('template'): + raise InvalidOperation("KCHTMPL0001E", + {'name': template.info['name']}) + + if template.info['name'] != name: + session.delete('template', name) + + session.store('template', template.info['name'], + template.info, get_kimchi_version()) + + except InvalidOperation: raise - return ident + except Exception, e: + raise OperationFailed('KCHTMPL0032E', {'err': e.message}) + + return template.info['name'] def validate_memory(memory): diff --git a/tests/test_template.py b/tests/test_template.py index 158bbeb..f0ef030 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -256,7 +256,11 @@ class TemplateTests(unittest.TestCase): self.assertEquals(1024, update_tmpl['memory']['maxmemory']) # Update cdrom - cdrom_data = {'cdrom': '/tmp/mock2.iso'} + cdrom_data = {'cdrom': 'inexistent.iso'} + resp = self.request(new_tmpl_uri, json.dumps(cdrom_data), 'PUT') + self.assertEquals(400, resp.status) + + cdrom_data = {'cdrom': '/tmp/existent.iso'} resp = self.request(new_tmpl_uri, json.dumps(cdrom_data), 'PUT') self.assertEquals(200, resp.status) update_tmpl = json.loads(resp.read()) -- 1.9.1

3 6

[PATCH V2] [Kimchi 0/3] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V2: * Adapted patch to new template API (automatic detection of cdrom) V1: This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. Reference: http://miud.in/1Ht3 To test, use the curl commands (look the parameters used): $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot", "source_media": "netboot"}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":null, "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":{ "current":1024, "maxmemory":1024 }, "folder":[] } $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"Provisioning storages for new VM", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } $ sudo virsh dumpxml 1netboot-test <domain type='kvm'> <name>1netboot-test</name> <uuid>5c9fa5b3-3203-4c93-92d6-2b4103fe7b40</uuid> <metadata> <kimchi:metadata xmlns:kimchi="https://github.com/kimchi-project/kimchi"> <kimchi:os version="unknown" distro="unknown"/> </kimchi:metadata> </metadata> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <memtune> <hard_limit unit='KiB'>2097152</hard_limit> </memtune> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-i440fx-2.4'>hvm</type> <boot dev='hd'/> <boot dev='cdrom'/> <boot dev='network'/> </os> <acpi/> <apic/> <pae/> </features> <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/5c9fa5b3-3203-4c93-92d6-2b4103fe7b40-0.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:ea:7e:ad'/> <source network='default'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <sound model='ich6'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> Paulo Vital (3): Add support to create netboot templates. Add support to create guests to netboot. Update test cases to support netboot. API.json | 4 ++-- model/templates.py | 11 ++++++++++- tests/test_template.py | 17 +++++++++++++++++ tests/test_vmtemplate.py | 18 ++++++++++++++++++ vmtemplate.py | 25 ++++++++++++++----------- xmlutils/bootorder.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 xmlutils/bootorder.py -- 2.5.5

4 10

[PATCH V3] [Kimchi 0/3] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V3: * set network as third default option to boot order V2: * Adapted patch to new template API (automatic detection of cdrom) V1: This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. Reference: http://miud.in/1Ht3 To test, use the curl commands (look the parameters used): $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot", "source_media": "netboot"}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":null, "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":{ "current":1024, "maxmemory":1024 }, "folder":[] } $ curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"Provisioning storages for new VM", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } $ sudo virsh dumpxml 1netboot-test <domain type='kvm'> <name>1netboot-test</name> <uuid>5c9fa5b3-3203-4c93-92d6-2b4103fe7b40</uuid> <metadata> <kimchi:metadata xmlns:kimchi="https://github.com/kimchi-project/kimchi"> <kimchi:os version="unknown" distro="unknown"/> </kimchi:metadata> </metadata> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <memtune> <hard_limit unit='KiB'>2097152</hard_limit> </memtune> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-i440fx-2.4'>hvm</type> <boot dev='hd'/> <boot dev='cdrom'/> <boot dev='network'/> </os> <acpi/> <apic/> <pae/> </features> <cpu> <numa> <cell id='0' cpus='0' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/5c9fa5b3-3203-4c93-92d6-2b4103fe7b40-0.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:ea:7e:ad'/> <source network='default'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <sound model='ich6'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> Paulo Vital (3): Add support to create netboot templates. Add support to create guests to netboot. Update test cases to support netboot. API.json | 4 ++-- model/templates.py | 11 ++++++++++- tests/test_template.py | 17 +++++++++++++++++ tests/test_vmtemplate.py | 18 ++++++++++++++++++ vmtemplate.py | 22 ++++++++++++---------- 5 files changed, 59 insertions(+), 13 deletions(-) -- 2.5.5

1 3

[PATCH v2] [Kimchi] Replace backing image by clone when using template based on existing img
by Jose Ricardo Ziviani 18 Apr '16

18 Apr '16

- This commit replaces the current backing image to a complete clone when using a template based on an existing template. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/templates.py | 17 ++++++++++++++++- vmtemplate.py | 8 -------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/model/templates.py b/model/templates.py index a02099c..9ae7f5e 100644 --- a/model/templates.py +++ b/model/templates.py @@ -378,7 +378,22 @@ class LibvirtVMTemplate(VMTemplate): for v in vol_list: pool = self._get_storage_pool(v['pool']) # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + if 'base' in v and 'path' in v['base']: + conn = self.conn.get() + try: + volume_base = conn.storageVolLookupByPath( + v['base']['path']) + + except libvirt.libvirtError as e: + pool.createXML(v['xml'].encode('utf-8'), 0) + continue + + pool.createXMLFrom(v['xml'].encode('utf-8'), + volume_base, + 0) + else: + pool.createXML(v['xml'].encode('utf-8'), 0) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return vol_list diff --git a/vmtemplate.py b/vmtemplate.py index a223beb..4ce5d19 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -264,14 +264,6 @@ class VMTemplate(object): v_tree.append(E.capacity(str(info['capacity']), unit='G')) target_fmt = info['format'] - if 'base' in d: - # target must be qcow2 in order to use a backing file - target_fmt = 'qcow2' - - v_tree.append(E.backingStore( - E.path(info['base']['path']), - E.format(type=info['base']['format']))) - target = E.target( E.format(type=target_fmt), E.path(info['path'])) v_tree.append(target) -- 1.9.1

2 1

[PATCH] [Wok] Update AsyncResource class with delete method.
by pvital＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Added the method delete to AysncResource class to be able to execute DELETE requests as AsyncTask. This patch is part of solution to Kimchi issue #817 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 25f6522..7aeb844 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -294,6 +294,22 @@ class AsyncResource(Resource): cherrypy.response.status = 202 return wok.template.render('Task', self.info) + def delete(self): + try: + fn = getattr(self.model, model_fn(self, 'delete')) + task = fn(*self.model_args) + except AttributeError: + e = InvalidOperation('WOKAPI0002E', {'resource': + get_class_name(self)}) + raise cherrypy.HTTPError(405, e.message) + except OperationFailed, e: + raise cherrypy.HTTPError(500, e.message) + except InvalidOperation, e: + raise cherrypy.HTTPError(400, e.message) + + cherrypy.response.status = 202 + return wok.template.render("Task", task) + class Collection(object): """ -- 2.5.5

2 1

[PATCH] [Wok] Issue #103: Wok Table List item looks like URL link
by rajgupta＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Changed CSS from link to Background color for Wok Table List items Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- ui/css/src/modules/_wok-grid.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/css/src/modules/_wok-grid.scss b/ui/css/src/modules/_wok-grid.scss index 730d224..e511900 100644 --- a/ui/css/src/modules/_wok-grid.scss +++ b/ui/css/src/modules/_wok-grid.scss @@ -72,8 +72,7 @@ } .wok-list-content tbody tr:hover { - text-decoration: underline; - cursor: pointer; + background: #ddd; } .wok-list-content tbody tr.generating:hover { -- 2.1.0

2 1

[PATCH] [Wok] Seperate method to get accept-language.
by archus＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Seperated method to get the accept-langauage, which can be used if format of number/timestamp has to be done based on it. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/template.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wok/template.py b/src/wok/template.py index 09f4dbe..b47041a 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -34,6 +34,12 @@ def get_lang(): if "wokLang" in cookie.keys(): return [cookie["wokLang"].value] + langs = get_accept_language() + + return langs + + +def get_accept_language(): lang = cherrypy.request.headers.get("Accept-Language", "en_US") if lang and lang.find(';') != -1: @@ -46,7 +52,6 @@ def get_lang(): langCountry = val.split('-') langCountry[1] = langCountry[1].upper() langs[idx] = "_".join(langCountry) - return langs -- 2.5.0

3 2