- Kimchi-devel - oVirt List Archives

[PATCH] bug fix: Add spice.css to Makefile and spec files
by Aline Manera 07 Aug '14

07 Aug '14

spice.css was added to source code but the build process was not updated accordingly. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + ui/css/Makefile.am | 2 +- ui/css/spice/Makefile.am | 20 ++++++++++++++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ui/css/spice/Makefile.am diff --git a/configure.ac b/configure.ac index a260f7d..d9b991a 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,7 @@ AC_CONFIG_FILES([ ui/Makefile ui/css/Makefile ui/css/novnc/Makefile + ui/css/spice/Makefile ui/css/fonts/Makefile ui/css/fonts/novnc/Makefile ui/images/Makefile diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index acc9bc0..0c6f934 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* %endif %{_datadir}/kimchi/ui/css/novnc/base.css +%{_datadir}/kimchi/ui/css/spice/spice.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png %{_datadir}/kimchi/ui/images/*.ico diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 7e082dc..2d3d271 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* %endif %{_datadir}/kimchi/ui/css/novnc/base.css +%{_datadir}/kimchi/ui/css/spice/spice.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png %{_datadir}/kimchi/ui/images/*.ico diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index 9a2a29f..a4f575d 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = novnc +SUBDIRS = novnc spice if FONTS SUBDIRS += fonts diff --git a/ui/css/spice/Makefile.am b/ui/css/spice/Makefile.am new file mode 100644 index 0000000..1271663 --- /dev/null +++ b/ui/css/spice/Makefile.am @@ -0,0 +1,20 @@ +# +# Kimchi +# +# Copyright IBM, Corp. 2014 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cssdir = $(datadir)/kimchi/ui/css/spice + +dist_css_DATA = spice.css -- 1.9.3

2 2

[PATCH V4 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com 07 Aug '14

07 Aug '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4: test case not pass. fix it. V2 -> V3: do not make ticket as sub-resource of a VM 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/ \ -X PUT -d '{"ticket": {"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/ 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 | 7 +++++ src/kimchi/API.json | 16 +++++++++++ src/kimchi/control/vms.py | 3 +- src/kimchi/i18n.py | 2 ++ src/kimchi/mockmodel.py | 14 +++++++++ src/kimchi/model/vms.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_mockmodel.py | 2 +- tests/test_model.py | 17 ++++++++++- tests/test_rest.py | 12 ++++++++ 9 files changed, 143 insertions(+), 3 deletions(-) -- 1.9.3

4 11

[PATCHv6 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v5>v6, Delete wrong volume type parameter in to_volume_list to avoid breaking volume filtering v4>v5, Because '/tmp' used tmpfs, but kimchi used 'cache=none' when create vm, so when create image on '/tmp' result in create vm fails, fix this error. Also clear some files created in test. (Aline) v3>v4, Aggreated image scanning and name generate logic to vmtemplate.py to avoid duplicate code. Updated testcases accordingly. v2>v3, Clear unused iso link, Adding mockmodel and tests 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'....} Royce Lv (7): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Fix: Prevent iso links filling in osinfo.py Create volume based on backing store image Update mockmodel of base img vm Add tests for image based template Makefile.am | 1 + contrib/DEBIAN/control.in | 4 +- contrib/kimchi.spec.fedora.in | 2 + contrib/kimchi.spec.suse.in | 2 + docs/API.md | 3 +- docs/README.md | 9 ++- src/kimchi/API.json | 8 ++- src/kimchi/control/storagevolumes.py | 2 +- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 ++ src/kimchi/i18n.py | 8 ++- src/kimchi/imageinfo.py | 66 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 23 ++++---- src/kimchi/model/templates.py | 12 +--- src/kimchi/model/vms.py | 1 + src/kimchi/osinfo.py | 24 +------- src/kimchi/vmtemplate.py | 105 +++++++++++++++++++++++++---------- tests/test_mockmodel.py | 12 ++-- tests/test_model.py | 31 +++++++++++ tests/test_osinfo.py | 8 --- tests/test_rest.py | 44 +++++++++++++-- tests/test_vmtemplate.py | 25 ++++++--- 22 files changed, 288 insertions(+), 108 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

2 8

[PATCH v2 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 06 Aug '14

06 Aug '14

Changelog from v1: - Put function "validate_repo_url" in "src/kimchi/utils.py". Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 25 ++++++++++++++++--- src/kimchi/repositories.py | 11 +++++++++ src/kimchi/utils.py | 15 ++++++++++++ tests/test_model.py | 42 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 41 +++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 8 files changed, 129 insertions(+), 12 deletions(-) -- 1.9.3

2 5

[PATCH 0/3] Fix: Do not pass 'bus' param when attaching disk
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We passed 'IDE' for default value when attaching cdrom, but 'IDE' bus is not supported on some platform(e.g. power), In fact, kimchi has a embeded scheme to decide which bus is proper, so let backend to decide which bus to use when attaching disk. Royce Lv (3): Delete 'bus' param from backend Delete 'bus' selection from UI Update testcases for bus type decision making src/kimchi/API.json | 6 ------ src/kimchi/model/vmstorages.py | 3 +-- tests/test_model.py | 34 ++++++++++++++++++------------ ui/js/src/kimchi.guest_storage_add.main.js | 28 ------------------------ ui/pages/guest-storage-add.html.tmpl | 13 ------------ 5 files changed, 22 insertions(+), 62 deletions(-) -- 1.8.3.2

3 6

Blocking progress of issue #395: VM console does not work on iPads
by Wen Wang 06 Aug '14

06 Aug '14

Hi all, I can take this bug whereas there is another issue that blocking this progress. I cannot connect to vnc server using iPad with neither Safari nor Chrome. The Chrome on PC works just fine. Please take a look at the connection problem before we go through this issue. Wang Wen

2 5

[PATCH] Increasing nginx proxy timeout
by Daniel Henrique Barboza 06 Aug '14

06 Aug '14

The 60 seconds nginx timeout is creating some issues with actions that takes some time to complete, like creating a VM with a NFS template. After 60 seconds without a backend answer, the user is presented with a 504 Gateway Timeout error. This patch increases the timeout to 600 seconds, 10 minutes. This is enough time to process all the backend requests and ensure that a 504 error will only occur in a legitimate error in the backend. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/nginx.conf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index 3a8dfc5..1d1a398 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -38,6 +38,13 @@ http { access_log /var/log/nginx/access.log main; sendfile on; + # Timeout set to 10 minutes to avoid the 504 Gateway Timeout + # when Kimchi is processing a request. + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; + server { listen $proxy_ssl_port ssl; -- 1.8.3.1

2 1

[PATCH] Passthrough: Add PCI Devices to VM
by huoyuxin＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 86 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 66 +++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 4 files changed, 233 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 1092cc9..c9b43bd 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -17,8 +17,8 @@ */ #guest-edit-window { font-size: 13px; - height: 400px; - width: 610px; + height: 420px; + width: 820px; } #guest-edit-tabs { @@ -266,3 +266,85 @@ float: right; margin-right: 10px; } + +.guest-edit-pci { + height: 79%; + overflow: auto; + font-size: 12px; +} + +.guest-edit-pci .filter { + height: 35px; + margin-right: 5px; + overflow: hidden; +} + +.guest-edit-pci .group { + float: right; +} + +.guest-edit-pci .filter .control { + border: 1px solid #AAAAAA; + font-size: 12px; + background-color: white; +} + +.guest-edit-pci .filter select { + border-right: 0px!important; + border-radius: 7px 0px 0px 7px; + padding: 2px 2px 2px 7px; + width: 100px; +} + +.guest-edit-pci .filter select option { + padding-left: 7px; +} + +.guest-edit-pci .filter input { + border-radius: 0px 7px 7px 0px; + padding: 3px 3px 3px 10px; + width: 200px; + font-style: italic; +} + +.guest-edit-pci .header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; +} + +.guest-edit-pci .item { + margin-bottom: 4px; + overflow: hidden; +} + +.guest-edit-pci .cell { + display: inline-block; + vertical-align: middle; + margin-right: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.guest-edit-pci .item button { + width: 20px; + height: 20px; + float: right; +} + +.guest-edit-pci .name { + width: 18%; + max-width: 18%; +} + +.guest-edit-pci .product { + width: 45%; + max-width: 45%; +} + +.guest-edit-pci .vendor { + width: 25%; + max-width: 25%; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..ad91ad3 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,60 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getHostPCIDevices : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough=true&_cap=pci', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getVMPCIDevices : function(id, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(id)+'/hostdevs', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + addVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify(device), + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + removeVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 38a2bc0..d002add 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -349,6 +349,71 @@ kimchi.guest_edit_main = function() { }); }; + var setupPCIDevice = function(){ + kimchi.getHostPCIDevices(function(hostPCIs){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; + } + } + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + obj.button("option", "icons", { primary: "ui-icon-plus" }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + }else{ + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + obj.button("option", "icons", { primary: "ui-icon-minus" }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + } + }); + }); + var filterNodes = function(group, text){ + text = text.toLowerCase(); + $(".body", "#form-guest-edit-pci").children().each(function(){ + var textFilter = $(".name", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".product", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".vendor", this).text().toLowerCase().indexOf(text)!=-1; + var display = "none"; + var itemGroup = $("button", this).button("option", "icons").primary; + if(textFilter){ + if(group == "all"){ + display = ""; + }else if(group=="toAdd" && itemGroup=="ui-icon-plus"){ + display = "" + }else if(group == "added" && itemGroup=="ui-icon-minus"){ + display = "" + } + } + $(this).css("display", display); + }); + }; + $("select", "#form-guest-edit-pci").change(function(){ + filterNodes($(this).val(), $("input", "#form-guest-edit-pci").val()); + }); + $("input", "#form-guest-edit-pci").on("keyup", function() { + filterNodes($("select", "#form-guest-edit-pci").val(), $(this).val()); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -379,6 +444,7 @@ kimchi.guest_edit_main = function() { setupInterface(); setupPermission(); + setupPCIDevice(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 1c1d7d4..7ae3bfd 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -41,6 +41,9 @@ <li> <a href="#form-guest-edit-permission">$_("Permission")</a> </li> + <li> + <a href="#form-guest-edit-pci">$_("PCI Device")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -142,6 +145,23 @@ </div> </div> </form> + <form id="form-guest-edit-pci" class="guest-edit-pci"> + <div class="filter"> + <span class="group"> + <select class="control"> + <option value="all">$_("All")</option> + <option value="toAdd">$_("To Add")</option> + <option value="added">$_("Added")</option> + </select><input type="text" class="control" placeholder="$_("filter")"> + </span> + </div> + <div class="header"> + <span class="cell name">$_("Name")</span> + <span class="cell product">$_("Product")</span> + <span class="cell vendor">$_("Vendor")</span> + </div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -228,6 +248,14 @@ <label>{val}</label> </div> </script> +<script id="pci-tmpl" type="text/html"> +<div class="item" id="{name}"> + <span class="cell name" title="{name}">{name}</span> + <span class="cell product" title="{product}">{product}</span> + <span class="cell vendor" title="{vendor}">{vendor}</span> + <button></button> +</div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

1 0

[PATCHv5 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v4>v5, Because '/tmp' used tmpfs, but kimchi used 'cache=none' when create vm, so when create image on '/tmp' result in create vm fails, fix this error. Also clear some files created in test. (Aline) v3>v4, Aggreated image scanning and name generate logic to vmtemplate.py to avoid duplicate code. Updated testcases accordingly. v2>v3, Clear unused iso link, Adding mockmodel and tests 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'....} Royce Lv (7): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Fix: Prevent iso links filling in osinfo.py Create volume based on backing store image Update mockmodel of base img vm Add tests for image based template Makefile.am | 1 + contrib/DEBIAN/control.in | 4 +- contrib/kimchi.spec.fedora.in | 2 + contrib/kimchi.spec.suse.in | 2 + docs/API.md | 3 +- docs/README.md | 9 ++- src/kimchi/API.json | 8 ++- src/kimchi/control/storagevolumes.py | 2 +- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 ++ src/kimchi/i18n.py | 8 ++- src/kimchi/imageinfo.py | 66 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 21 +++---- src/kimchi/model/templates.py | 12 +--- src/kimchi/model/vms.py | 1 + src/kimchi/osinfo.py | 24 +------- src/kimchi/vmtemplate.py | 104 +++++++++++++++++++++++++---------- tests/test_mockmodel.py | 12 ++-- tests/test_model.py | 31 +++++++++++ tests/test_osinfo.py | 8 --- tests/test_rest.py | 44 +++++++++++++-- tests/test_vmtemplate.py | 25 ++++++--- 22 files changed, 287 insertions(+), 106 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 9

[PATCH 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 04 Aug '14

04 Aug '14

Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 41 ++++++++++++++++++++++++++++--- src/kimchi/repositories.py | 29 +++++++++++++++++++++- tests/test_model.py | 42 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 41 +++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 7 files changed, 147 insertions(+), 13 deletions(-) -- 1.9.3

2 7