July 2014 - Kimchi-devel - oVirt List Archives

[PATCH V2 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com 18 Jul '14

18 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: make ticket as sub-resource of a VM A ticket is the credential to access VM. Only who get the ticket can access a VM. test this patch set: set the ticket $sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \ "Accept: application/json" https://localhost:8001/vms/test-vm-8/ticket/ \ -X PUT -d '{"passwd": "abcd"}' get the ticket $sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \ "Accept: application/json" https://localhost:8001/vms/test-vm-8/ticket/ ShaoHe Feng (5): vm ticket in backend: update API.md vm ticket in backend: update controller and API.json vm ticket in backend: update model vm ticket in backend: update mockmodel vm ticket in backend: update test case docs/API.md | 20 +++++++++++++++ src/kimchi/API.json | 14 ++++++++++ src/kimchi/control/vms.py | 13 ++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 18 +++++++++++++ src/kimchi/model/vms.py | 65 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 31 ++++++++++++++++++++++ tests/test_rest.py | 36 ++++++++++++++++++++++++++ 8 files changed, 198 insertions(+) -- 1.9.3

4 24

[PATCHv2 0/5] Create vm from image based template
by lvroyce＠linux.vnet.ibm.com 18 Jul '14

18 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> How to test: create a image using: POST /templates {'name':'mytemp', 'disks':[{'base':'a_base_img_path'}]} create a vm using: POST /vms {'template': '/templates/mytemp', 'pool'....} Known issues: 1.This is only available for NFS and dir pool 2.template integrity is not checked, and base img is not protected. 3.Welcome ideas on how to test this feature. Royce Lv (5): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Integrate image os probe in vm template create Create volume based on backing store image docs/API.md | 3 ++- docs/README.md | 9 ++++--- src/kimchi/API.json | 8 +++++- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 +++ src/kimchi/i18n.py | 8 +++++- src/kimchi/imageinfo.py | 48 +++++++++++++++++++++++++++++++++ src/kimchi/mockmodel.py | 27 ++++++++++++++----- src/kimchi/model/templates.py | 13 +++++---- src/kimchi/model/vms.py | 1 + src/kimchi/utils.py | 16 +++++++++++ src/kimchi/vmtemplate.py | 60 +++++++++++++++++++++++++++-------------- tests/test_rest.py | 2 +- 13 files changed, 162 insertions(+), 39 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 14

[WIP] Filter VMs by users and groups
by Crístian Viana 17 Jul '14

17 Jul '14

This is a working version of the patchset. It will use the users and groups metadata on each VM to decide if the current user is able to perform an operation on the VM. If the user (1) has sudo access or (2) is listed in the VM 'users' metadata or (3) is part of at least one of the groups listed in the VM 'groups' metadata, they will be able to see and perform any operation on that VM. The VMs listed by /vms are also filtered by the current user's permissions. This patch contains the actual feature implementation. The tests and appropriate updates to the mockmodel are not ready yet, as they happen to require more changes in the current code than expected. Crístian Viana (1): Filter VMs by users and groups src/kimchi/control/base.py | 4 +++ src/kimchi/model/vms.py | 63 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) -- 1.9.3

3 6

[PATCH] add a Base64 saftURL encode and decode function
by shaohef＠linux.vnet.ibm.com 17 Jul '14

17 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> These two functions are similar to the functions in ui/js/novnc/base64.js usage: --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -36,6 +36,7 @@ <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> <script src="$href('js/kimchi.min.js')"></script> +<script src="$href('js/Base64saftURL.js')"></script> <style type="text/css"> .topbar select { float: right; then in UI: Base64.encode("f4>&^bc") "ZjQ-Jl5iYw==" Base64.decode("ZjQ-Jl5iYw==") "f4>&^bc" this is just a sample. we can add it to ui/js/src/kimchi.utils.js Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/Base64saftURL.js | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 ui/js/Base64saftURL.js diff --git a/ui/js/Base64saftURL.js b/ui/js/Base64saftURL.js new file mode 100644 index 0000000..8880a7e --- /dev/null +++ b/ui/js/Base64saftURL.js @@ -0,0 +1,110 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools… + +/*jslint white: false, bitwise: false, plusplus: false */ +/*global console */ + +var Base64 = { + +/* Convert data (an array of integers) to a Base64 string. */ +toBase64Table : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_='.split(''), +base64Pad : '=', + +encode: function (data) { + "use strict"; + var result = ''; + var toBase64Table = Base64.toBase64Table; + var length = data.length + var lengthpad = (length%3); + var i = 0, j = 0; + // Convert every three bytes to 4 ascii characters. + /* BEGIN LOOP */ + for (i = 0; i < (length - 2); i += 3) { + result += toBase64Table[data.charCodeAt(i) >> 2]; + result += toBase64Table[((data.charCodeAt(i) & 0x03) << 4) + (data.charCodeAt(i+1) >> 4)]; + result += toBase64Table[((data.charCodeAt(i+1) & 0x0f) << 2) + (data.charCodeAt(i+2) >> 6)]; + result += toBase64Table[data.charCodeAt(i+2) & 0x3f]; + } + /* END LOOP */ + + // Convert the remaining 1 or 2 bytes, pad out to 4 characters. + if (lengthpad === 2) { + j = length - lengthpad; + result += toBase64Table[data.charCodeAt(j) >> 2]; + result += toBase64Table[((data.charCodeAt(j) & 0x03) << 4) + (data.charCodeAt(j+1) >> 4)]; + result += toBase64Table[(data.charCodeAt(j+1) & 0x0f) << 2]; + result += toBase64Table[64]; + } else if (lengthpad === 1) { + j = length - lengthpad; + result += toBase64Table[data.charCodeAt(j) >> 2]; + result += toBase64Table[(data.charCodeAt(j) & 0x03) << 4]; + result += toBase64Table[64]; + result += toBase64Table[64]; + } + + return result; +}, + +/* Convert Base64 data to a string */ +toBinaryTable : [ + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,62,-1,-1, + 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, + 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,63, + -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, + 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 +], + +decode: function (data, offset) { + "use strict"; + offset = typeof(offset) !== 'undefined' ? offset : 0; + var toBinaryTable = Base64.toBinaryTable; + var base64Pad = Base64.base64Pad; + var result, result_length, idx, i, c, padding; + var leftbits = 0; // number of bits decoded, but yet to be appended + var leftdata = 0; // bits decoded, but yet to be appended + + // Convert one by one. + /* BEGIN LOOP */ + result = "" + for (idx = 0, i = offset; i < data.length; i++) { + c = toBinaryTable[data.charCodeAt(i) & 0x7f]; + padding = (data.charAt(i) === base64Pad); + // Skip illegal characters and whitespace + if (c === -1) { + console.error("Illegal character code " + data.charCodeAt(i) + " at position " + i); + continue; + } + + // Collect data into leftdata, update bitcount + leftdata = (leftdata << 6) | c; + leftbits += 6; + + // If we have 8 or more bits, append 8 bits to the result + if (leftbits >= 8) { + leftbits -= 8; + // Append if not padding. + if (!padding) { + idx++; + result += String.fromCharCode((leftdata >> leftbits) & 0xff); + } + leftdata &= (1 << leftbits) - 1; + } + } + /* END LOOP */ + + // If there are any bits left, the base64 string was corrupted + if (leftbits) { + throw {name: 'Base64-Error', + message: 'Corrupted base64 string'}; + } + + return result; +} + +}; /* End of Base64 namespace */ -- 1.9.3

4 3

[PATCH 0/4] Let frontend redirect user after logging
by alinefm＠linux.vnet.ibm.com 16 Jul '14

16 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Aline Manera (4): Update test case to reflect new login design Remove former login design files Remove special console rules from nginx configuration Let frontend redirect user after logging src/kimchi/auth.py | 10 +-- src/kimchi/root.py | 19 +---- src/nginx.conf.in | 11 --- tests/test_rest.py | 2 +- ui/css/theme-default/login-window.css | 90 ------------------------ ui/js/src/kimchi.login.js | 64 +++++++++++++++++ ui/js/src/kimchi.login_window.js | 128 ---------------------------------- ui/pages/login-window.html.tmpl | 53 -------------- ui/pages/login.html.tmpl | 36 ++-------- 9 files changed, 72 insertions(+), 341 deletions(-) delete mode 100644 ui/css/theme-default/login-window.css create mode 100644 ui/js/src/kimchi.login.js delete mode 100644 ui/js/src/kimchi.login_window.js delete mode 100644 ui/pages/login-window.html.tmpl -- 1.9.3

3 7

[PATCH 0/3 V2] authorization: Backend changes
by alinefm＠linux.vnet.ibm.com 16 Jul '14

16 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 -> V2: - Add "access" elements to describe role/view for each tab - Return a role map in /login For each tab, a role will be returned. That way we have more flexibility to change user role per tab - Add "access" parameter to VM.lookup() As the user will have full access to the VM assigned to it, return "access=full" for all them Aline Manera (3): authorization: Update /login to return user roles instead of sudo parameter authorization: Add "access" elements to tabs.xml to describe user view authorization: Add "access" parameter to VM resource config/ui/tabs.xml | 15 +++++++++++++++ plugins/sample/ui/config/tab-ext.xml | 3 +++ src/kimchi/auth.py | 19 ++++++++++++++----- src/kimchi/mockmodel.py | 3 ++- src/kimchi/model/vms.py | 3 ++- src/kimchi/utils.py | 15 +++++++++++++++ tests/test_rest.py | 6 ++++++ tests/utils.py | 6 +++--- 8 files changed, 60 insertions(+), 10 deletions(-) -- 1.9.3

4 11

[RFC] filter the users of host system
by Sheldon 16 Jul '14

16 Jul '14

Now kimchi uses host system users to login. In fedora most of system users are not allowed to login. so we should filter them. but in ubuntu, it seems most system user still can login. but their pw_shell are /bin/sh it is softlink to */bin/bash * Now I'd like to just list the users who's pw_shell are /bin/bash Not sure all distribution can works well by this way. I have just checked fedora and ubuntu, seems it can works. so any one can help check if any exception on your distribution? *root:x:0:0:root:/root:/bin/bash* bin:x:1:1:bin:/bin:/sbin/nologin daemon:x:2:2:daemon:/sbin:/sbin/nologin adm:x:3:4:adm:/var/adm:/sbin/nologin lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin sync:x:5:0:sync:/sbin:/bin/sync shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown halt:x:7:0:halt:/sbin:/sbin/halt mail:x:8:12:mail:/var/spool/mail:/sbin/nologin operator:x:11:0:operator:/root:/sbin/nologin games:x:12:100:games:/usr/games:/sbin/nologin ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin nobody:x:99:99:Nobody:/:/sbin/nologin avahi-autoipd:x:170:170:Avahi IPv4LL Stack:/var/lib/avahi-autoipd:/sbin/nologin dbus:x:81:81:System message bus:/:/sbin/nologin polkitd:x:999:999:User for polkitd:/:/sbin/nologin abrt:x:173:173::/etc/abrt:/sbin/nologin usbmuxd:x:113:113:usbmuxd user:/:/sbin/nologin colord:x:998:998:User for colord:/var/lib/colord:/sbin/nologin rtkit:x:172:172:RealtimeKit:/proc:/sbin/nologin geoclue:x:997:996:User for geoclue:/var/lib/geoclue:/sbin/nologin chrony:x:996:995::/var/lib/chrony:/sbin/nologin tss:x:59:59:Account used by the trousers package to sandbox the tcsd daemon:/dev/null:/sbin/nologin unbound:x:995:994:Unbound DNS resolver:/etc/unbound:/sbin/nologin openvpn:x:994:993:OpenVPN:/etc/openvpn:/sbin/nologin avahi:x:70:70:Avahi mDNS/DNS-SD Stack:/var/run/avahi-daemon:/sbin/nologin pulse:x:993:991:PulseAudio System Daemon:/var/run/pulse:/sbin/nologin gdm:x:42:42::/var/lib/gdm:/sbin/nologin gnome-initial-setup:x:992:989::/run/gnome-initial-setup/:/sbin/nologin nm-openconnect:x:991:988:NetworkManager user for OpenConnect:/:/sbin/nologin sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin *shhfeng:x:1000:1000:shhfeng:/home/shhfeng:/bin/bash* qemu:x:107:107:qemu user:/:/sbin/nologin rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/sbin/nologin radvd:x:75:75:radvd user:/:/sbin/nologin rpcuser:x:29:29:RPC Service User:/var/lib/nfs:/sbin/nologin nfsnobody:x:65534:65534:Anonymous NFS User:/var/lib/nfs:/sbin/nologin saslauth:x:990:76:"Saslauthd user":/run/saslauthd:/sbin/nologin *guest:x:1001:1001::/home/guest:/bin/bash* nginx:x:989:984:Nginx web server:/var/lib/nginx:/sbin/nologin but in ubuntu, it seems most system user still can login. but their pw_shell are /bin/sh it is softlink to */bin/bash* *root:x:0:0:root:/root:/bin/bash* daemon:x:1:1:daemon:/usr/sbin:/bin/sh bin:x:2:2:bin:/bin:/bin/sh sys:x:3:3:sys:/dev:/bin/sh sync:x:4:65534:sync:/bin:/bin/sync games:x:5:60:games:/usr/games:/bin/sh man:x:6:12:man:/var/cache/man:/bin/sh lp:x:7:7:lp:/var/spool/lpd:/bin/sh mail:x:8:8:mail:/var/mail:/bin/sh news:x:9:9:news:/var/spool/news:/bin/sh uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh proxy:x:13:13:proxy:/bin:/bin/sh www-data:x:33:33:www-data:/var/www:/bin/sh backup:x:34:34:backup:/var/backups:/bin/sh list:x:38:38:Mailing List Manager:/var/list:/bin/sh irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh libuuid:x:100:101::/var/lib/libuuid:/bin/sh syslog:x:101:103::/home/syslog:/bin/false messagebus:x:102:105::/var/run/dbus:/bin/false usbmux:x:103:46:usbmux daemon,,,:/home/usbmux:/bin/false dnsmasq:x:104:65534:dnsmasq,,,:/var/lib/misc:/bin/false avahi-autoipd:x:105:111:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false kernoops:x:106:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false rtkit:x:107:113:RealtimeKit,,,:/proc:/bin/false whoopsie:x:108:114::/nonexistent:/bin/false speech-dispatcher:x:109:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh avahi:x:110:116:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false lightdm:x:111:117:Light Display Manager:/var/lib/lightdm:/bin/false pulse:x:112:119:PulseAudio daemon,,,:/var/run/pulse:/bin/false hplip:x:113:7:HPLIP system user,,,:/var/run/hplip:/bin/false colord:x:114:122:colord colour management daemon,,,:/var/lib/colord:/bin/false saned:x:115:123::/home/saned:/bin/false *royce:x:1000:1000:royce,,,:/home/royce:/bin/bash* libvirt-qemu:x:116:126:Libvirt Qemu,,,:/var/lib/libvirt:/bin/false libvirt-dnsmasq:x:117:125:Libvirt Dnsmasq,,,:/var/lib/libvirt/dnsmasq:/bin/false statd:x:118:65534::/var/lib/nfs:/bin/false sshd:x:119:65534::/var/run/sshd:/usr/sbin/nologi -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 6

[PATCH v5 00/10] Debug Report Rename Feature
by Hongliang Wang 15 Jul '14

15 Jul '14

Enable debug report rename feature in this patch set. Please apply the following patch set first: * [PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate v4 -> v5: 5a) Implemented mock model (Aline's comment) 5b) Implemented test code (Aline's comment) v3 -> v4: 4a) Updated according to dependency changes v2 -> v3: 3a) Added check for name existence when renaming a report (Yu Xin's comment) v1 -> v2: 2a) Retrieved the Right Generated Time for Debug Report (Wen Wang's comment) 2b) Sorted debug reports by Generated Time Descendingly (Wen Wang's comment) 2c) Enabled Form Fields after Request Processed (Yuxin's comment) Hongliang Wang (9): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report: Use Generated Time instead of Most Changed Time Debug Report: Sort Reports by Generated Time Descendingly Debug Report Rename UI: Add API in kimchi.api.js Debug Report Rename UI: Add Rename Page Debug Report Rename UI: Enable Rename in Host Tab Debug Report: Update MockModel Royce Lv (1): Debug Report Rename: Update Test Code docs/API.md | 3 ++ src/kimchi/API.json | 11 +++++++ src/kimchi/control/debugreports.py | 8 ++++- src/kimchi/mockmodel.py | 18 +++++++++++- src/kimchi/model/debugreports.py | 18 +++++++++++- tests/test_model.py | 7 ++++- tests/test_rest.py | 6 +++- ui/css/theme-default/report-rename.css | 22 ++++++++++++++ ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.host.js | 35 +++++++++++++++------- ui/js/src/kimchi.report_rename_main.js | 41 ++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 ++++++++++++++++++++++++++++++++++ 12 files changed, 218 insertions(+), 16 deletions(-) create mode 100644 ui/css/theme-default/report-rename.css create mode 100644 ui/js/src/kimchi.report_rename_main.js create mode 100644 ui/pages/report-rename.html.tmpl -- 1.8.1.4

