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

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

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

2 5

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

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

3 10

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

15 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 | 55 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 20 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..e240317 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) @@ -119,16 +118,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 @@ -204,31 +205,33 @@ 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']) # 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,25 @@ 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: + 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): -- 1.9.1

2 2

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

14 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

2 5

[PATCH] [Wok] Wok utils method for converting String to Unicode and vice versa.
by archus＠linux.vnet.ibm.com 14 Apr '16

14 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added two utils methods which can be used to convert String to Unicode and Unicode to String. This method does the checking of instance of value passed and accordingly used the encode, decode, str methods. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 175cf25..0e8ec05 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -622,3 +622,27 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def encode_value(val): + """ + Convert the value to string. + If its unicode, use encode otherwise str. + """ + if isinstance(val, unicode): + return val.encode('utf-8') + return str(val) + + +def decode_value(val): + """ + Converts value to unicode, + if its not an instance of unicode. + For doing so convert the val to string, + if its not instance of basestring. + """ + if not isinstance(val, basestring): + val = str(val) + if not isinstance(val, unicode): + val = val.decode('utf-8') + return val -- 2.5.0

3 4

[PATCH] [Wok] Wok utils method for converting String to Unicode and vice versa.
by archus＠linux.vnet.ibm.com 14 Apr '16

14 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added two utils methods which can be used to convert String to Unicode and Unicode to String. This method does the checking of instance of value passed and accordingly used the encode, decode, str methods. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 175cf25..0e8ec05 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -622,3 +622,27 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def encode_value(val): + """ + Convert the value to string. + If its unicode, use encode otherwise str. + """ + if isinstance(val, unicode): + return val.encode('utf-8') + return str(val) + + +def decode_value(val): + """ + Converts value to unicode, + if its not an instance of unicode. + For doing so convert the val to string, + if its not instance of basestring. + """ + if not isinstance(val, basestring): + val = str(val) + if not isinstance(val, unicode): + val = val.decode('utf-8') + return val -- 2.5.0

3 2

[PATCH] [Kimchi] Create template (UI part) without specifying media type
by Socorro Stoppler 14 Apr '16

14 Apr '16

Rather than specifying whether local file is an img or an ISO, all the user has to do is to input the file including the path of its location. Kimchi will handle the rest on the backend. Rather than originally having 3 radio buttons, it is now 2 radio buttons -- one for local and the other for remote. This patch needs to work in conjunction w/Ramon's latest patch set sent today - Use a single field to create a template - (backend) Socorro Stoppler (1): Create template without specifying media type ui/css/kimchi.css | 2 +- ui/css/src/modules/_templates.scss | 2 +- ui/js/src/kimchi.template_add_main.js | 378 +++++----------------------------- ui/pages/template-add.html.tmpl | 73 +------ 4 files changed, 55 insertions(+), 400 deletions(-) -- 2.5.0

4 12

Duplicate Wok Modal windows
by Samuel Henrique De Oliveira Guimaraes 13 Apr '16

13 Apr '16

Hey team, I'm not sure if this is still happening randomly with Ginger, Gingerbase or Kimchi because after the latest changes to wok.window.js it was supposed to be fixed but I was able to reproduce it once again when developing Ginger OVS Bridge UI. The problem is not related to wok.window.js at all, but in majority if a function that builds the UI has a wok.window.open() line inside of any block and the same parent function is called again, the modal content is hidden from the DOM tree but not removed. This will create windows with different IDs but with the same content inside the modal dialog. The ideal fix would be isolating all click handlers in a different function. For instance, suppose we have a function like this: ginger.buildTableUi = function() { // Some lines $('button').on('click',function(){ wok.window.open('url'); }); // Some lines }; ginger.buildTableUi(); And then ginger.buildTableUi() is called again once a new element is added or removed from/to a table or list, this will make the modal content append inside the modal window at N times that this function was called. Instead we have to isolate the click events like this: ginger.someTabclickHandler = function() { $('container').on('click','button',function(){ wok.window.open('url'); }); } And then we can call it like this: ginger.buildTableUi(); ginger.someTabclickHandler(); Call ginger.buildTableUi() many times as you want and it won't duplicate the click handlers :) Please pay attention the changes in the click event differences from the examples above. Since the UI will dynamically generate the buttons or links that we'll bind new events, we have to add a static container that is not generated by JS or ensure that the container, button or link element was in the DOM tree before someTabclickHandler() was called. If you find any duplicate modal windows, please let me know or follow the instructions above and send a patch :) Regards, Samuel

2 1

[PATCH] [Kimchi] Fixed some issues with SCSS after adding compact() mixin to Wok
by sguimaraes943＠gmail.com 13 Apr '16

13 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Patch "Added compact Sass function that was removed from libsass" is required in order to compile the correct CSS output from kimchi.scss. Samuel Guimarães (1): Fixed some issues with SCSS after adding compact() mixin to Wok ui/css/kimchi.css | 38 ++++++++++++++++++------------------ ui/css/src/kimchi.scss | 2 ++ ui/css/src/modules/_edit-guests.scss | 25 +++++++++++++++--------- 3 files changed, 37 insertions(+), 28 deletions(-) -- 1.9.3

2 2

[WOK][PATCH] Added method to validate ASCII value
by pkulkark＠linux.vnet.ibm.com 13 Apr '16

13 Apr '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> Added a method to utils to check if a given field value is ASCII Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index e5701e6..d7dd8a3 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -193,3 +193,7 @@ wok.urlSafeB64Decode = function(str) { wok.urlSafeB64Encode = function(str) { return $.base64.btoa(str, true).replace(/\+/g, '-').replace(/\//g, '_'); } + +wok.isASCII = function(field) { + return /^[\x00-\x7F]*$/.test(field); +} -- 2.1.0

2 1

[PATCH] [Wok 0/2] SCSS and CSS updates
by sguimaraes943＠gmail.com 13 Apr '16

13 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patchset includes two commits that are required for existing and new features. -First patch adds compact() function to our mixins since it was removed from python-libsass. This was generating wrong CSS outputs from different distros and rendering wrong styles (specially box-shadow effects). -Second patch adds support for .wok-mask class with a relative position inside a panel-group, allowing us to display a "loading" text with spinning icon inside collapsible panels seen in Ginger and Gingerbase. Both patches are required for "OVS Bridges front-end" support in Ginger and "Delete multiple Debug Reports at once" in Gingerbase. Samuel Guimarães (2): Added compact Sass function that was removed from libsass Fixed .wok-mask class and loaders inside collapsable panels ui/css/src/modules/_compact.scss | 46 ++++++++++++++++++++++++++++++++++++++++ ui/css/src/modules/_loaders.scss | 4 ++++ ui/css/src/wok.scss | 6 ++++++ ui/css/wok.css | 8 +++++++ 4 files changed, 64 insertions(+) create mode 100644 ui/css/src/modules/_compact.scss -- 1.9.3