2 24

[PATCH v6 00/10] Debug Report Rename Feature
by Hongliang Wang 15 Jul '14

15 Jul '14

Enable debug report rename feature in this patch set. Please apply the following patch set first: * [PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate v5 -> v6: 6a) Updated regexp of report name in API.json (Aline's comment) 6b) Updated license statement (Aline's comment) v4 -> v5: 5a) Implemented mock model (Aline's comment) 5b) Implemented test code (Aline's comment) v3 -> v4: 4a) Updated according to dependency changes v2 -> v3: 3a) Added check for name existence when renaming a report (Yu Xin's comment) v1 -> v2: 2a) Retrieved the Right Generated Time for Debug Report (Wen Wang's comment) 2b) Sorted debug reports by Generated Time Descendingly (Wen Wang's comment) 2c) Enabled Form Fields after Request Processed (Yuxin's comment) Hongliang Wang (9): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report: Use Generated Time instead of Most Changed Time Debug Report: Sort Reports by Generated Time Descendingly Debug Report Rename UI: Add API in kimchi.api.js Debug Report Rename UI: Add Rename Page Debug Report Rename UI: Enable Rename in Host Tab Debug Report: Update MockModel Royce Lv (1): Debug Report Rename: Update Test Code docs/API.md | 3 ++ src/kimchi/API.json | 11 +++++++ src/kimchi/control/debugreports.py | 8 ++++- src/kimchi/mockmodel.py | 18 ++++++++++- src/kimchi/model/debugreports.py | 18 ++++++++++- tests/test_model.py | 7 +++- tests/test_rest.py | 6 +++- ui/css/theme-default/report-rename.css | 39 +++++++++++++++++++++++ ui/js/src/kimchi.api.js | 12 +++++++ ui/js/src/kimchi.host.js | 35 +++++++++++++------- ui/js/src/kimchi.report_rename_main.js | 58 ++++++++++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 +++++++++++++++++++++++++++++++ 12 files changed, 252 insertions(+), 16 deletions(-) create mode 100644 ui/css/theme-default/report-rename.css create mode 100644 ui/js/src/kimchi.report_rename_main.js create mode 100644 ui/pages/report-rename.html.tmpl -- 1.8.1.4

2 12

[PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate
by Hongliang Wang 14 Jul '14

14 Jul '14

Fixed 2 bugs: 1). When in mock model, generate report doesn't work if report name is left as blank. 2). When in mock model, generate report window will never disappear even after the report is generated. Hongliang Wang (2): MockModel: Can't Generate Report if Name is not Given Debug Report UI: Generate Report Doesn't Work with Mock Model src/kimchi/mockmodel.py | 8 +++++++- ui/js/src/kimchi.report_add_main.js | 39 ++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 19 deletions(-) -- 1.8.1.4

2 5

[PATCH 0/2 V2] Add option to add/remove fonts files in rpm packages
by alinefm＠linux.vnet.ibm.com 14 Jul '14

14 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 - V2: - Remove useless fonts - Set SUBDIRS according to FONTS (Zheng Sheng) - Set --enable-fonts as default behavior - Explict verify with_fonts value to enable its use outside make process - Add the same behavior to suse spec file Aline Manera (1): Remove useless fonts ShaoHe Feng (1): Add option to add/remove fonts files in rpm packages Makefile.am | 8 +++++++- configure.ac | 12 ++++++++++++ contrib/kimchi.spec.fedora.in | 19 ++++++++++++++----- contrib/kimchi.spec.suse.in | 11 ++++++++++- ui/css/Makefile.am | 6 +++++- ui/css/fonts/Makefile.am | 4 ---- ui/css/fonts/fontawesome-webfont.eot | Bin 25395 -> 0 bytes ui/css/fonts/fontawesome-webfont.ttf | Bin 55096 -> 0 bytes ui/css/fonts/fontawesome-webfont.woff | Bin 29380 -> 0 bytes 9 files changed, 48 insertions(+), 12 deletions(-) delete mode 100644 ui/css/fonts/fontawesome-webfont.eot delete mode 100644 ui/css/fonts/fontawesome-webfont.ttf delete mode 100644 ui/css/fonts/fontawesome-webfont.woff -- 1.9.3

3 5

[PATCH v7 0/4] Host device passthrough: Summary
by Zhou Zheng Sheng 14 Jul '14

14 Jul '14

Hi, This patch series is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. Host devices form a tree. We can assign most of the devices in the tree to VM. By assigning a device, all the devices in its sub-tree are also assigned. It might not make sense to assign a USB controller, because the host may be using one of the devices connected to the controller. Instead, Kimchi just presents the "leaf" devices to assign to guest. In recent Linux kernel and KVM, it is able to recognize the IOMMU group of a PCI device. The "leaf" PCI devices in the same IOMMU group should be assigned and dismissed together. The IOMMU group is the actual smallest isolation granularity of the PCI devices. The first patch is to list all host devices information. It's useful on its own to show host devices information. The second patch is to list all eligible host devices to assign, as well as the "affected" devices in the same IOMMU group. The third patch creates a sub-collection "hostdevs" to the VM resource, and deals with assigning and dismissing devices. The fourth patch adds a sub-collection "vm_holders" to the host device resource. It's to list all VMs that are holding the device. I'll update API and unit test once everyone is happy with the interface and logic. v7: Some minor coding style improvements. v6: Do not passthrough PCI device of class code 0x07. It might contains system device not suitable to assign to guest. v5: Filter ealigible pci devices according to pci class. When assigning a device to VM, check if there are other VMs holding it. Use "kimchi.model.utils.get_vm_config_flag()" to correctly set the device attaching API flag. v4: Add new sub-collection to host device to list the VMs holding the device. v3: Fix a small naming error introduced by rebase. v2: Handle the devices in VM's sub-collection "hostdevs". v1: Handle the devices in VM template. Zhou Zheng Sheng (4): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device docs/API.md | 11 +- src/kimchi/control/host.py | 16 ++ src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/hostdev.py | 311 +++++++++++++++++++++++++++++++ src/kimchi/i18n.py | 9 + src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 32 ++-- src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 323 +++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 786 insertions(+), 39 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

2 15

[PATCH] Have the quote deleted from the url located in "lastPage"
by wenwang＠linux.vnet.ibm.com 14 Jul '14