2 3

[PATCH] [Kimchi] Issue #919: Deactivate a storagepool makes the list of templates blank
by Jose Ricardo Ziviani 13 Apr '16

13 Apr '16

- This commit fixes cases when a storage pools is deativated or removed. Instead of let a blank interface it displays all templates filling the javascript field 'invalid' with the name of the invalid storage. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 1 - model/templates.py | 29 ++++++++++++++++++++--------- vmtemplate.py | 9 ++++++--- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/i18n.py b/i18n.py index 6214687..1061aeb 100644 --- a/i18n.py +++ b/i18n.py @@ -157,7 +157,6 @@ messages = { "KCHTMPL0001E": _("Template %(name)s already exists"), "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": _("Storage pool %(pool)s specified for template %(template)s is not active"), "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"), diff --git a/model/templates.py b/model/templates.py index 92705b6..9294be2 100644 --- a/model/templates.py +++ b/model/templates.py @@ -271,19 +271,16 @@ class LibvirtVMTemplate(VMTemplate): # validate CPU info values - will raise appropriate exceptions cpu_model.check_cpu_info(self.info['cpu_info']) - def _storage_validate(self, pool_uri): + def _get_storage_pool(self, pool_uri): pool_name = pool_name_from_uri(pool_uri) try: conn = self.conn.get() pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) + except libvirt.libvirtError: raise InvalidParameter("KCHTMPL0004E", {'pool': pool_uri, 'template': self.name}) - if not pool.isActive(): - raise InvalidParameter("KCHTMPL0005E", {'pool': pool_name, - 'template': self.name}) - return pool def _get_all_networks_name(self): @@ -295,6 +292,11 @@ class LibvirtVMTemplate(VMTemplate): names = conn.listStoragePools() + conn.listDefinedStoragePools() return sorted(map(lambda x: x.decode('utf-8'), names)) + def _get_active_storagepools_name(self): + conn = self.conn.get() + names = conn.listStoragePools() + return sorted(map(lambda x: x.decode('utf-8'), names)) + def _network_validate(self): names = self.info['networks'] for name in names: @@ -310,17 +312,26 @@ class LibvirtVMTemplate(VMTemplate): 'template': self.name}) def _get_storage_path(self, pool_uri=None): - pool = self._storage_validate(pool_uri) + try: + pool = self._get_storage_pool(pool_uri) + + except: + return '' + xml = pool.XMLDesc(0) return xpath_get_text(xml, "/pool/target/path")[0] def _get_storage_type(self, pool_uri=None): - pool = self._storage_validate(pool_uri) + try: + pool = self._get_storage_pool(pool_uri) + + except: + return '' xml = pool.XMLDesc(0) return xpath_get_text(xml, "/pool/@type")[0] def _get_volume_path(self, pool, vol): - pool = self._storage_validate(pool) + pool = self._get_storage_pool(pool) try: return pool.storageVolLookupByName(vol).path() except: @@ -332,7 +343,7 @@ class LibvirtVMTemplate(VMTemplate): vol_list = self.to_volume_list(vm_uuid) try: for v in vol_list: - pool = self._storage_validate(v['pool']) + pool = self._get_storage_pool(v['pool']) # outgoing text to libvirt, encode('utf-8') pool.createXML(v['xml'].encode('utf-8'), 0) except libvirt.libvirtError as e: diff --git a/vmtemplate.py b/vmtemplate.py index b71cf23..4470be4 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -441,7 +441,7 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): pool_uri = disk.get('pool', {}).get('name') - self._storage_validate(pool_uri) + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -456,7 +456,7 @@ class VMTemplate(object): def _network_validate(self): pass - def _storage_validate(self): + def _get_storage_pool(self): pass def fork_vm_storage(self, vm_uuid): @@ -477,6 +477,9 @@ class VMTemplate(object): def _get_all_storagepools_name(self): return [] + def _get_active_storagepools_name(self): + return [] + def validate_integrity(self): invalid = {} # validate networks integrity @@ -489,7 +492,7 @@ class VMTemplate(object): for disk in self.info['disks']: pool_uri = disk['pool']['name'] pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_all_storagepools_name(): + if pool_name not in self._get_active_storagepools_name(): invalid['storagepools'] = [pool_name] # validate iso integrity -- 1.9.1

3 2

[PATCH] [Kimchi] Issue #924: Before deleting a storagepool, kimchi should check if any template is using that
by Jose Ricardo Ziviani 13 Apr '16

13 Apr '16

--- model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/storagepools.py b/model/storagepools.py index cf3ed21..4a0d34c 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,6 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner +from wok.plugins.kimchi.utils import pool_name_from_uri ISO_POOL_NAME = u'kimchi_isos' @@ -437,7 +438,7 @@ class StoragePoolModel(object): t_info = session.get('template', tmpl) for disk in t_info['disks']: t_pool = disk['pool']['name'] - if t_pool == pool_name: + if pool_name_from_uri(t_pool) == pool_name: return True return False -- 1.9.1

4 6

[PATCH] [Kimchi] Adjust UI to create Template according to the lastest API changes
by Aline Manera 12 Apr '16

12 Apr '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 3146f49..fa5c847 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -313,7 +313,7 @@ kimchi.template_add_main = function() { return; } var data = { - "cdrom": isoFile + "source_media": isoFile }; addTemplate(data); }); @@ -531,9 +531,7 @@ kimchi.template_add_main = function() { $('#vm-image-local-box-button').text(i18n['KCHAPI6008M']); $('#vm-image-local-box-button').prop('disabled', true); addTemplate({ - disks: [{ - base: $('input', '#vm-image-local-box').val() - }] + source_media: $('input', '#vm-image-local-box').val() }, function() { $('input', '#vm-image-local-box').prop('disabled', false); $('#vm-image-local-box-button').text(i18n['KCHAPI6005M']); @@ -548,7 +546,7 @@ kimchi.template_add_main = function() { return; } var data = { - "cdrom": isoUrl + "source_media": isoUrl }; addTemplate(data); }); @@ -579,7 +577,7 @@ kimchi.template_add_main = function() { var data = { "os_distro": isoInfo.os_distro, "os_version": isoInfo.os_version, - "cdrom": isoInfo.path + "source_media": isoInfo.path }; kimchi.createTemplate(data, function() { successNum++; -- 2.5.5

3 3

[PATCH][Kimchi] Change "Memory Available" by "Memory Utilization"
by Rodrigo Trujillo 12 Apr '16

12 Apr '16

Guests gallery and list view were display different labels. Just fix it. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index c8f32a9..c89e450 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -92,7 +92,7 @@ <div class="progress-bar light-grey memory"></div> <div class="progress-bar memory-progress-bar"></div> </div><span class="item-hidden">$_("Memory Available")</span> + --><span class="item-hidden">$_("Memory Utilization")</span> </span><span class='column-storage'> <div class='measure-label storage-percentage'></div> -- 2.1.0

3 2

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

12 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 1e6ad30..87173d1 100644 --- a/model/templates.py +++ b/model/templates.py @@ -361,7 +361,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

3 3

[PATCH] [Kimchi 0/2] Fix issues 920 and 923
by Jose Ricardo Ziviani 12 Apr '16

12 Apr '16

This patchset fixes the issues 920 and 923. Depends on patches: Issue #919: Deactivate a storagepool makes the list of templates blank [Wok] Implement update methods for object store Jose Ricardo Ziviani (2): Issue #920: Template is removed if an ISO doesn't exist Issue #923: Template always shows VNC, even if I save Spice in my template i18n.py | 2 ++ model/templates.py | 42 +++++++++++++++++++++++----------- ui/js/src/kimchi.template_edit_main.js | 12 ++++++++-- 3 files changed, 41 insertions(+), 15 deletions(-) -- 1.9.1

3 6

[PATCH] [Wok 0/3] Implement Asynchronous Notifications frontend
by Lucio Correia 12 Apr '16

12 Apr '16

This patchset depends on Asynchronous Notification backend. Lucio Correia (3): Implement notifications JS API Implement wok.notification widget Implement notifications loop ui/js/src/wok.api.js | 18 ++++++++++++++++++ ui/js/src/wok.main.js | 5 +++++ ui/js/src/wok.notification.js | 36 ++++++++++++++++++++++++++++++++++++ ui/js/src/wok.utils.js | 19 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 ui/js/src/wok.notification.js -- 1.9.1

3 9

[PATCH] [Wok] wok.conf - comment update
by sureshab＠linux.vnet.ibm.com 12 Apr '16

12 Apr '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> updated wok.conf with more detailed comment for SSL certificate Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- src/wok.conf.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wok.conf.in b/src/wok.conf.in index 77a79b6..b55cd0b 100644 --- a/src/wok.conf.in +++ b/src/wok.conf.in @@ -22,8 +22,11 @@ # Port for websocket proxy to listen on #websockets_port = 64667 -# The full path to an SSL Certificate in PEM format. If left unspecified, -# Wok will generate a self-signed certificate automatically. +# The full path to an SSL Certificate, or chain of certificates in +# PEM format. When a chain is used, the server's certificate must be +# the first certificate in the file, with the chain concatenated onto +# the end of that certificate. If left unspecified, Wok will generate +# a self-signed certificate automatically. #ssl_cert = # The corresponding private key in PEM format for the SSL Certificate supplied -- 2.1.0

2 1

[PATCH V2] [Wok 0/3] Implement Asynchronous Notifications frontend
by Lucio Correia 12 Apr '16

12 Apr '16

Changes in V2: - replaced wok.notification by wok.message.notify Lucio Correia (3): Implement notifications JS API Implement wok.message.notify Implement notifications loop ui/js/src/wok.api.js | 18 ++++++++++++++++++ ui/js/src/wok.main.js | 5 +++++ ui/js/src/wok.message.js | 8 ++++++-- ui/js/src/wok.utils.js | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) -- 1.9.1

2 4