14 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Enabled Redirection for reload by having the quote deleted from the url located in "lastPage" Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.login.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/kimchi.login.js index a547999..0c11e45 100644 --- a/ui/js/src/kimchi.login.js +++ b/ui/js/src/kimchi.login.js @@ -55,7 +55,7 @@ kimchi.login_main = function() { } else { // lastPage is displayed with " ". How to exclude " " from string? - var lastPage = kimchi.cookie.get('lastPage'); + var lastPage = kimchi.cookie.get('lastPage').replace(/\"/g,''); var next_url = lastPage ? lastPage : "/" } window.location.replace(next_url) -- 1.7.1

1 0

[PATCH 0/2] Doc and testcases: Create template from image
by lvroyce＠linux.vnet.ibm.com 13 Jul '14

13 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> This patch is to present the api definition and clean original cdrom based template creation implementation. Royce Lv (2): Change doc and api specification Change 'cdrom' to a optional param docs/API.md | 3 ++- src/kimchi/API.json | 8 +++++++- src/kimchi/control/templates.py | 2 +- src/kimchi/i18n.py | 3 ++- src/kimchi/mockmodel.py | 26 ++++++++++++++++++++------ src/kimchi/model/templates.py | 13 ++++++++----- src/kimchi/vmtemplate.py | 12 ++++++++++-- tests/test_rest.py | 2 +- 8 files changed, 51 insertions(+), 18 deletions(-) -- 1.8.3.2

3 6

[PATCHv2] Add image probe function
by lvroyce＠linux.vnet.ibm.com 13 Jul '14

13 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Add handling exception. Image file probe will be used in identify image file os info and generate reasonable configuration for it. This will be useful when import image and create a vm from it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++--- src/kimchi/exception.py | 4 ++++ src/kimchi/i18n.py | 4 ++++ src/kimchi/imageinfo.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 src/kimchi/imageinfo.py diff --git a/docs/README.md b/docs/README.md index ab03918..24537e1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -54,7 +54,8 @@ Install Dependencies qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ iscsi-initiator-utils libxslt pyparted nginx \ - policycoreutils-python + policycoreutils-python python-libguestfs \ + libguestfs-tools # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -76,7 +77,8 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted nginx firewalld + open-iscsi lvm2 xsltproc python-parted nginx \ + firewalld python-guestfs libguestfs-tools Packages version requirement: python-jsonschema >= 1.3.0 @@ -90,7 +92,8 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted \ + python-libguestfs guestfs-tools Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..6b4c913 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -89,5 +89,9 @@ class IsoFormatError(KimchiException): pass +class ImageFormatError(KimchiException): + pass + + class TimeoutExpired(KimchiException): pass diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..daeeed8 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -61,6 +61,10 @@ messages = { "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'." "Details: %(err)s" ), + "KCHIMG0001E": _("Error occurs when probing image os information."), + "KCHIMG0002E": _("No os information found in given image."), + "KCHIMG0003E": _("Unable to find/read image file %(filename)s"), + "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s already exists or it is not powered off."), diff --git a/src/kimchi/imageinfo.py b/src/kimchi/imageinfo.py new file mode 100644 index 0000000..26a9480 --- /dev/null +++ b/src/kimchi/imageinfo.py @@ -0,0 +1,48 @@ +# +# Kimchi +# +# Copyright IBM Corp, 2013 +# +# 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 os +import sys +import guestfs + +from kimchi.exception import ImageFormatError + +def probe_image(image_path): + g = guestfs.GuestFS(python_return_dict=True) + g.add_drive_opts(image_path, readonly=1) + g.launch() + if not os.access(image_path, os.R_OK): + raise ImageFormatError("KCHIMG0003E", {'filename': image_path}) + try: + roots = g.inspect_os() + except: + raise ImageFormatError("KCHIMG0001E") + if len(roots) == 0: + raise ImageFormatError("KCHIMG0002E") + + for root in roots: + version = "%d.%d" % (g.inspect_get_major_version(root), + g.inspect_get_minor_version(root)) + distro = "%s" % (g.inspect_get_distro(root)) + + return (distro, version) + + +if __name__ == '__main__': + print probe_image(sys.argv[1]) -- 1.8.3.2

3 2

[PATCH 0/2] authorization: Backend changes
by alinefm＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> This patchset provides the backend changes discussed in "[Kimchi-devel] RFC: Design of Authorization in Kimchi" Aline Manera (2): authorization: Update /login to return user roles instead of sudo parameter authorization: Add "mode" attribute to describe user view config/ui/tabs.xml | 10 +++++----- src/kimchi/auth.py | 12 ++++++++---- tests/test_rest.py | 6 ++++++ tests/utils.py | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) -- 1.9.3

3 7

[PATCH V2] add an option do not build fonts files in rpm packages
by shaohef＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> ui/css/fonts/novnc/Makefile and ui/css/fonts/Makefile will not install fonts when build fonts are disabled. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 6 +++++- configure.ac | 12 ++++++++++++ contrib/kimchi.spec.fedora.in | 4 +++- ui/css/fonts/Makefile.am | 4 ++++ ui/css/fonts/novnc/Makefile.am | 4 ++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9785de9..e6ff673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,10 @@ SUBDIRS = src ui docs contrib tests po config plugins +if FONTS +WITH_FONTS = --define="with_fonts 1" +endif + ACLOCAL_AMFLAGS = --install -I m4 EXTRA_DIST = \ @@ -134,7 +138,7 @@ rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES - rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + rpmbuild -ba $(WITH_FONTS) --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec fedora-rpm: contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec diff --git a/configure.ac b/configure.ac index e5e6441..43cf35f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,18 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +AC_ARG_ENABLE( + [fonts], + [AS_HELP_STRING( + [--enable-fonts], + [Build fonts files in package @<:@default=no@:>@] + )], + , + [enable_fonts="no"] +) + +AM_CONDITIONAL([FONTS], [test "${enable_fonts}" = "yes"]) + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 993fd6f..4e863f5 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -61,7 +61,7 @@ Web server application to manage KVM/Qemu virtual machines %build -%configure +%configure %{?with_fonts:--enable-fonts} make @@ -154,8 +154,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/doc/kimchi-templates.png %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml +%if 0%{?with_fonts} %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.* %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* +%endif %{_datadir}/kimchi/ui/css/novnc/base.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png diff --git a/ui/css/fonts/Makefile.am b/ui/css/fonts/Makefile.am index 63df038..1de082f 100644 --- a/ui/css/fonts/Makefile.am +++ b/ui/css/fonts/Makefile.am @@ -19,4 +19,8 @@ SUBDIRS = novnc fontdir = $(datadir)/kimchi/ui/css/fonts +if FONTS dist_font_DATA = fontawesome-webfont.* +else +dist_noinst_DATA = fontawesome-webfont.* +endif diff --git a/ui/css/fonts/novnc/Makefile.am b/ui/css/fonts/novnc/Makefile.am index 50f6050..31c428e 100644 --- a/ui/css/fonts/novnc/Makefile.am +++ b/ui/css/fonts/novnc/Makefile.am @@ -17,4 +17,8 @@ fontdir = $(datadir)/kimchi/ui/css/fonts/novnc +if FONTS dist_font_DATA = Orbitron700.* +else +dist_noinst_DATA = Orbitron700.* +endif -- 1.9.3

3 2