[PATCH v7][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 12 Apr '16

12 Apr '16

Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message v4: Remove cdrom verification on model Use disk info from osinfo when adding disk based template v6: Add all logic to model Create tests to verify source_media functionally Add source_media as required Update tests v7: Update tests Stop using osinfo on model/templates Change when template name duplication is verified Ramon Medeiros (4): Create a single field to pass the installation media Identify installation media while creating template Update tests Add new tests to verify source_media feature API.json | 16 ++++------ i18n.py | 2 +- model/templates.py | 72 +++++++++++++++++++++++++++++++-------------- tests/test_authorization.py | 4 +-- tests/test_livemigration.py | 7 +++-- tests/test_mockmodel.py | 13 ++++---- tests/test_model.py | 71 ++++++++++++++++++++++---------------------- tests/test_rest.py | 36 +++++++++++------------ tests/test_template.py | 39 ++++++++++++------------ tests/test_vmtemplate.py | 3 +- 10 files changed, 144 insertions(+), 119 deletions(-) -- 2.5.5

2 8

[PATCH] [Kimchi 0/3] Fixes on template issues
by Jose Ricardo Ziviani 08 Apr '16

08 Apr '16

This patchset fixes a problem to create a template from existing image plus more 2 issues: 919/920. Jose Ricardo Ziviani (3): Fix template creation from image file Issue #919: Deactivate a storagepool makes the list of templates blank Issue #920: Template is removed if an ISO doesn't exist anymore model/templates.py | 28 +++++++++++++++++++++++----- vmtemplate.py | 6 +++++- 2 files changed, 28 insertions(+), 6 deletions(-) -- 1.9.1

3 8

[PATCH v2] [Kimchi] Fix template creation from image file
by Jose Ricardo Ziviani 08 Apr '16

08 Apr '16

- When using an existing image as base for creating templates we cannot rely on its pool because it's undefined. This commit sets the default pool for this case. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- vmtemplate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 653ad02..3270749 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -96,7 +96,9 @@ class VMTemplate(object): for index, disk in enumerate(disks): disk_info = dict(default_disk) - pool_type = self._get_storage_type(disk['pool']['name']) + pool = disk.get('pool', default_disk['pool']) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: disk_info = {'index': 0, 'format': 'raw', 'volume': None} -- 1.9.1

3 2

[PATCH v6][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 08 Apr '16

08 Apr '16

Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message v4: Remove cdrom verification on model Use disk info from osinfo when adding disk based template v6: Add all logic to model Create tests to verify source_media functionally Add source_media as required Update tests Ramon Medeiros (4): Create a single field to pass the installation media Identify installation media while creating template Update tests Add new tests to verify source_media feature API.json | 16 +++------- i18n.py | 2 +- model/templates.py | 75 ++++++++++++++++++++++++++++++++------------- tests/test_authorization.py | 4 +-- tests/test_livemigration.py | 7 +++-- tests/test_mockmodel.py | 13 ++++---- tests/test_model.py | 71 +++++++++++++++++++----------------------- tests/test_rest.py | 35 ++++++++++----------- tests/test_template.py | 41 ++++++++++++------------- tests/test_vmtemplate.py | 3 +- 10 files changed, 142 insertions(+), 125 deletions(-) -- 2.5.5

2 11

[PATCH][Kimchi] Test if CPU value is higher than Max CPU before request
by Rodrigo Trujillo 08 Apr '16

08 Apr '16

This patch does two modifications in Kimchi UI behavior: - Change "CPUs" by "Current CPUs" in Guest edit window in order to make it similar to other windows and widgets, like Template edit; - Add a CPU checking in the UI before send server request to update the guest. We know that CPU cannot be higher than Max CPU and backend is going to raise an error, so, to avoid waste of resources, warn the user when he/she clicks on Save button and do not perform the request. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 7 +++++++ ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 7a9c754..ef6d650 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -752,6 +752,13 @@ kimchi.guest_edit_main = function() { 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; + } + if (data['vcpus'] !== undefined) { var cpu = Number(data['vcpus']); var maxCpu = Number(data['max-processor']); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 05d0b14..5b7155a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -45,7 +45,7 @@ <input id="guest-edit-id-textbox" class="form-control" name="name" type="text" /> </div> <div class="form-group"> - <label for="guest-edit-cores-textbox">$_("CPUs")</label> + <label for="guest-edit-cores-textbox">$_("Current CPUs")</label> <div id="guest-processor"> <input id="guest-edit-cores-textbox" class="form-control" name="vcpus" type="number" min="1" /> <button id="guest-show-max-processor" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="cputext">$_("More")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 153d7c2..24abeb6 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -67,6 +67,7 @@ "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")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6003M": "$_("Attaching...")", -- 2.1.0

3 2

[PATCH] [Kimchi] Fix template creation from image file
by Jose Ricardo Ziviani 08 Apr '16

08 Apr '16

- When using an existing image as base for creating templates we cannot rely on its pool because it's undefined. This commit sets the default pool for this case. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- vmtemplate.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 653ad02..b71cf23 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -96,7 +96,12 @@ class VMTemplate(object): for index, disk in enumerate(disks): disk_info = dict(default_disk) - pool_type = self._get_storage_type(disk['pool']['name']) + if 'pool' in disk and 'name' in disk['pool']: + pool_type = self._get_storage_type(disk['pool']['name']) + else: + pool_type = self._get_storage_type( + default_disk['pool']['name']) + if pool_type in ['iscsi', 'scsi']: disk_info = {'index': 0, 'format': 'raw', 'volume': None} -- 1.9.1

3 2

[PATCH] [Wok] Implement update methods for object store
by Jose Ricardo Ziviani 07 Apr '16

07 Apr '16

- This commit implements two new methods for object store, update_data and update_id. Now it's possible to update an existing data instead of delete/create. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/wok/objectstore.py | 13 +++++++++++++ tests/test_objectstore.py | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index ff3796c..5ec87eb 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -94,6 +94,19 @@ class ObjectStoreSession(object): (ident, obj_type, jsonstr, version)) self.conn.commit() + def update_data(self, obj_type, ident, data): + jsonstr = json.dumps(data) + c = self.conn.cursor() + c.execute('UPDATE objects SET json=? WHERE id=? AND type=?', + (jsonstr, ident, obj_type)) + self.conn.commit() + + def update_id(self, obj_type, ident, new_ident): + c = self.conn.cursor() + c.execute('UPDATE objects SET id=? WHERE id=? AND type=?', + (new_ident, ident, obj_type)) + self.conn.commit() + class ObjectStore(object): def __init__(self, location=None): diff --git a/tests/test_objectstore.py b/tests/test_objectstore.py index 3ea7b70..d6ea434 100644 --- a/tests/test_objectstore.py +++ b/tests/test_objectstore.py @@ -82,6 +82,17 @@ class ObjectStoreTests(unittest.TestCase): item = session.get_object_version('f��', 't��st1') self.assertEquals(get_version().split('-')[0], item[0]) + # test update data + session.update_data('f��', 't��st1', {'��': 5}) + item = session.get('f��', 't��st1') + self.assertEquals(5, item[u'��']) + + # test update id + session.update_id('f��', 't��st1', 't��st2') + item = session.get('f��', 't��st2') + self.assertEquals(5, item[u'��']) + + def test_object_store_threaded(self): def worker(ident): with store as session: -- 1.9.1

3 3

[PATCH v5][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 07 Apr '16

07 Apr '16

Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message v4: Remove cdrom verification on model Use disk info from osinfo when adding disk based template Ramon Medeiros (4): Create a single field to pass the installation media Fix checking duplicate template before creating it Identify installation media while creating template Update tests API.json | 9 ++-- i18n.py | 2 +- model/templates.py | 26 +++++------ tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +-- tests/test_mockmodel.py | 13 +++--- tests/test_model.py | 94 +++++++++++++++++++++------------------ tests/test_rest.py | 36 ++++++++------- tests/test_template.py | 47 +++++++++----------- tests/test_vmtemplate.py | 40 +++++++++-------- vmtemplate.py | 104 +++++++++++++++++++++++++++++++++++++------- 11 files changed, 227 insertions(+), 155 deletions(-) -- 2.5.5

3 12

[PATCH V2] [Kimchi] Add support to Libvirt Events.
by pvital＠linux.vnet.ibm.com 07 Apr '16

07 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch adds support to handle in Kimchi any Libvirt Event, just by adding a callback to process the event and register the event with the callback. A method called register_common_events() is responsible to register the common domain events to use a generic callback that logs into error log, the event happened and it's details. This patch is part of the solution for Kimchi Issue #817 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 4 +++ model/libvirtevents.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 +++- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 model/libvirtevents.py diff --git a/i18n.py b/i18n.py index 6214687..3939aba 100644 --- a/i18n.py +++ b/i18n.py @@ -326,4 +326,8 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + "KCHEVENT0001E": _("Failed to register the default event implementation."), + "KCHEVENT0002E": _("Failed to register timeout event."), + "KCHEVENT0003E": _("Failed to Run the default event implementation."), + } diff --git a/model/libvirtevents.py b/model/libvirtevents.py new file mode 100644 index 0000000..2775476 --- /dev/null +++ b/model/libvirtevents.py @@ -0,0 +1,97 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import cherrypy +import libvirt +import time + +from wok.exception import OperationFailed +from wok.utils import wok_log + + +class LibvirtEvents(object): + def __init__(self): + # Register default implementation of event handlers + if libvirt.virEventRegisterDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0001E') + + # Run a background thread with the event loop. Using cherrypy + # BackgroundTask class due to issues when using threading module with + # cherrypy. + self.event_loop_thread = cherrypy.process.plugins.BackgroundTask( + 2, + self._event_loop_run + ) + self.event_loop_thread.setName('KimchiLibvirtEventLoop') + self.event_loop_thread.setDaemon(True) + self.event_loop_thread.start() + + # Set an event timeout to control the self._event_loop_run + if libvirt.virEventAddTimeout(0, self._kimchi_EventTimeout, None) < 0: + raise OperationFailed('KCHEVENT0002E') + + # Event loop method to be executed in background as thread + def _event_loop_run(self): + while True: + if libvirt.virEventRunDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0003E') + + def is_event_loop_alive(self): + return self.event_loop_thread.isAlive() + + # Event loop handler used to limit length of waiting for any other event. + def _kimchi_EventTimeout(self, timer, opaque): + time.sleep(1) + + def domain_event_generic_cb(self, conn, dom, event, detail, *args): + """ + Generic callback to handle Domain (VMs) events. + """ + evStrings = ("Defined", "Undefined", "Started", "Suspended", "Resumed", + "Stopped", "Shutdown", "PMSuspended", "Crashed") + evDetails = (("Added", "Updated"), + ("Removed", ), + ("Booted", "Migrated", "Restored", "Snapshot", "Wakeup"), + ("Paused", "Migrated", "IOError", "Watchdog", "Restored", + "Snapshot", "API error"), + ("Unpaused", "Migrated", "Snapshot"), + ("Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", + "Failed", "Snapshot"), + ("Finished", ), + ("Memory", "Disk"), + ("Panicked")) + msg = "Libvirt Event: Domain %s %s %s" % (dom.name(), evStrings[event], + evDetails[event][detail]) + + wok_log.error(msg) + + def register_common_domain_events(self, conn): + """ + Register the most common Libvirt domain events to be handled. + """ + conn = conn.get() + for ev in (libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, + libvirt.VIR_DOMAIN_EVENT_ID_REBOOT, + libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): + conn.domainEventRegisterAny(None, ev, self.domain_event_generic_cb, + ev) diff --git a/model/model.py b/model/model.py index e44f804..aeb8b7d 100644 --- a/model/model.py +++ b/model/model.py @@ -26,6 +26,7 @@ from wok.plugins.kimchi import config from wok.utils import import_module, listPathModules from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection +from wok.plugins.kimchi.model.libvirtevents import LibvirtEvents class Model(BaseModel): @@ -43,8 +44,11 @@ class Model(BaseModel): return instances self.objstore = ObjectStore(objstore_loc or config.get_object_store()) + self.events = LibvirtEvents() self.conn = LibvirtConnection(libvirt_uri) - kargs = {'objstore': self.objstore, 'conn': self.conn} + self.events.register_common_domain_events(self.conn) + kargs = {'objstore': self.objstore, 'conn': self.conn, + 'eventsloop': self.events} models = [] # Import task model from Wok -- 2.5.5

3 2

[PATCH v4][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 06 Apr '16

06 Apr '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message Ramon Medeiros (4): Create a single field to pass the installation media Fix checking duplicate template before creating it Identify installation media while creating template Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 15 ++++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +-- tests/test_mockmodel.py | 13 +++--- tests/test_model.py | 94 ++++++++++++++++++++----------------- tests/test_rest.py | 36 +++++++-------- tests/test_template.py | 47 +++++++++---------- tests/test_vmtemplate.py | 40 ++++++++-------- vmtemplate.py | 110 +++++++++++++++++++++++++++++++++++++------- 11 files changed, 235 insertions(+), 138 deletions(-) -- 2.5.5

3 16

[PATCH] [Kimchi] Bug fix: Use 256MB of memory on feature tests due restriction on Power machines
by Aline Manera 06 Apr '16

06 Apr '16

On Power machines the amount of memory must be aligned with 256MB. So adjust all feature tests according to it to avoid issues. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/featuretests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/model/featuretests.py b/model/featuretests.py index ba728e1..23e7eeb 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -34,7 +34,7 @@ FEATURETEST_POOL_NAME = "FEATURETEST_POOL" ISO_STREAM_XML = """ <domain type='%(domain)s'> <name>%(name)s</name> - <memory unit='KiB'>1048576</memory> + <memory unit='MiB'>256</memory> <os> <type arch='%(arch)s'>hvm</type> <boot dev='cdrom'/> @@ -56,7 +56,7 @@ ISO_STREAM_XML = """ SIMPLE_VM_XML = """ <domain type='%(domain)s'> <name>%(name)s</name> - <memory unit='KiB'>10240</memory> + <memory unit='MiB'>256</memory> <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> @@ -66,15 +66,15 @@ SIMPLE_VM_XML = """ MAXMEM_VM_XML = """ <domain type='%(domain)s'> <name>%(name)s</name> - <maxMemory slots='1' unit='KiB'>20480</maxMemory> - <memory unit='KiB'>10240</memory> + <maxMemory slots='1' unit='MiB'>512</maxMemory> + <memory unit='MiB'>256</memory> <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> <cpu> <numa> - <cell id='0' cpus='0' memory='10240' unit='KiB'/> + <cell id='0' cpus='0' memory='256' unit='MiB'/> </numa> </cpu> <features> @@ -85,7 +85,7 @@ MAXMEM_VM_XML = """ DEV_MEM_XML = """ <memory model='dimm'> <target> - <size unit='KiB'>10240</size> + <size unit='MiB'>256</size> <node>0</node> </target> </memory>""" -- 2.5.5

2 2

[PATCH V2] [Wok] Fix errors in Ginger/Gingerbase/Gingers390x tests
by Lucio Correia 04 Apr '16

04 Apr '16

Do not try to translate message when app is not found. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/message.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Changes in V2: applied review. diff --git a/src/wok/message.py b/src/wok/message.py index 7ea5711..a3794d0 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -45,11 +45,11 @@ class WokMessage(object): self.plugin = plugin def _get_translation(self): - wok_app = cherrypy.tree.apps[''] + wok_app = cherrypy.tree.apps.get('', None) # get app from plugin path if specified if self.plugin: - app = cherrypy.tree.apps[self.plugin] + app = cherrypy.tree.apps.get(self.plugin, None) # if on request, try to get app from it elif cherrypy.request.app: app = cherrypy.request.app @@ -57,9 +57,12 @@ class WokMessage(object): else: app = wok_app + if app is None: + return self.code + # fallback to Wok message in case plugins raise Wok exceptions - text = app.root.messages.get(self.code, None) - if text is None: + text = app.root.messages.get(self.code, self.code) + if text == self.code and wok_app is not None: app = wok_app text = app.root.messages.get(self.code, self.code) -- 1.9.1

3 2

[PATCH] [Wok] Fix errors in Ginger/Gingerbase/Gingers390x tests
by Lucio Correia 04 Apr '16

04 Apr '16

Do not try to translate message when app is not found. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/message.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/wok/message.py b/src/wok/message.py index 7ea5711..e4ee640 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -45,11 +45,11 @@ class WokMessage(object): self.plugin = plugin def _get_translation(self): - wok_app = cherrypy.tree.apps[''] + wok_app = cherrypy.tree.apps.get('', None) # get app from plugin path if specified if self.plugin: - app = cherrypy.tree.apps[self.plugin] + app = cherrypy.tree.apps.get(self.plugin, None) # if on request, try to get app from it elif cherrypy.request.app: app = cherrypy.request.app @@ -57,11 +57,13 @@ class WokMessage(object): else: app = wok_app + if app is None: + return self.code + # fallback to Wok message in case plugins raise Wok exceptions - text = app.root.messages.get(self.code, None) - if text is None: - app = wok_app - text = app.root.messages.get(self.code, self.code) + text = app.root.messages.get(self.code, self.code) + if text == self.code and wok_app is not None: + text = wok_app.root.messages.get(self.code, self.code) # do translation domain = app.root.domain -- 1.9.1

2 1

[PATCH V3] [Wok] Implement Asynchronous Notifications backend
by Lucio Correia 04 Apr '16

04 Apr '16

* There is no POST method: a notification is added through add_notification() method. * Notifications are always stored in Wok object store under 'notification' type, even if added by a plugin. * Every time Wok is started, all notifications are erased, since this is a UI feature, intended to be showed to the user asynchronously, independent of which tab is opened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/API/notifications.md | 36 ++++++++++++++++++++++++++ src/wok/control/notifications.py | 37 ++++++++++++++++++++++++++ src/wok/i18n.py | 3 +++ src/wok/model/notifications.py | 56 ++++++++++++++++++++++++++++++++++++++++ src/wok/objectstore.py | 36 ++++++++++++++++++++++++++ src/wok/server.py | 4 +++ 6 files changed, 172 insertions(+) create mode 100644 docs/API/notifications.md create mode 100644 src/wok/control/notifications.py create mode 100644 src/wok/model/notifications.py Changes in V3: - applied code review suggestions diff --git a/docs/API/notifications.md b/docs/API/notifications.md new file mode 100644 index 0000000..85e8463 --- /dev/null +++ b/docs/API/notifications.md @@ -0,0 +1,36 @@ +## REST API Specification for Notifications + +### Collection: Notifications + +**URI:** /notifications + +**Methods:** + +* **GET**: Retrieve a summarized list of current Notifications + +#### Examples +GET /notifications +[{Notification1}, {Notification2}, ...] + +### Resource: Notification + +**URI:** /notifications/*:id* + +A notification represents an asynchronous warning message sent to the web UI. + +**Methods:** + +* **GET**: Retrieve the full description of the Notification + * code: message ID + * message: message text already translated + * timestamp: first time notification was emitted + +* **DELETE**: Delete the Notification + +#### Examples +GET /notifications/KCHLIBVIRT0001W +{ + code: "KCHLIBVIRT0001W", + message: "KCHLIBVIRT0001W: Lack of storage space in guest vm-1", + timestamp: first time notification was emitted +} diff --git a/src/wok/control/notifications.py b/src/wok/control/notifications.py new file mode 100644 index 0000000..37d45f2 --- /dev/null +++ b/src/wok/control/notifications.py @@ -0,0 +1,37 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import Collection, Resource +from wok.control.utils import UrlSubNode + + +@UrlSubNode('notifications', True) +class Notifications(Collection): + def __init__(self, model): + super(Notifications, self).__init__(model) + self.resource = Notification + + +class Notification(Resource): + def __init__(self, model, id): + super(Notification, self).__init__(model, id) + + @property + def data(self): + return self.info diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e6087f4..5a2876f 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -45,6 +45,9 @@ messages = { "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), + "WOKNOT0001E": _("Unable to find notification %(id)s"), + "WOKNOT0002E": _("Unable to delete notification %(id)s: %(message)s"), + "WOKOBJST0001E": _("Unable to find %(item)s in datastore"), "WOKUTILS0001E": _("Unable to reach %(url)s. Make sure it is accessible and try again."), diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py new file mode 100644 index 0000000..77184db --- /dev/null +++ b/src/wok/model/notifications.py @@ -0,0 +1,56 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.exception import NotFoundError, OperationFailed +from wok.message import WokMessage + + +class NotificationsModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def get_list(self): + with self.objstore as session: + return session.get_list('notification') + + +class NotificationModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def lookup(self, id): + with self.objstore as session: + notification = session.get('notification', str(id)) + + # use WokMessage to translate the notification + if notification: + timestamp = notification['timestamp'] + plugin = notification.pop('_plugin_name', None) + message = WokMessage(id, notification, plugin).get_text() + return {"code": id, "message": message, "timestamp": timestamp} + + raise NotFoundError("WOKNOT0001E", {'id': str(id)}) + + def delete(self, id): + try: + with self.objstore as session: + session.delete('notification', str(id)) + except Exception as e: + raise OperationFailed("WOKNOT0002E", {'id': str(id), + 'msg': e.msg()}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 59354f3..ff3796c 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -23,6 +23,8 @@ import sqlite3 import threading import traceback +from datetime import datetime + try: from collections import OrderedDict except ImportError: @@ -144,3 +146,37 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False + + +def add_notification(code, args={}, plugin_name=None): + if not code: + wok_log.error("Unable to add notification: invalid code '%(code)s'" % + {'code': str(code)}) + return + + try: + with ObjectStore() as session: + notification = session.get('notification', code) + except NotFoundError: + notification = None + + try: + # do not update timestamp if notification already exists + timestamp = datetime.now().isoformat() if notification is None else \ + notification['timestamp'] + args.update({"_plugin_name": plugin_name, "timestamp": timestamp}) + + with ObjectStore() as session: + session.store('notification', code, args) + except Exception as e: + wok_log.error("Unable to store notification: %s" % e.message) + + +def clean_notifications(): + try: + with ObjectStore() as session: + notifications = session.get_list('notification') + for item in notifications: + session.delete('notification', item) + except Exception as e: + wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..a329ed4 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,6 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model +from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -106,6 +107,9 @@ class Server(object): if dev_env: cherrypy.log.screen = True + # clean object store notifications + clean_notifications() + # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

2 1

[PATCH] [Wok] Updating Makefile.am to pick fedora spec for the KVMIBM envirnment
by jkatta＠linux.vnet.ibm.com 04 Apr '16

04 Apr '16

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 86d83a0..325d0c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,8 @@ deb: contrib/make-deb.sh wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse @if test -e /etc/redhat-release; then \ ln -sf contrib/wok.spec.fedora $@ ; \ + elif test -e /etc/system-release; then \ + ln -sf contrib/wok.spec.fedora $@ ; \ elif test -e /etc/SuSE-release; then \ ln -sf contrib/wok.spec.suse $@ ; \ else \ -- 2.4.3

3 2

Patch "Implement WokMessage class" broke Ginger, Ginger-base and Gingers390x unit tests
by Daniel Henrique Barboza 04 Apr '16

04 Apr '16

The following WoK patch: "Implement WokMessage class" Broke one test case of Ginger 'test_create_existing_user_fails' with the error message below. With a similar error message, It also broke two unit tests in Gingerbase and 42 tests in Gingers390x. ====================================================================== ERROR: test_create_existing_user_fails (test_libuser.UserAdmTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/danielhb/kimchi/wok_ginger/src/wok/plugins/ginger/tests/test_libuser.py", line 68, in test_create_existing_user_fails users.create_user(user, passwd) File "/home/danielhb/kimchi/wok_ginger/src/wok/plugins/ginger/model/users.py", line 157, in create_user raise OperationFailed('GINUSER0008E', {'user': name}) File "/home/danielhb/kimchi/wok_ginger/src/wok/exception.py", line 30, in __init__ msg = WokMessage(code, args).get_text() File "/home/danielhb/kimchi/wok_ginger/src/wok/message.py", line 79, in get_text msg = self._get_translation() File "/home/danielhb/kimchi/wok_ginger/src/wok/message.py", line 48, in _get_translation wok_app = cherrypy.tree.apps[''] KeyError: '' Unless it is strictly necessary, I would rather not change the code in all those cases due to this WoK patch and WoK handle this error scenario by itself. If plug-in changes are required, please advise so I can fix them as fast as possible. Regards, Daniel

2 1

[PATCH V2] [Wok] Implement Asynchronous Notifications backend
by Lucio Correia 01 Apr '16

01 Apr '16

* There is no POST method: a notification is added through add_notification() method. * Notifications are always stored in Wok object store under 'notification' type, even if added by a plugin. * Every time Wok is started, all notifications are erased, since this is a UI feature, intended to be showed to the user asynchronously, independent of which tab is opened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/API/notifications.md | 34 ++++++++++++++++++++++++ src/wok/control/notifications.py | 37 ++++++++++++++++++++++++++ src/wok/i18n.py | 3 +++ src/wok/model/notifications.py | 56 ++++++++++++++++++++++++++++++++++++++++ src/wok/objectstore.py | 39 ++++++++++++++++++++++++++++ src/wok/server.py | 4 +++ 6 files changed, 173 insertions(+) create mode 100644 docs/API/notifications.md create mode 100644 src/wok/control/notifications.py create mode 100644 src/wok/model/notifications.py Changes in V2: - added timestamp - code as required parameter in add_notification - added DELETE api for notification This patch depends on WokMessage V3 patch diff --git a/docs/API/notifications.md b/docs/API/notifications.md new file mode 100644 index 0000000..851352f --- /dev/null +++ b/docs/API/notifications.md @@ -0,0 +1,34 @@ +## REST API Specification for Notifications + +### Collection: Notifications + +**URI:** /notifications + +**Methods:** + +* **GET**: Retrieve a summarized list of current Notifications + +#### Examples +GET /notifications +[{Notification1}, {Notification2}, ...] + +### Resource: Notification + +**URI:** /notifications/*:id* + +A task represents an asynchronous operation that is being performed by the +server. + +**Methods:** + +* **GET**: Retrieve the full description of the Notification + * code: message ID + * message: message text already translated + +#### Examples +GET /notifications/KCHLIBVIRT0001W +{ + id: "KCHLIBVIRT0001W", + message: "KCHLIBVIRT0001W: Lack of storage space in guest vm-1", + timestamp: first time notification was emitted +} diff --git a/src/wok/control/notifications.py b/src/wok/control/notifications.py new file mode 100644 index 0000000..37d45f2 --- /dev/null +++ b/src/wok/control/notifications.py @@ -0,0 +1,37 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import Collection, Resource +from wok.control.utils import UrlSubNode + + +@UrlSubNode('notifications', True) +class Notifications(Collection): + def __init__(self, model): + super(Notifications, self).__init__(model) + self.resource = Notification + + +class Notification(Resource): + def __init__(self, model, id): + super(Notification, self).__init__(model, id) + + @property + def data(self): + return self.info diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e6087f4..5a2876f 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -45,6 +45,9 @@ messages = { "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), + "WOKNOT0001E": _("Unable to find notification %(id)s"), + "WOKNOT0002E": _("Unable to delete notification %(id)s: %(message)s"), + "WOKOBJST0001E": _("Unable to find %(item)s in datastore"), "WOKUTILS0001E": _("Unable to reach %(url)s. Make sure it is accessible and try again."), diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py new file mode 100644 index 0000000..77184db --- /dev/null +++ b/src/wok/model/notifications.py @@ -0,0 +1,56 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.exception import NotFoundError, OperationFailed +from wok.message import WokMessage + + +class NotificationsModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def get_list(self): + with self.objstore as session: + return session.get_list('notification') + + +class NotificationModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def lookup(self, id): + with self.objstore as session: + notification = session.get('notification', str(id)) + + # use WokMessage to translate the notification + if notification: + timestamp = notification['timestamp'] + plugin = notification.pop('_plugin_name', None) + message = WokMessage(id, notification, plugin).get_text() + return {"code": id, "message": message, "timestamp": timestamp} + + raise NotFoundError("WOKNOT0001E", {'id': str(id)}) + + def delete(self, id): + try: + with self.objstore as session: + session.delete('notification', str(id)) + except Exception as e: + raise OperationFailed("WOKNOT0002E", {'id': str(id), + 'msg': e.msg()}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 59354f3..dbc3ee3 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -23,6 +23,8 @@ import sqlite3 import threading import traceback +from datetime import datetime + try: from collections import OrderedDict except ImportError: @@ -144,3 +146,40 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False + + +def add_notification(code, args={}, plugin_name=None): + if not code: + wok_log.error("Unable to add notification: invalide code '%(code)s'" % + {'code': str(code)}) + return + + found = True + try: + with ObjectStore() as session: + notification = session.get('notification', code) + except NotFoundError: + found = False + + try: + args.update({"_plugin_name": plugin_name, + "timestamp": datetime.now().isoformat()}) + + # do not update timestamp if notification already exists + if found: + args["timestamp"] = notification["timestamp"] + + with ObjectStore() as session: + session.store('notification', code, args) + except Exception as e: + wok_log.error("Unable to store notification: %s" % e.message) + + +def clean_notifications(): + try: + with ObjectStore() as session: + notifications = session.get_list('notification') + for item in notifications: + session.delete('notification', item) + except Exception as e: + wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..a329ed4 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,6 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model +from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -106,6 +107,9 @@ class Server(object): if dev_env: cherrypy.log.screen = True + # clean object store notifications + clean_notifications() + # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

3 4

[PATCH] [Wok] Remove unnecessary IDs from navbar
by peterpnns＠gmail.com 01 Apr '16

01 Apr '16

From: peterpennings <peterpnns(a)gmail.com> This patch removes unnecessary IDs from navbar to avoid warnings in HTML peterpennings (1): Remove unnecessary IDs from navbar ui/js/src/wok.main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.5.0

3 3

[PATCH V3] [Wok] Implement WokMessage class
by Lucio Correia 01 Apr '16

01 Apr '16

WokMessage is a generic message implementation, which looks up and translates error messages for all plugins and Wok itself. Lookup and translation code was adapted from WokException class, which now just uses WokMessage. WokMessage is intended to be used by other modules dealing with messages, such as User Request Log and future feature Asynchronous Notifications. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/exception.py | 45 +++-------------------------- src/wok/message.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 src/wok/message.py Changes in V3: - Aline's review diff --git a/src/wok/exception.py b/src/wok/exception.py index 023334b..52f007e 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -20,53 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy -import gettext -from wok.i18n import messages as _messages -from wok.template import get_lang, validate_language +from wok.message import WokMessage class WokException(Exception): def __init__(self, code='', args={}): self.code = code - - for key, value in args.iteritems(): - if isinstance(value, unicode): - continue - - # value is not unicode: convert it - try: - # In case the value formats itself to an ascii string. - args[key] = unicode(str(value), 'utf-8') - except UnicodeEncodeError: - # In case the value is a WokException or it formats - # itself to a unicode string. - args[key] = unicode(value) - - # First, check if it is a Wok error message, then search in plugin - # error messages list - msg = _messages.get(code, code) - if (msg == code) and (cherrypy.request.app): - msg = self._get_translation() - - msg = unicode(msg, 'utf-8') % args - pattern = "%s: %s" % (code, msg) - cherrypy.log.error_log.error(pattern) - Exception.__init__(self, pattern) - - def _get_translation(self): - lang = validate_language(get_lang()) - paths = cherrypy.request.app.root.paths - domain = cherrypy.request.app.root.domain - messages = cherrypy.request.app.root.messages - text = messages.get(self.code, self.code) - - try: - translation = gettext.translation(domain, paths.mo_dir, [lang]) - except: - translation = gettext - - return translation.gettext(text) + msg = WokMessage(code, args).get_text() + cherrypy.log.error_log.error(msg) + Exception.__init__(self, msg) class NotFoundError(WokException): diff --git a/src/wok/message.py b/src/wok/message.py new file mode 100644 index 0000000..414788c --- /dev/null +++ b/src/wok/message.py @@ -0,0 +1,81 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import cherrypy +import gettext + +from wok.template import get_lang, validate_language + + +class WokMessage(object): + def __init__(self, code='', args={}, plugin=None): + # make all args unicode + for key, value in args.iteritems(): + if isinstance(value, unicode): + continue + + try: + # In case the value formats itself to an ascii string. + args[key] = unicode(str(value), 'utf-8') + except UnicodeEncodeError: + # In case the value is a WokException or it formats + # itself to a unicode string. + args[key] = unicode(value) + + self.code = code + self.args = args + self.plugin = plugin + + def _get_translation(self): + wok_app = cherrypy.tree.apps[''] + + # get app from plugin path if specified + if self.plugin: + app = cherrypy.tree.apps[self.plugin] + # if on request, try to get app from it + elif cherrypy.request.app: + app = cherrypy.request.app + # fallback: get root app (WokRoot) + else: + app = wok_app + + # fallback to Wok message in case plugins raise Wok exceptions + text = app.root.messages.get(self.code, None) + if text is None: + app = wok_app + text = app.root.messages.get(self.code, self.code) + + # do translation + domain = app.root.domain + paths = app.root.paths + lang = validate_language(get_lang()) + + try: + translation = gettext.translation(domain, paths.mo_dir, [lang]) + except: + translation = gettext + + return translation.gettext(text) + + def get_text(self): + msg = self._get_translation() + msg = unicode(msg, 'utf-8') % self.args + return "%s: %s" % (self.code, msg) -- 1.9.1

2 1