[PATCH] add an option do not build fonts files in rpm packages
by shaohef＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> configure will do not generate ui/css/fonts/novnc/Makefile and ui/css/fonts/Makefile when build fonts are disabled. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 6 +++++- configure.ac | 24 ++++++++++++++++++++++-- contrib/kimchi.spec.fedora.in | 4 +++- ui/css/Makefile.am | 4 ++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9785de9..e6ff673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,10 @@ SUBDIRS = src ui docs contrib tests po config plugins +if FONTS +WITH_FONTS = --define="with_fonts 1" +endif + ACLOCAL_AMFLAGS = --install -I m4 EXTRA_DIST = \ @@ -134,7 +138,7 @@ rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES - rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + rpmbuild -ba $(WITH_FONTS) --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec fedora-rpm: contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec diff --git a/configure.ac b/configure.ac index e5e6441..2b71cf7 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,26 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +AC_ARG_ENABLE( + [fonts], + [AS_HELP_STRING( + [--enable-fonts], + [Build fonts files in package @<:@default=no@:>@] + )], + , + [enable_fonts="no"] +) + +AM_CONDITIONAL([FONTS], [test "${enable_fonts}" = "yes"]) + +if test "${enable_fonts}" = "yes"; then +AC_SUBST([ONVNCFONTS], [ui/css/fonts/novnc/Makefile]) +AC_SUBST([UIFONTS], [ui/css/fonts/Makefile]) +else +AC_SUBST([ONVNCFONTS], ['']) +AC_SUBST([UIFONTS], []) +fi + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot @@ -86,8 +106,6 @@ AC_CONFIG_FILES([ ui/Makefile ui/css/Makefile ui/css/novnc/Makefile - ui/css/fonts/Makefile - ui/css/fonts/novnc/Makefile ui/images/Makefile ui/images/theme-default/Makefile ui/js/Makefile @@ -113,6 +131,8 @@ AC_CONFIG_FILES([ tests/Makefile config/Makefile config/ui/Makefile + $UIFONTS + $ONVNCFONTS ],[ chmod +x po/gen-pot ]) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 993fd6f..4e863f5 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -61,7 +61,7 @@ Web server application to manage KVM/Qemu virtual machines %build -%configure +%configure %{?with_fonts:--enable-fonts} make @@ -154,8 +154,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/doc/kimchi-templates.png %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml +%if 0%{?with_fonts} %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.* %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* +%endif %{_datadir}/kimchi/ui/css/novnc/base.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index db65799..020f859 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -15,7 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +if FONTS SUBDIRS = novnc fonts +else +SUBDIRS = novnc +endif EXTRA_DIST = theme-default -- 1.9.3

1 0

[PATCH] Change ISO stream feature test and kvm user test for PPC
by Rodrigo Trujillo 10 Jul '14

10 Jul '14

This patch removes X86 hardcoded tags from test XMLs in order to allow run the tests in PPC machines. It also increases the amount of memory used in User test xml, because PPC only creates VMs with more then 128M. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 2 +- src/kimchi/kvmusertests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..fd9b7d8 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -37,7 +37,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> + <type>hvm</type> <boot dev='cdrom'/> </os> <devices> diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 1757725..3a44ae3 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -31,9 +31,9 @@ class UserTests(object): <domain type='kvm'> <name>%s</name> <uuid>%s</uuid> - <memory unit='KiB'>10240</memory> + <memory unit='KiB'>262144</memory> <os> - <type arch='x86_64' machine='pc'>hvm</type> + <type>hvm</type> <boot dev='hd'/> </os> </domain>""" -- 1.9.3

3 2

[PATCH 1/2] Add PPC support to ISO Stream feature test
by Rodrigo Trujillo 10 Jul '14

10 Jul '14

This patch removes hardcoded tags from iso stream xml. Tags are related to machine type and architecture and are set in running type. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..277dd56 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -20,6 +20,7 @@ import cherrypy import libvirt import lxml.etree as ET +import platform import socket import subprocess import threading @@ -37,7 +38,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> + <type arch='%(arch)s' machine='%(machine)s'>hvm</type> <boot dev='cdrom'/> </os> <devices> @@ -100,7 +101,14 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(protocol): - xml = ISO_STREAM_XML % {'protocol': protocol} + if platform.machine().startswith('ppc'): + arch = "ppc64" + machine = "pseries" + else: + arch = "x86_64" + machine = "pc-1.2" + xml = ISO_STREAM_XML % {'protocol': protocol, 'arch': arch, + 'machine': machine} conn = None try: FeatureTests.disable_screen_error_logging() -- 1.9.3

3 7

[PATCH] Update API.md to reflect /host/users and /host/groups API
by alinefm＠linux.vnet.ibm.com 10 Jul '14

10 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Commit fe2fd1db added the functionalities to list system users and groups but forgot to update the API.md Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/API.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/API.md b/docs/API.md index 4f51dd0..75b933c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -763,6 +763,24 @@ Contains information of host. * swupdate: Start the update of packages in background and return a Task resource * task resource. * See Resource: Task * +### Resource: Host users + +**URI:** /host/users +List of system users in the host. + +**Methods:** + +* **GET**: Retrieve list of system users in the host. + +### Resource: Host groups + +**URI:** /host/groups +List of system groups in the host. + +**Methods:** + +* **GET**: Retrieve list of system groups in the host. + ### Resource: HostStats **URI:** /host/stats -- 1.9.3

3 2

RFC: Design of Authorization in Kimchi
by Wen Wang 09 Jul '14

09 Jul '14

Hi all, Due to the fact that Kimchi needs authorization feature to be designed. I an posting my point of view below of how I thought about doing it, including how I plan doing it in the front-end and request for help for the back end support. Kimchi changed to a traditional login patten in last release that makes Kimchi more secure to use. It Before login, the front-end can hardly get any html information before user actually login. As we discussed, root user will have full access to Kimchi whereas the non-root user will have restricted privileges. It will be easier and more decent to show the proper tabs to certain users that distinguished by the back-end. Now the tabs are generated by an xml file generated from the back-end that show all 5 tabs. We probably need to have the '*Host*' and '*template*' tab_removed_ for non-root users, which is recommended to be done in the back-end. Also there need to be information provided to the front-end like the user-name, user-role as well as user-group, etc. that indicate user identity after login. The browser need the information to give certain privileges to certain users and disable the unnecessary functions. My suggestion is to have these 3 parameters passed: ***user-name, user-role* as well as *user-group*. There is a better extendibility to user the user-role other than isRoot so that we can define more roles in the future. As fact that we have only defined two roles now, the user-role parameter can be divided into root and guest based on user is root or non-root. These message can get from *sessiondada*, *cookie *or passed according to a query. the way passing the info of the user is still under discussion. Request for your advises. Best Regards Wang Wen

3 7

Authorization: allow root user specify users/groups to a VM
by Yu Xin Huo 08 Jul '14

08 Jul '14

I tried below: On my linux workstation, I only created 2 users: 'root' and 'tify'. Most of users and groups below look like system users and groups target for quite specific purpose. Can we do some filtering to only get users and groups that truly related to VM assignment? curl -k -u root:pass -H "Content-Type: applicaion/json" -H "Accept: application/json" https://localhost:8001/host/users [ "root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt", "mail", "uucp", "operator", "games", "gopher", "ftp", "nobody", "dbus", "usbmuxd", "rpc", "vcsa", "rtkit", "avahi-autoipd", "saslauth", "postfix", "rpcuser", "nfsnobody", "ntp", "apache", "radvd", "haldaemon", "qemu", "pulse", "gsanslcd", "nm-openconnect", "gdm", "sshd", "tcpdump", "tify", "nginx" ] curl -k -u root:pass -H "Content-Type: applicaion/json" -H "Accept: application/json" https://localhost:8001/host/groups [ "root", "bin", "daemon", "sys", "adm", "tty", "disk", "lp", "mem", "kmem", "wheel", "mail", "uucp", "man", "games", "gopher", "video", "dip", "ftp", "lock", "audio", "nobody", "users", "dbus", "utmp", "utempter", "usbmuxd", "rpc", "avdefs", "floppy", "vcsa", "desktop_admin_r", "desktop_user_r", "rtkit", "avahi-autoipd", "cdrom", "tape", "dialout", "wbpriv", "cgred", "saslauth", "postdrop", "postfix", "rpcuser", "nfsnobody", "ntp", "apache", "radvd", "haldaemon", "kvm", "qemu", "pulse", "pulse-access", "fuse", "ldap", "nm-openconnect", "gdm", "stapusr", "stapsys", "stapdev", "sshd", "tcpdump", "slocate", "tify", "screen", "nginx" ]

2 2

[RFC] discover Kimchi peers
by Sheldon 08 Jul '14

08 Jul '14

I'd like to talk about how to discover Kimchi peers. Now I just talk about discover a peer in a same network here. I will use a local multicast subnetwork address <http://en.wikipedia.org/wiki/Multicast_address#Local_subnetwork> to find peers in one network. Choose 224.0.0.132 as the kimchi multicast address, and 8000 as the port. For cross network that need the router support multicast, so I give up discover a peer cross network. I will let user add the remote peers manully. In the whole system all peers are equal. There will not be a center discover service. We will define two kinds of multicast message Notify and Search. the format as follow. # ____________________________________________ # | head | message body | tail | # |___________________|_________________|______| # |sizeof(messageBody)| json message | EOL | # |___________________|_________________|______| the flow of discover Kimchi peers: 1. one host multicast a "search" message. in this message it tell himself information, and ask others tell their information. Like this: {"search": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this means "hello, I'm a kimchi host, this is my information, can you tell me who you are?" 2. others received a search will response an "notify" message. Like this: {"notify": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this tells others that "hi, I'm a kimchi host, I'm alive and this is my information" o (user) 1 is "search" /\ --------> 2 is "notify" | 1 _____ ________________ kimchi-host1 ------2-<---| DB |<----2-----|multicast listen |<--2-- | |____| |_______________| | ----------------------1-------------------------------> | | _____ |_____ | | | switch | | | |___________| o (user) | /\ --------- -----------------------------2----------------------- --->| | | _____ ________________ | kimchi-host3 ------1<---| DB |<---1------|multicast listen |<---1--| |____| |_______________| we need to discuss: 1. should we support beat heart? every kimchi host will send periodic notify to tell others himself information? 2. should we support a "quit" message? "quit" message tell other peers, that this kimchi quit normally. others can remove this from peers list. But the kimchi can not send "quit" when aborting abnormally. 3. Do we store the local peers information in DB? we can collection the local peers and send them immediately when user need to discover the peers. We will extend to support remote peers, these information need to be stored in DB. -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 8

[RFC] create an image from VM for OOTB storage pool
by Sheldon 08 Jul '14

08 Jul '14

Now OOTB ISO pool is available. we can copy an base image to OOTB ISO pool from VM. There will useful for when user want to create a image from an existing VM. User create a VM and configure this VM. He want to create several VMs with this VM. There are two ways for him. 1. use backing store (http://libvirt.org/formatstorage.html#StorageVolBacking) for the existing img 2. create an base image to OOTB ISO pool from the existing VM. When are are snapshots on the VM base image. we should merge the all snapshots and the base image. Then he can create a template from this image. And create a VM from this template. -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 4

[PATCH] Update README.md to introduce startup script
by Ding xiao 08 Jul '14

08 Jul '14

We use different startup script in different system, so it's nessesary introduce them. Signed-off-by: Ding xiao <ssdxiao(a)163.com> --- docs/README.md | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/docs/README.md b/docs/README.md index ab03918..dbefae3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -114,6 +114,21 @@ Run $ sudo kimchid --host=0.0.0.0 +Use startup script in different system +---------------------------------------- + +Fedora: + $ systemctl start kimchid.service + $ systemctl stop kimchid.service + +Suse or Centos5: + $ service start kimchid + $ service stop kimchid + +Centos6 or Debian: + $ start kimchid + $ stop kimchid + Usage ----- -- 1.7.1

3 2

[PATCH v3 1/2] UI changes to allow underscore in debug report name.
by Christy Perez 07 Jul '14

07 Jul '14

New message on the debug report creation screen now says that underscore ('_') characters are allowed, as well as hyphens ('-'). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/en_US.po | 12 ++++++------ po/pt_BR.po | 13 ++++++------- po/zh_CN.po | 12 ++++++------ src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 2 +- ui/js/src/kimchi.report_add_main.js | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 7b66eb2..933d4eb 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -703,9 +703,9 @@ msgid "You should give a name for the debug file report." msgstr "You should give a name for the debug file report." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." #, python-format msgid "" @@ -1317,8 +1317,8 @@ msgstr "Rename" msgid "Download" msgstr "Download" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Report name should contain only letters, digits and/or hyphen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." msgid "Pending..." msgstr "Pending..." @@ -1503,10 +1503,10 @@ msgstr "Report Name" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgid "Add a Repository" msgstr "Add a Repository" diff --git a/po/pt_BR.po b/po/pt_BR.po index b0884b4..f43a1c4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -748,10 +748,9 @@ msgid "You should give a name for the debug file report." msgstr "Você deve dar um nome para o arquivo do relatório de debug." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Nome deve ser uma string. Somente letras, digitos e hífem ('-') são " -"permitidos." +"Nome deve ser uma string. Somente letras, digitos, underscore ('_') e hífem ('-') são permitidos." #, python-format msgid "" @@ -1382,8 +1381,8 @@ msgstr "Renomear" msgid "Download" msgstr "Baixar" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Nome do relatório deve apenas conter letras, números e/ou hífen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Nome do relatório deve apenas conter letras, números, underscore ('_') e/ou hífen ('-')." msgid "Pending..." msgstr "Pendente..." @@ -1568,10 +1567,10 @@ msgstr "Nome do Relatório" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "Se o nome do relatório for omitido, será escolhido um nome baseado no " -"horário atual. O nome pode conter: letras, números e hífen ('-')." +"horário atual. O nome pode conter: letras, números, underscore ('_') e hífen ('-')." msgid "Add a Repository" msgstr "Adicionar um Repositório" diff --git a/po/zh_CN.po b/po/zh_CN.po index 272dd51..9e623c5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -680,8 +680,8 @@ msgid "You should give a name for the debug file report." msgstr "应该为诊断文件报告指定一个名字。" msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." -msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." +msgstr "名字必须是一个字符串。只允许字母、数字、下划线 ('_') 和连字符 ('-')。" #, python-format msgid "" @@ -1270,8 +1270,8 @@ msgstr "重命名" msgid "Download" msgstr "下载" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "报告名字中只能包含字母、数字或连字符（-）。" +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "报告名字中只能包含字母、数字、下划线('_')和连字符('-')" msgid "Pending..." msgstr "正在加载..." @@ -1441,10 +1441,10 @@ msgstr "诊断报告名" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包" -"含字母、数字和连字符（-）" +"含字母、数字、下划线 ('_') 和连字符（-）" msgid "Add a Repository" msgstr "增加一个软件仓库" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..d635d2c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -36,7 +36,7 @@ "name": { "description": "The name for the debug report file.", "type": "string", - "pattern": "^[A-Za-z0-9-]*$", + "pattern": "^[_A-Za-z0-9-]*$", "error": "KCHDR0007E" } } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..0c76145 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -206,7 +206,7 @@ "KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"), "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"), "KCHDR0006E": _("You should give a name for the debug file report."), - "KCHDR0007E": _("Name should be a string. Only letters, digits and hyphen ('-') are allowed."), + "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 43484f5..f64b879 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -41,7 +41,7 @@ kimchi.report_add_main = function() { return false; } var reportName = nameTextbox.val(); - var validator = RegExp("^[A-Za-z0-9-]*$"); + var validator = RegExp("^[_A-Za-z0-9-]*$"); if (!validator.test(reportName)) { kimchi.message.error.code('KCHDR6011M'); return false; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d765cf2..c6f4e8c 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -113,7 +113,7 @@ "KCHDR6008M": "$_("Rename")", "KCHDR6009M": "$_("Remove")", "KCHDR6010M": "$_("Download")", - "KCHDR6011M": "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")", "KCHDR6012M": "$_("Pending...")", "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index b7209fe..74ef313 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -35,7 +35,7 @@ </h2> <div class="field"> <span> - $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits and hyphen (\"-\").") + $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, underscore (\"_\") and hyphen (\"-\").") </span> <input type="text" class="text" id="report-name-textbox" name="name" /> </div> -- 1.9.3

2 4

The Independence Day - Ginger is now public!
by Paulo Ricardo Paz Vital 07 Jul '14

07 Jul '14

Hello. It's a pleasure to announce that today, July 4th - the Independence Day, Ginger project, a Kimchi plugin for host management, becomes a public open source project! The project will use the following public infrastructure: Code: GitHub https://github.com/kimchi-project/ginger Mailing List: ginger-dev(a)yahoogroups.com Send an email to ginger-dev-subscribe(a)yahoogroups.com to join the mailing list. Thanks to everyone who has contributed to this exciting milestone for this project! -- Paulo Ricardo Paz Vital <pvital(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCH v3] Add SUSE's products
by Dinar valeev 07 Jul '14

07 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..39c9163 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '11'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

3 2

[PATCH v2 0/2] Keep UI Consistent in Guest Edit Window
by Hongliang Wang 07 Jul '14

07 Jul '14

Make guest cdrom edit UI consistent with guest interface edit UI. The key point is to edit cdrom properties in place. Because there is only one property can be updated for a cdrom, it works fine this way. Though another inconsistence comes up that in the same storage tab, there is also lines for disks, which have more editable properties and it's not that easy to make all of these properties stay in one line. So for disks, possibly we still need provide another window to let users update properties. So here are 2 choices: C1) Apply this PATCH v2 to keep cdrom consistent with interface C2) Apply PATCH v1 to keep cdrom consistent with disk Both are OK for me. v1 -> v2: 2a) Made updating cdrom properties in place (Aline's comment) Hongliang Wang (2): Adjust Guest Edit Storage Tab Styles Remove Unused Files ui/css/theme-default/guest-cdrom-edit.css | 57 ------------ ui/css/theme-default/guest-edit.css | 99 +++++++------------- ui/images/theme-default/guest-icon-sprite.png | Bin 6748 -> 0 bytes ui/js/src/kimchi.guest_cdrom_edit_main.js | 85 ------------------ ui/js/src/kimchi.guest_edit_main.js | 125 +++++++++++++++++++++----- ui/pages/guest-cdrom-edit.html.tmpl | 70 --------------- ui/pages/guest-edit.html.tmpl | 57 +++++++----- 7 files changed, 166 insertions(+), 327 deletions(-) delete mode 100644 ui/css/theme-default/guest-cdrom-edit.css delete mode 100644 ui/images/theme-default/guest-icon-sprite.png delete mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js delete mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

2 10

RFC: Design of the authentication in Kimchi
by Wen Wang 07 Jul '14

07 Jul '14

Hi all, Due to the fact that Kimchi needs authentication feature to be designed. I an posting my point of view below of how I thought about doing it, including how I plan doing it in the front-end and request for help for the back end support. Kimchi changed to a traditional login patten in last release that makes Kimchi more secure to use. It Before login, the front-end can hardly get any html information before user actually login. As we discussed, root user will have full access to Kimchi whereas the non-root user will have restricted privileges. It will be easier and more decent to show the proper tabs to certain users that distinguished by the back-end. Now the tabs are generated by an xml file generated from the back-end that show all 5 tabs. We probably need to have the '*Host*' and '*template*' tab_removed_ for non-root users, which is recommended to be done in the back-end. Also there need to be information provided to the front-end like the user-name, user-role as well as user-group, etc. that indicate user identity after login. The browser need the information to give certain privileges to certain users and disable the unnecessary functions. My suggestion is to have these 3 parameters passed: ***user-name, user-role* as well as *user-group*. There is a better extendibility to user the user-role other than isRoot so that we can define more roles in the future. As fact that we have only defined two roles now, the user-role parameter can be divided into root and guest based on user is root or non-root. These message can get from *sessiondada*, *cookie *or passed according to a query. the way passing the info of the user is still under discussion. Request for your advises. Best Regards Wang Wen

1 1

[RFC] Improve task management for kimchi
by Wen Wang 07 Jul '14

07 Jul '14

Dear all, * **Problems:* Now our strategy for long time operation is using task which the browser needs to check up-to-date task status time by time until the task ends. It's time consuming and less efficient. Also there exists several problems when locating each task when doing debug generating and storage pool as well as some new features that might use task strategy in the future. *Solution*: As talked with Sheldon and Zhengsheng, we came up with a solution that avoid browser checking status every 200ms. Also, we might need some more labels in each task to provide more information when getting the task like we might need to indicate which operation triggered certain task. What's in our mind is to use the strategy that allow the server inform browser about the task information. Our proposal is designed as follows. 1) Browser needs to register to the back end to indicate which part the result needs to reply to when the task finished. 2) The back end use broker to manage message distribution: when a task is finished or experiencing an error, back end inform the browser certain part of work is finished or error. 3) Using websocket of cherrypy to accomplish the message transfer. Best Regards Wang Wen

5 17

RFC: smt support
by Christy Perez 04 Jul '14

04 Jul '14

Quick poll for adding support for <cpu> <topology sockets='1' cores='2' threads='1'/> </cpu> I know it would be nice to let users add it on a per-vm basis, but maybe it might be something that we'd rather just leave in the template only. Having it in the template only seems simpler when thinking about UI design, imo, but I'd love to hear what everyone else thinks. Thanks, - Christy

4 11

[PATCH v2] Add SUSE's products
by Dinar valeev 04 Jul '14

04 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..0cf005e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '11', 'sles': '12'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

4 4

[PATCH] Fix create vm disk params
by lvroyce＠linux.vnet.ibm.com 04 Jul '14

04 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When creating vm on SCSI/iSCSI pools, volume needs to be specified. API.md and doc need to be updated. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/docs/API.md b/docs/API.md index 4f51dd0..7a3076b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -183,6 +183,7 @@ Represents a snapshot of the Virtual Machine's primary monitor. (either *size* or *volume* must be specified): * index: The device index * size: The device size in GB + * volume: LUN of SCSI or iSCSI storage. * graphics *(optional)*: The graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..ea1eb61 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -381,7 +381,13 @@ "type": "number", "minimum": 1, "error": "KCHTMPL0022E" + }, + "volume": { + "description": "LUN of SCSI or iSCSI storage", + "type": "string", + "minLength": 1 } + } }, "minItems": 1, -- 1.8.3.2

4 4

[PATCH 1/2] add SysV init scripts in centos6
by ssdxiao 03 Jul '14

03 Jul '14

now in centos6 has'nt the SysV init scripts, so add it to kimchi Signed-off-by: Ding Xiao <ssdxiao(a)163.com> --- contrib/kimchid.sysvinit.centos6 | 112 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) create mode 100644 contrib/kimchid.sysvinit.centos6 diff --git a/contrib/kimchid.sysvinit.centos6 b/contrib/kimchid.sysvinit.centos6 new file mode 100644 index 0000000..ba4adff --- /dev/null +++ b/contrib/kimchid.sysvinit.centos6 @@ -0,0 +1,112 @@ +#! /bin/sh +# +#kimchid Kimchi Web Server +# +# +# Author: Ding Xiao <ssdxiao(a)163.com> +# +# 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 +# +### BEGIN INIT INFO +# Provides: kimchid +# Required-Start: libvirtd +# Required-Stop: +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Description: Start the kimchid daemon +### END INIT INFO + +. /etc/rc.d/init.d/functions + +prog="kimchid" +exec="/usr/bin/kimchid" +pidfile="/var/run/kimchi.pid" + + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + echo -n $"Starting $prog: " + daemon --user root --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + status -p $pidfile $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? + -- 1.7.1

2 7

[PATCH v2 1/2] UI changes to allow underscore in debug report name.
by Christy Perez 03 Jul '14

03 Jul '14

New message on the debug report creation screen now says that underscore ('_') characters are allowed, as well as hyphens ('-'). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/en_US.po | 12 ++++++------ po/pt_BR.po | 13 ++++++------- po/zh_CN.po | 12 ++++++------ src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 2 +- ui/js/src/kimchi.report_add_main.js | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 7b66eb2..933d4eb 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -703,9 +703,9 @@ msgid "You should give a name for the debug file report." msgstr "You should give a name for the debug file report." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." #, python-format msgid "" @@ -1317,8 +1317,8 @@ msgstr "Rename" msgid "Download" msgstr "Download" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Report name should contain only letters, digits and/or hyphen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." msgid "Pending..." msgstr "Pending..." @@ -1503,10 +1503,10 @@ msgstr "Report Name" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgid "Add a Repository" msgstr "Add a Repository" diff --git a/po/pt_BR.po b/po/pt_BR.po index b0884b4..adcfd11 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -748,10 +748,9 @@ msgid "You should give a name for the debug file report." msgstr "Você deve dar um nome para o arquivo do relatório de debug." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Nome deve ser uma string. Somente letras, digitos e hífem ('-') são " -"permitidos." +"Nome deve ser uma string. Somente letras, digitos, sublinhar ('_') e hífem ('-') são permitidos." #, python-format msgid "" @@ -1382,8 +1381,8 @@ msgstr "Renomear" msgid "Download" msgstr "Baixar" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Nome do relatório deve apenas conter letras, números e/ou hífen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Nome do relatório deve apenas conter letras, números, sublinhar ('_') e/ou hífen ('-')." msgid "Pending..." msgstr "Pendente..." @@ -1568,10 +1567,10 @@ msgstr "Nome do Relatório" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "Se o nome do relatório for omitido, será escolhido um nome baseado no " -"horário atual. O nome pode conter: letras, números e hífen ('-')." +"horário atual. O nome pode conter: letras, números, sublinhar ('_') e hífen ('-')." msgid "Add a Repository" msgstr "Adicionar um Repositório" diff --git a/po/zh_CN.po b/po/zh_CN.po index 272dd51..a3b5dcb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -680,8 +680,8 @@ msgid "You should give a name for the debug file report." msgstr "应该为诊断文件报告指定一个名字。" msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." -msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." +msgstr "名字必须是一个字符串。只允许字母、下划线 ('_') 数字和连字符 ('-')。" #, python-format msgid "" @@ -1270,8 +1270,8 @@ msgstr "重命名" msgid "Download" msgstr "下载" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "报告名字中只能包含字母、数字或连字符（-）。" +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "报告名字中只能包含字母、下划线 ('_') 数字或连字符（-）。" msgid "Pending..." msgstr "正在加载..." @@ -1441,10 +1441,10 @@ msgstr "诊断报告名" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包" -"含字母、数字和连字符（-）" +"含字母、下划线 ('_') 数字和连字符（-）" msgid "Add a Repository" msgstr "增加一个软件仓库" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..d635d2c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -36,7 +36,7 @@ "name": { "description": "The name for the debug report file.", "type": "string", - "pattern": "^[A-Za-z0-9-]*$", + "pattern": "^[_A-Za-z0-9-]*$", "error": "KCHDR0007E" } } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..0c76145 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -206,7 +206,7 @@ "KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"), "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"), "KCHDR0006E": _("You should give a name for the debug file report."), - "KCHDR0007E": _("Name should be a string. Only letters, digits and hyphen ('-') are allowed."), + "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 43484f5..f64b879 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -41,7 +41,7 @@ kimchi.report_add_main = function() { return false; } var reportName = nameTextbox.val(); - var validator = RegExp("^[A-Za-z0-9-]*$"); + var validator = RegExp("^[_A-Za-z0-9-]*$"); if (!validator.test(reportName)) { kimchi.message.error.code('KCHDR6011M'); return false; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d765cf2..c6f4e8c 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -113,7 +113,7 @@ "KCHDR6008M": "$_("Rename")", "KCHDR6009M": "$_("Remove")", "KCHDR6010M": "$_("Download")", - "KCHDR6011M": "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")", "KCHDR6012M": "$_("Pending...")", "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index b7209fe..74ef313 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -35,7 +35,7 @@ </h2> <div class="field"> <span> - $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits and hyphen (\"-\").") + $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, underscore (\"_\") and hyphen (\"-\").") </span> <input type="text" class="text" id="report-name-textbox" name="name" /> </div> -- 1.9.3

4 6

[RFC]Create VM from image
by Royce Lv 02 Jul '14

02 Jul '14

Currently kimchi just support create a vm from an ISO defined template. This requires duplicate installation. This release we want to support create a vm from an installed image. This involves the following change: 1. Create a template from an image: POST /templates/template-1 {'base': 'abs_base_img_path'} Implementation: (1)probe image os distro and version to get suggested config. (2)Avoid image to be deleted. (3)Avoid using ISO and base image at the same time. 2. Create a vm from image based template: This part has already been covered by Aline's prototype patch. POST /vms/vm-1 {'storagepool': 'default', 'network': 'default', 'disks':[{'index':0, 'base': 'abs_path'}]} or {'storagepool': 'default', 'network': 'default', 'disks':[{'index':0, 'base': 'abs_path', 'volume': 'scsi_volume'}]} The create vm implementation need to be re-considered for the following points: (1) when creating vm on scsi/iscsi pool, if volume size smaller than original image, need to be rejected. (2) when creating vm on directory based pool, volume generating logic is different with allocation new volume. (2) xml generating need to be refactored. Anything else need to be considered, welcome your comments.

4 6

[PATCH] Add SUSE's products
by Dinar valeev 02 Jul '14

02 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..9e8b62e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -57,10 +57,13 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', - 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'opensuse': '13.1', 'centos': '5.3', + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '12'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

3 5

RFC: Security Model & UI Design
by Yu Xin Huo 02 Jul '14

02 Jul '14

*Security Strategy:* 1. Only handle existing linux users and groups, kimchi is positioned to be a virtualization console, will not handle user management which is host level admin. 2. Two levels of privileges root users: console settings and virtualization resources management full access to 'Host', 'Guests', 'Templates', 'Storage', 'Network' all root users can see all the guests, templates, storage pools and volumes, networks no matter who created it for created VMs, assign to non-root users with either an admin or user role non-root users: manage or use VMs assigned to them admin role: edit & delete their VMs user role: start, stop, vnc their VMs they only have access to 'Guests' tab In 'Guests' tab, only list VMs that they have an admin or user role *UI Design:* root users: all current UI will be available. for create a VM, add a section to add users with admin or user role for edit a VM, also has a section for add/remove/change users' access non-root users: As only one 'Guest' tab, remove tabs bar and the '+' bar Only list VMs that they have a role on If the user have 'admin' role, then all current actions available if the user have 'user' role, then only actions 'start', 'stop', 'vnc' available

2 2

[RFC] Upload and download image for OOTB storage pool
by Royce Lv 02 Jul '14

02 Jul '14

Now OOTB ISO pool is available, but user has to copy ISO manually to the ISO pool, which is not convenient. So here we propose two ways to transfer ISOs. 1. User ---upload --> Kimchi Server REST API will be: POST /storagepools/isos/upload {'file': file_local_abs_path} Ding Xiao had already posted a piece of code in his patch: using cherrypy file upload interface. His code can support following requirements: (1) upload task can be cancelled. (2) non-blocking, other request can be handled. (3) progress can be monitored with a progress bar. (4) multi-file selected support. Only nits are UI part needs to be refactored a little. Also for multiple file upload, number of upload session needs to be controlled through config file. 2. Http server -- download -->Kimchi server REST API will be: POST /storagepools/isos/download {'file': file_remote_path} RETURN: {'task_id': id_of_download_task} This will start a backend task for download. The UI will query the task for progress. For implementation, we will use python libcurl to download image/ISO. REF: http://curl.haxx.se/libcurl/python/

2 2

[PATCH] Add image probe function
by lvroyce＠linux.vnet.ibm.com 02 Jul '14

02 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Image file probe will be used in identify image file os info and generate reasonable configuration for it. This will be useful when import image and create a vm from it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++--- src/kimchi/exception.py | 2 ++ src/kimchi/imageinfo.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/kimchi/imageinfo.py diff --git a/docs/README.md b/docs/README.md index c658637..c341a5d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,8 @@ Install Dependencies PyPAM m2crypto python-jsonschema rpm-build \ qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ - iscsi-initiator-utils libxslt pyparted nginx + iscsi-initiator-utils libxslt pyparted nginx \ + python-libguestfs libguestfs-tools # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -75,7 +76,8 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted nginx + open-iscsi lvm2 xsltproc python-parted nginx \ + python-guestfs libguestfs-tools Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +91,8 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted \ + python-libguestfs guestfs-tools Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..a983d46 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -88,6 +88,8 @@ class InvalidOperation(KimchiException): class IsoFormatError(KimchiException): pass +class ImageFormatError(KimchiException): + pass class TimeoutExpired(KimchiException): pass diff --git a/src/kimchi/imageinfo.py b/src/kimchi/imageinfo.py new file mode 100644 index 0000000..d57ecac --- /dev/null +++ b/src/kimchi/imageinfo.py @@ -0,0 +1,42 @@ +# +# Kimchi +# +# Copyright IBM Corp, 2013 +# +# 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 sys +import guestfs + + +def probe_image(image_path): + g = guestfs.GuestFS(python_return_dict=True) + g.add_drive_opts(image_path, readonly=1) + g.launch() + + roots = g.inspect_os() + if len(roots) == 0: + raise ImageFormatError("No os found in given image.") + + for root in roots: + version = "%d.%d" % (g.inspect_get_major_version(root), + g.inspect_get_minor_version(root)) + distro = "%s" % (g.inspect_get_distro(root)) + + return (distro, version) + + +if __name__ == '__main__': + print probe_image(sys.argv[1]) -- 1.8.3.2

4 5

RFC: Suggestion of changing the button "Clone" to "Replicate"
by Wen Wang 02 Jul '14

02 Jul '14

Dear all, I did some translation in last release and found out it is a little bit odd to see the word "clone" under "Action" in Templates tab: In my point of view, "clone" is used in medical area in most cases and I recommend to have it changed to "Replicate" which have the same meaning that indicates to copy and paste the same template configuration. Best Regards Wang Wen

3 4

[PATCH] Support to upload ISO
by ssdxiao 01 Jul '14

01 Jul '14

Upload ISO to the path /var/lib/kimchi/iso of the local disk Signed-off-by: ssdxiao <ssdxiao(a)163.com> --- contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + po/en_US.po | 3 + po/pt_BR.po | 3 + po/zh_CN.po | 3 + src/kimchi/control/storagepools.py | 28 +- src/nginx.conf.in | 1 + ui/css/theme-default/upload.css | 43 ++ ui/js/resumable.js | 816 +++++++++++++++++++++++++++++++++ ui/js/src/kimchi.template_add_main.js | 27 ++ ui/pages/kimchi-ui.html.tmpl | 1 + ui/pages/template-add.html.tmpl | 13 + 12 files changed, 938 insertions(+), 2 deletions(-) create mode 100644 ui/css/theme-default/upload.css create mode 100644 ui/js/resumable.js diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 2d4699b..771fccc 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -164,6 +164,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/js/kimchi.min.js %{_datadir}/kimchi/ui/js/jquery-ui.js %{_datadir}/kimchi/ui/js/jquery.min.js +%{_datadir}/kimchi/ui/js/resumable.js %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js %{_datadir}/kimchi/ui/js/novnc/*.js %{_datadir}/kimchi/ui/js/spice/*.js diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 165f566..ad6aed4 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -86,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/js/kimchi.min.js %{_datadir}/kimchi/ui/js/jquery-ui.js %{_datadir}/kimchi/ui/js/jquery.min.js +%{_datadir}/kimchi/ui/js/resumable.js %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js %{_datadir}/kimchi/ui/js/novnc/*.js %{_datadir}/kimchi/ui/js/spice/*.js diff --git a/po/en_US.po b/po/en_US.po index 1ede7dc..6f5b100 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1670,3 +1670,6 @@ msgstr "No templates found." msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "Upload ISO Image" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5ff54e0..d4d26ee 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1777,3 +1777,6 @@ msgstr "Nenhum modelo encontrado." msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "Carregar Imagem ISO" diff --git a/po/zh_CN.po b/po/zh_CN.po index caef515..da62131 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1679,3 +1679,6 @@ msgstr "没有发现模板" msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "上传ISO镜像" \ No newline at end of file diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index b75bca0..72b9f78 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -18,8 +18,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy - - +import os +import errno from kimchi.control.base import Collection, Resource from kimchi.control.storagevolumes import IsoVolumes, StorageVolumes from kimchi.control.utils import get_class_name, model_fn @@ -28,6 +28,9 @@ from kimchi.model.storagepools import ISO_POOL_NAME from kimchi.control.utils import UrlSubNode +ISO_UPLOAD_DIR = "/var/lib/kimchi/iso/" + + @UrlSubNode("storagepools", True, ['POST', 'DELETE']) class StoragePools(Collection): def __init__(self, model): @@ -35,6 +38,11 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + try: + os.makedirs(ISO_UPLOAD_DIR, mode=0755) + except OSError as e: + if e.errno == errno.EEXIST: + pass def create(self, params, *args): try: @@ -57,6 +65,22 @@ class StoragePools(Collection): return resp + @cherrypy.expose + def upload(self, *args, **kwargs): + method = cherrypy.request.method.upper() + if method != "POST": + raise cherrypy.HTTPError(405) + fileName = kwargs["resumableFilename"] + chunkSize = kwargs["resumableChunkSize"] + chunkNumber = kwargs["resumableChunkNumber"] + position = int(chunkSize) * (int(chunkNumber)-1) + + filePath = ISO_UPLOAD_DIR+fileName + fp = open(filePath, "a+") + fp.seek(position) + fp.write(kwargs["file"].fullvalue()) + fp.close() + def _get_resources(self, filter_params): try: res_list = super(StoragePools, self)._get_resources(filter_params) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index 38e643d..9568476 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -37,6 +37,7 @@ http { access_log /var/log/nginx/access.log main; sendfile on; + client_max_body_size 2m; server { listen $proxy_ssl_port ssl; diff --git a/ui/css/theme-default/upload.css b/ui/css/theme-default/upload.css new file mode 100644 index 0000000..9cdfe4f --- /dev/null +++ b/ui/css/theme-default/upload.css @@ -0,0 +1,43 @@ +/* +Uploadify +Copyright (c) 2012 Reactive Apps, Ronnie Garcia +Released under the MIT License <http://www.opensource.org/licenses/mit-license.php> +*/ + +.uploadify-button { + background-color: #505050; + background-image: linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -o-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -moz-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -webkit-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -ms-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0, #505050), + color-stop(1, #707070) + ); + background-position: center top; + background-repeat: no-repeat; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + border-radius: 30px; + border: 2px solid #808080; + color: #FFF; + height: 30px; + width: 120px; + font: bold 12px Arial, Helvetica, sans-serif; + text-align: center; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.uploadify-progress { + background-color: #E5E5E5; + margin-top: 10px; + width: 100%; +} +.uploadify-progress-bar { + background-color: #0099FF; + height: 3px; + width: 1px; +} diff --git a/ui/js/resumable.js b/ui/js/resumable.js new file mode 100644 index 0000000..add21ec --- /dev/null +++ b/ui/js/resumable.js @@ -0,0 +1,816 @@ +/* +* MIT Licensed +* http://www.23developer.com/opensource +* http://github.com/23/resumable.js +* Steffen Tiedemann Christensen, steffen(a)23company.com +*/ + +(function(){ +"use strict"; + + var Resumable = function(opts){ + if ( !(this instanceof Resumable) ) { + return new Resumable(opts); + } + this.version = 1.0; + // SUPPORTED BY BROWSER? + // Check if these features are support by the browser: + // - File object type + // - Blob object type + // - FileList object type + // - slicing files + this.support = ( + (typeof(File)!=='undefined') + && + (typeof(Blob)!=='undefined') + && + (typeof(FileList)!=='undefined') + && + (!!Blob.prototype.webkitSlice||!!Blob.prototype.mozSlice||!!Blob.prototype.slice||false) + ); + if(!this.support) return(false); + + + // PROPERTIES + var $ = this; + $.files = []; + $.defaults = { + chunkSize:1*1024*1024, + forceChunkSize:false, + simultaneousUploads:3, + fileParameterName:'file', + throttleProgressCallbacks:0.5, + query:{}, + headers:{}, + preprocess:null, + method:'multipart', + prioritizeFirstAndLastChunk:false, + target:'/', + testChunks:true, + generateUniqueIdentifier:null, + maxChunkRetries:undefined, + chunkRetryInterval:undefined, + permanentErrors:[404, 415, 500, 501], + maxFiles:undefined, + withCredentials:false, + xhrTimeout:0, + maxFilesErrorCallback:function (files, errorCount) { + var maxFiles = $.getOpt('maxFiles'); + alert('Please upload ' + maxFiles + ' file' + (maxFiles === 1 ? '' : 's') + ' at a time.'); + }, + minFileSize:1, + minFileSizeErrorCallback:function(file, errorCount) { + alert(file.fileName||file.name +' is too small, please upload files larger than ' + $h.formatSize($.getOpt('minFileSize')) + '.'); + }, + maxFileSize:undefined, + maxFileSizeErrorCallback:function(file, errorCount) { + alert(file.fileName||file.name +' is too large, please upload files less than ' + $h.formatSize($.getOpt('maxFileSize')) + '.'); + }, + fileType: [], + fileTypeErrorCallback: function(file, errorCount) { + alert(file.fileName||file.name +' has type not allowed, please upload files of type ' + $.getOpt('fileType') + '.'); + } + }; + $.opts = opts||{}; + $.getOpt = function(o) { + var $opt = this; + // Get multiple option if passed an array + if(o instanceof Array) { + var options = {}; + $h.each(o, function(option){ + options[option] = $opt.getOpt(option); + }); + return options; + } + // Otherwise, just return a simple option + if ($opt instanceof ResumableChunk) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { $opt = $opt.fileObj; } + } + if ($opt instanceof ResumableFile) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { $opt = $opt.resumableObj; } + } + if ($opt instanceof Resumable) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { return $opt.defaults[o]; } + } + }; + + // EVENTS + // catchAll(event, ...) + // fileSuccess(file), fileProgress(file), fileAdded(file, event), fileRetry(file), fileError(file, message), + // complete(), progress(), error(message, file), pause() + $.events = []; + $.on = function(event,callback){ + $.events.push(event.toLowerCase(), callback); + }; + $.fire = function(){ + // `arguments` is an object, not array, in FF, so: + var args = []; + for (var i=0; i<arguments.length; i++) args.push(arguments[i]); + // Find event listeners, and support pseudo-event `catchAll` + var event = args[0].toLowerCase(); + for (var i=0; i<=$.events.length; i+=2) { + if($.events[i]==event) $.events[i+1].apply($,args.slice(1)); + if($.events[i]=='catchall') $.events[i+1].apply(null,args); + } + if(event=='fileerror') $.fire('error', args[2], args[1]); + if(event=='fileprogress') $.fire('progress'); + }; + + + // INTERNAL HELPER METHODS (handy, but ultimately not part of uploading) + var $h = { + stopEvent: function(e){ + e.stopPropagation(); + e.preventDefault(); + }, + each: function(o,callback){ + if(typeof(o.length)!=='undefined') { + for (var i=0; i<o.length; i++) { + // Array or FileList + if(callback(o[i])===false) return; + } + } else { + for (i in o) { + // Object + if(callback(i,o[i])===false) return; + } + } + }, + generateUniqueIdentifier:function(file){ + var custom = $.getOpt('generateUniqueIdentifier'); + if(typeof custom === 'function') { + return custom(file); + } + var relativePath = file.webkitRelativePath||file.fileName||file.name; // Some confusion in different versions of Firefox + var size = file.size; + return(size + '-' + relativePath.replace(/[^0-9a-zA-Z_-]/img, '')); + }, + contains:function(array,test) { + var result = false; + + $h.each(array, function(value) { + if (value == test) { + result = true; + return false; + } + return true; + }); + + return result; + }, + formatSize:function(size){ + if(size<1024) { + return size + ' bytes'; + } else if(size<1024*1024) { + return (size/1024.0).toFixed(0) + ' KB'; + } else if(size<1024*1024*1024) { + return (size/1024.0/1024.0).toFixed(1) + ' MB'; + } else { + return (size/1024.0/1024.0/1024.0).toFixed(1) + ' GB'; + } + }, + getTarget:function(params){ + var target = $.getOpt('target'); + if(target.indexOf('?') < 0) { + target += '?'; + } else { + target += '&'; + } + return target + params.join('&'); + } + }; + + var onDrop = function(event){ + $h.stopEvent(event); + appendFilesFromFileList(event.dataTransfer.files, event); + }; + var onDragOver = function(e) { + e.preventDefault(); + }; + + // INTERNAL METHODS (both handy and responsible for the heavy load) + var appendFilesFromFileList = function(fileList, event){ + // check for uploading too many files + var errorCount = 0; + var o = $.getOpt(['maxFiles', 'minFileSize', 'maxFileSize', 'maxFilesErrorCallback', 'minFileSizeErrorCallback', 'maxFileSizeErrorCallback', 'fileType', 'fileTypeErrorCallback']); + if (typeof(o.maxFiles)!=='undefined' && o.maxFiles<(fileList.length+$.files.length)) { + // if single-file upload, file is already added, and trying to add 1 new file, simply replace the already-added file + if (o.maxFiles===1 && $.files.length===1 && fileList.length===1) { + $.removeFile($.files[0]); + } else { + o.maxFilesErrorCallback(fileList, errorCount++); + return false; + } + } + var files = []; + $h.each(fileList, function(file){ + var fileName = file.name.split('.'); + var fileType = fileName[fileName.length-1].toLowerCase(); + + if (o.fileType.length > 0 && !$h.contains(o.fileType, fileType)) { + o.fileTypeErrorCallback(file, errorCount++); + return false; + } + + if (typeof(o.minFileSize)!=='undefined' && file.size<o.minFileSize) { + o.minFileSizeErrorCallback(file, errorCount++); + return false; + } + if (typeof(o.maxFileSize)!=='undefined' && file.size>o.maxFileSize) { + o.maxFileSizeErrorCallback(file, errorCount++); + return false; + } + + // directories have size == 0 + if (!$.getFromUniqueIdentifier($h.generateUniqueIdentifier(file))) {(function(){ + var f = new ResumableFile($, file); + window.setTimeout(function(){ + $.files.push(f); + files.push(f); + f.container = (typeof event != 'undefined' ? event.srcElement : null); + $.fire('fileAdded', f, event) + },0); + })()}; + }); + window.setTimeout(function(){ + $.fire('filesAdded', files) + },0); + }; + + // INTERNAL OBJECT TYPES + function ResumableFile(resumableObj, file){ + var $ = this; + $.opts = {}; + $.getOpt = resumableObj.getOpt; + $._prevProgress = 0; + $.resumableObj = resumableObj; + $.file = file; + $.fileName = file.fileName||file.name; // Some confusion in different versions of Firefox + $.size = file.size; + $.relativePath = file.webkitRelativePath || $.fileName; + $.uniqueIdentifier = $h.generateUniqueIdentifier(file); + $._pause = false; + $.container = ''; + var _error = false; + + // Callback when something happens within the chunk + var chunkEvent = function(event, message){ + // event can be 'progress', 'success', 'error' or 'retry' + switch(event){ + case 'progress': + $.resumableObj.fire('fileProgress', $); + break; + case 'error': + $.abort(); + _error = true; + $.chunks = []; + $.resumableObj.fire('fileError', $, message); + break; + case 'success': + if(_error) return; + $.resumableObj.fire('fileProgress', $); // it's at least progress + if($.isComplete()) { + $.resumableObj.fire('fileSuccess', $, message); + } + break; + case 'retry': + $.resumableObj.fire('fileRetry', $); + break; + } + }; + + // Main code to set up a file object with chunks, + // packaged to be able to handle retries if needed. + $.chunks = []; + $.abort = function(){ + // Stop current uploads + var abortCount = 0; + $h.each($.chunks, function(c){ + if(c.status()=='uploading') { + c.abort(); + abortCount++; + } + }); + if(abortCount>0) $.resumableObj.fire('fileProgress', $); + }; + $.cancel = function(){ + // Reset this file to be void + var _chunks = $.chunks; + $.chunks = []; + // Stop current uploads + $h.each(_chunks, function(c){ + if(c.status()=='uploading') { + c.abort(); + $.resumableObj.uploadNextChunk(); + } + }); + $.resumableObj.removeFile($); + $.resumableObj.fire('fileProgress', $); + }; + $.retry = function(){ + $.bootstrap(); + var firedRetry = false; + $.resumableObj.on('chunkingComplete', function(){ + if(!firedRetry) $.resumableObj.upload(); + firedRetry = true; + }); + }; + $.bootstrap = function(){ + $.abort(); + _error = false; + // Rebuild stack of chunks from file + $.chunks = []; + $._prevProgress = 0; + var round = $.getOpt('forceChunkSize') ? Math.ceil : Math.floor; + var maxOffset = Math.max(round($.file.size/$.getOpt('chunkSize')),1); + for (var offset=0; offset<maxOffset; offset++) {(function(offset){ + window.setTimeout(function(){ + $.chunks.push(new ResumableChunk($.resumableObj, $, offset, chunkEvent)); + $.resumableObj.fire('chunkingProgress',$,offset/maxOffset); + },0); + })(offset)} + window.setTimeout(function(){ + $.resumableObj.fire('chunkingComplete',$); + },0); + }; + $.progress = function(){ + if(_error) return(1); + // Sum up progress across everything + var ret = 0; + var error = false; + $h.each($.chunks, function(c){ + if(c.status()=='error') error = true; + ret += c.progress(true); // get chunk progress relative to entire file + }); + ret = (error ? 1 : (ret>0.999 ? 1 : ret)); + ret = Math.max($._prevProgress, ret); // We don't want to lose percentages when an upload is paused + $._prevProgress = ret; + return(ret); + }; + $.isUploading = function(){ + var uploading = false; + $h.each($.chunks, function(chunk){ + if(chunk.status()=='uploading') { + uploading = true; + return(false); + } + }); + return(uploading); + }; + $.isComplete = function(){ + var outstanding = false; + $h.each($.chunks, function(chunk){ + var status = chunk.status(); + if(status=='pending' || status=='uploading' || chunk.preprocessState === 1) { + outstanding = true; + return(false); + } + }); + return(!outstanding); + }; + $.pause = function(pause){ + if(typeof(pause)==='undefined'){ + $._pause = ($._pause ? false : true); + }else{ + $._pause = pause; + } + }; + $.isPaused = function() { + return $._pause; + }; + + + // Bootstrap and return + $.resumableObj.fire('chunkingStart', $); + $.bootstrap(); + return(this); + } + + function ResumableChunk(resumableObj, fileObj, offset, callback){ + var $ = this; + $.opts = {}; + $.getOpt = resumableObj.getOpt; + $.resumableObj = resumableObj; + $.fileObj = fileObj; + $.fileObjSize = fileObj.size; + $.fileObjType = fileObj.file.type; + $.offset = offset; + $.callback = callback; + $.lastProgressCallback = (new Date); + $.tested = false; + $.retries = 0; + $.pendingRetry = false; + $.preprocessState = 0; // 0 = unprocessed, 1 = processing, 2 = finished + + // Computed properties + var chunkSize = $.getOpt('chunkSize'); + $.loaded = 0; + $.startByte = $.offset*chunkSize; + $.endByte = Math.min($.fileObjSize, ($.offset+1)*chunkSize); + if ($.fileObjSize-$.endByte < chunkSize && !$.getOpt('forceChunkSize')) { + // The last chunk will be bigger than the chunk size, but less than 2*chunkSize + $.endByte = $.fileObjSize; + } + $.xhr = null; + + // test() makes a GET request without any data to see if the chunk has already been uploaded in a previous session + $.test = function(){ + // Set up request and listen for event + $.xhr = new XMLHttpRequest(); + + var testHandler = function(e){ + $.tested = true; + var status = $.status(); + if(status=='success') { + $.callback(status, $.message()); + $.resumableObj.uploadNextChunk(); + } else { + $.send(); + } + }; + $.xhr.addEventListener('load', testHandler, false); + $.xhr.addEventListener('error', testHandler, false); + + // Add data from the query options + var params = []; + var customQuery = $.getOpt('query'); + if(typeof customQuery == 'function') customQuery = customQuery($.fileObj, $); + $h.each(customQuery, function(k,v){ + params.push([encodeURIComponent(k), encodeURIComponent(v)].join('=')); + }); + // Add extra data to identify chunk + params.push(['resumableChunkNumber', encodeURIComponent($.offset+1)].join('=')); + params.push(['resumableChunkSize', encodeURIComponent($.getOpt('chunkSize'))].join('=')); + params.push(['resumableCurrentChunkSize', encodeURIComponent($.endByte - $.startByte)].join('=')); + params.push(['resumableTotalSize', encodeURIComponent($.fileObjSize)].join('=')); + params.push(['resumableType', encodeURIComponent($.fileObjType)].join('=')); + params.push(['resumableIdentifier', encodeURIComponent($.fileObj.uniqueIdentifier)].join('=')); + params.push(['resumableFilename', encodeURIComponent($.fileObj.fileName)].join('=')); + params.push(['resumableRelativePath', encodeURIComponent($.fileObj.relativePath)].join('=')); + // Append the relevant chunk and send it + $.xhr.open('GET', $h.getTarget(params)); + $.xhr.timeout = $.getOpt('xhrTimeout'); + $.xhr.withCredentials = $.getOpt('withCredentials'); + // Add data from header options + $h.each($.getOpt('headers'), function(k,v) { + $.xhr.setRequestHeader(k, v); + }); + $.xhr.send(null); + }; + + $.preprocessFinished = function(){ + $.preprocessState = 2; + $.send(); + }; + + // send() uploads the actual data in a POST call + $.send = function(){ + var preprocess = $.getOpt('preprocess'); + if(typeof preprocess === 'function') { + switch($.preprocessState) { + case 0: preprocess($); $.preprocessState = 1; return; + case 1: return; + case 2: break; + } + } + if($.getOpt('testChunks') && !$.tested) { + $.test(); + return; + } + + // Set up request and listen for event + $.xhr = new XMLHttpRequest(); + + // Progress + $.xhr.upload.addEventListener('progress', function(e){ + if( (new Date) - $.lastProgressCallback > $.getOpt('throttleProgressCallbacks') * 1000 ) { + $.callback('progress'); + $.lastProgressCallback = (new Date); + } + $.loaded=e.loaded||0; + }, false); + $.loaded = 0; + $.pendingRetry = false; + $.callback('progress'); + + // Done (either done, failed or retry) + var doneHandler = function(e){ + var status = $.status(); + if(status=='success'||status=='error') { + $.callback(status, $.message()); + $.resumableObj.uploadNextChunk(); + } else { + $.callback('retry', $.message()); + $.abort(); + $.retries++; + var retryInterval = $.getOpt('chunkRetryInterval'); + if(retryInterval !== undefined) { + $.pendingRetry = true; + setTimeout($.send, retryInterval); + } else { + $.send(); + } + } + }; + $.xhr.addEventListener('load', doneHandler, false); + $.xhr.addEventListener('error', doneHandler, false); + + // Set up the basic query data from Resumable + var query = { + resumableChunkNumber: $.offset+1, + resumableChunkSize: $.getOpt('chunkSize'), + resumableCurrentChunkSize: $.endByte - $.startByte, + resumableTotalSize: $.fileObjSize, + resumableType: $.fileObjType, + resumableIdentifier: $.fileObj.uniqueIdentifier, + resumableFilename: $.fileObj.fileName, + resumableRelativePath: $.fileObj.relativePath, + resumableTotalChunks: $.fileObj.chunks.length + }; + // Mix in custom data + var customQuery = $.getOpt('query'); + if(typeof customQuery == 'function') customQuery = customQuery($.fileObj, $); + $h.each(customQuery, function(k,v){ + query[k] = v; + }); + + var func = ($.fileObj.file.slice ? 'slice' : ($.fileObj.file.mozSlice ? 'mozSlice' : ($.fileObj.file.webkitSlice ? 'webkitSlice' : 'slice'))), + bytes = $.fileObj.file[func]($.startByte,$.endByte), + data = null, + target = $.getOpt('target'); + + if ($.getOpt('method') === 'octet') { + // Add data from the query options + data = bytes; + var params = []; + $h.each(query, function(k,v){ + params.push([encodeURIComponent(k), encodeURIComponent(v)].join('=')); + }); + target = $h.getTarget(params); + } else { + // Add data from the query options + data = new FormData(); + $h.each(query, function(k,v){ + data.append(k,v); + }); + data.append($.getOpt('fileParameterName'), bytes); + } + + $.xhr.open('POST', target); + $.xhr.timeout = $.getOpt('xhrTimeout'); + $.xhr.withCredentials = $.getOpt('withCredentials'); + // Add data from header options + $h.each($.getOpt('headers'), function(k,v) { + $.xhr.setRequestHeader(k, v); + }); + $.xhr.send(data); + }; + $.abort = function(){ + // Abort and reset + if($.xhr) $.xhr.abort(); + $.xhr = null; + }; + $.status = function(){ + // Returns: 'pending', 'uploading', 'success', 'error' + if($.pendingRetry) { + // if pending retry then that's effectively the same as actively uploading, + // there might just be a slight delay before the retry starts + return('uploading'); + } else if(!$.xhr) { + return('pending'); + } else if($.xhr.readyState<4) { + // Status is really 'OPENED', 'HEADERS_RECEIVED' or 'LOADING' - meaning that stuff is happening + return('uploading'); + } else { + if($.xhr.status==200) { + // HTTP 200, perfect + return('success'); + } else if($h.contains($.getOpt('permanentErrors'), $.xhr.status) || $.retries >= $.getOpt('maxChunkRetries')) { + // HTTP 415/500/501, permanent error + return('error'); + } else { + // this should never happen, but we'll reset and queue a retry + // a likely case for this would be 503 service unavailable + $.abort(); + return('pending'); + } + } + }; + $.message = function(){ + return($.xhr ? $.xhr.responseText : ''); + }; + $.progress = function(relative){ + if(typeof(relative)==='undefined') relative = false; + var factor = (relative ? ($.endByte-$.startByte)/$.fileObjSize : 1); + if($.pendingRetry) return(0); + var s = $.status(); + switch(s){ + case 'success': + case 'error': + return(1*factor); + case 'pending': + return(0*factor); + default: + return($.loaded/($.endByte-$.startByte)*factor); + } + }; + return(this); + } + + // QUEUE + $.uploadNextChunk = function(){ + var found = false; + + // In some cases (such as videos) it's really handy to upload the first + // and last chunk of a file quickly; this let's the server check the file's + // metadata and determine if there's even a point in continuing. + if ($.getOpt('prioritizeFirstAndLastChunk')) { + $h.each($.files, function(file){ + if(file.chunks.length && file.chunks[0].status()=='pending' && file.chunks[0].preprocessState === 0) { + file.chunks[0].send(); + found = true; + return(false); + } + if(file.chunks.length>1 && file.chunks[file.chunks.length-1].status()=='pending' && file.chunks[file.chunks.length-1].preprocessState === 0) { + file.chunks[file.chunks.length-1].send(); + found = true; + return(false); + } + }); + if(found) return(true); + } + + // Now, simply look for the next, best thing to upload + $h.each($.files, function(file){ + if(file.isPaused()===false){ + $h.each(file.chunks, function(chunk){ + if(chunk.status()=='pending' && chunk.preprocessState === 0) { + chunk.send(); + found = true; + return(false); + } + }); + } + if(found) return(false); + }); + if(found) return(true); + + // The are no more outstanding chunks to upload, check is everything is done + var outstanding = false; + $h.each($.files, function(file){ + if(!file.isComplete()) { + outstanding = true; + return(false); + } + }); + if(!outstanding) { + // All chunks have been uploaded, complete + $.fire('complete'); + } + return(false); + }; + + + // PUBLIC METHODS FOR RESUMABLE.JS + $.assignBrowse = function(domNodes, isDirectory){ + if(typeof(domNodes.length)=='undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + var input; + if(domNode.tagName==='INPUT' && domNode.type==='file'){ + input = domNode; + } else { + input = document.createElement('input'); + input.setAttribute('type', 'file'); + input.style.display = 'none'; + domNode.addEventListener('click', function(){ + input.style.opacity = 0; + input.style.display='block'; + input.focus(); + input.click(); + input.style.display='none'; + }, false); + domNode.appendChild(input); + } + var maxFiles = $.getOpt('maxFiles'); + if (typeof(maxFiles)==='undefined'||maxFiles!=1){ + input.setAttribute('multiple', 'multiple'); + } else { + input.removeAttribute('multiple'); + } + if(isDirectory){ + input.setAttribute('webkitdirectory', 'webkitdirectory'); + } else { + input.removeAttribute('webkitdirectory'); + } + // When new files are added, simply append them to the overall list + input.addEventListener('change', function(e){ + appendFilesFromFileList(e.target.files,e); + e.target.value = ''; + }, false); + }); + }; + $.assignDrop = function(domNodes){ + if(typeof(domNodes.length)=='undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + domNode.addEventListener('dragover', onDragOver, false); + domNode.addEventListener('drop', onDrop, false); + }); + }; + $.unAssignDrop = function(domNodes) { + if (typeof(domNodes.length) == 'undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + domNode.removeEventListener('dragover', onDragOver); + domNode.removeEventListener('drop', onDrop); + }); + }; + $.isUploading = function(){ + var uploading = false; + $h.each($.files, function(file){ + if (file.isUploading()) { + uploading = true; + return(false); + } + }); + return(uploading); + }; + $.upload = function(){ + // Make sure we don't start too many uploads at once + if($.isUploading()) return; + // Kick off the queue + $.fire('uploadStart'); + for (var num=1; num<=$.getOpt('simultaneousUploads'); num++) { + $.uploadNextChunk(); + } + }; + $.pause = function(){ + // Resume all chunks currently being uploaded + $h.each($.files, function(file){ + file.abort(); + }); + $.fire('pause'); + }; + $.cancel = function(){ + for(var i = $.files.length - 1; i >= 0; i--) { + $.files[i].cancel(); + } + $.fire('cancel'); + }; + $.progress = function(){ + var totalDone = 0; + var totalSize = 0; + // Resume all chunks currently being uploaded + $h.each($.files, function(file){ + totalDone += file.progress()*file.size; + totalSize += file.size; + }); + return(totalSize>0 ? totalDone/totalSize : 0); + }; + $.addFile = function(file, event){ + appendFilesFromFileList([file], event); + }; + $.removeFile = function(file){ + for(var i = $.files.length - 1; i >= 0; i--) { + if($.files[i] === file) { + $.files.splice(i, 1); + } + } + }; + $.getFromUniqueIdentifier = function(uniqueIdentifier){ + var ret = false; + $h.each($.files, function(f){ + if(f.uniqueIdentifier==uniqueIdentifier) ret = f; + }); + return(ret); + }; + $.getSize = function(){ + var totalSize = 0; + $h.each($.files, function(file){ + totalSize += file.size; + }); + return(totalSize); + }; + + return(this); + }; + + + // Node.js-style export for Node and Component + if (typeof module != 'undefined') { + module.exports = Resumable; + } else if (typeof define === "function" && define.amd) { + // AMD/requirejs: Define the module + define(function(){ + return Resumable; + }); + } else { + // Browser: Expose to window + window.Resumable = Resumable; + } + +})(); diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index dbb3952..5651424 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -387,6 +387,33 @@ kimchi.template_add_main = function() { } } }; + //1-3 upload iso + $('#iso-upload').click(function() { + kimchi.switchPage('iso-type-box', 'iso-upload-box'); + }); + + $('#iso-upload-box-back').click(function() { + kimchi.switchPage('iso-upload-box', 'iso-type-box', 'right'); + }); + + var r = new Resumable({ + target:'storagepools/upload' + }); + + r.on('fileProgress', function(file){ + console.debug(file); + var element=document.getElementById("upload"); + var progress = Math.round(file.progress()*100)+"%" + element.innerHTML=file.fileName+ "-" + progress; + var tmp=document.getElementById("movie"); + tmp.innerHTML=['<div class="uploadify-progress"><div class="uploadify-progress-bar" style="width:', progress,'"></div></div>'].join("") + }); + + r.on('fileAdded', function(file, event){ + r.upload(); + }); + + r.assignBrowse(document.getElementById('browseButton')); }; kimchi.template_check_url = function(url) { diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 08b27a8..542cd43 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -38,6 +38,7 @@ <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> <script src="$href('js/kimchi.min.js')"></script> +<script src="$href('js/resumable.js')"></script>  <style type="text/css"> diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index afe22dd..ecda083 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -41,6 +41,9 @@ <li> <a id="iso-remote" class="remote">$_("Remote ISO Image")</a> </li> + <li> + <a id="iso-upload" class="local">$_("Upload ISO Image")</a> + </li> </ul> </div> @@ -204,6 +207,16 @@ </div> </div> +  + <div class="page" id="iso-upload-box"> + <header> + <a class="back" id="iso-upload-box-back"></a> + <h2 class="step-title">$_("Upload ISO Image")</h2> + </header> + <a href="#" id="browseButton" class="uploadify-button">Select files</a> + <div id="upload"></div> + <div id="movie"></div> + </div> </div> </div> </div> -- 1.7.9.5

3 9

UI developmet help to fix bug
by Paulo Ricardo Paz Vital 01 Jul '14

01 Jul '14

Hello UI developers. I'd like to ask for one volunteer to help me on coding the UI part for the solution of bugzilla 110428 [1]. This solution will be submitted to Kimchi project. I already have the backend done and tried to do something nice and beautiful, but I'm taking too much time in this part and want some help from you guys. [1] https://bugzilla.linux.ibm.com/show_bug.cgi?id=110428 Thanks and best regards, -- Paulo Ricardo Paz Vital <pvital(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 3