- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Bug fix #1073: Re-attach device to host when detaching it from guest
by Aline Manera 04 Jan '17

04 Jan '17

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 1f893f2..6b02f4d 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -636,6 +636,13 @@ class VMHostDevModel(object): return wok_log.info("Device %s removed successfuly" % alias) + # Re-attach device to host + try: + dev = conn.get().nodeDeviceLookupByName(alias) + dev.reAttach() + except libvirt.libvirtError, e: + wok_log.error("Unable to attach device %s back to host. Error: %s", + alias, e.message) opaque._cb('OK', True) def _detach_device(self, cb, params): -- 2.7.4

2 2

[PATCH v2] [Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 04 Jan '17

04 Jan '17

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 55 +++++++++++++++++++++++++++++ ui/css/src/modules/_edit-guests.scss | 54 ++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 68 ++++++++++++++++++++++++++++++++++-- ui/pages/guest-edit.html.tmpl | 18 ++++++++-- 4 files changed, 191 insertions(+), 4 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..ae5e37b 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1557,6 +1557,61 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..ea3ee9d 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -429,3 +429,57 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index bb82077..12c0770 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -26,6 +26,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,11 +46,12 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "pci": 4, "snapshot": 5, "processor": 6, "bootOrder": 7 var submit_map = { 0: generalSubmit, 3: permissionSubmit, - 6: processorSubmit + 6: processorSubmit, + 7: bootOrderSubmit }; var currentTab = $('#guest-edit-window li.active a[data-toggle="tab"]').data('id'); var toSubmit = parseInt($('#'+currentTab).index()); @@ -967,6 +969,42 @@ kimchi.guest_edit_main = function() { } }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + $("#myList").empty(); + $.each(guestBootOrder, function(index, value) { + var itemNode = $.parseHTML("<li class='list-group-item' " + "data-value=" + value + ">" + value + "</li>"); + $("#myList").append(itemNode); + }); + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).text()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + } + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1032,6 +1070,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1221,4 +1260,29 @@ kimchi.guest_edit_main = function() { if(kimchi.hostarch === s390xArch){ $('#guest-edit-window ul li a[data-id="form-guest-edit-pci"],a[data-id="form-guest-edit-snapshot"]').parent().hide(); } + + var bootOrderSubmit = function(event) { + //Format the strings to go in the array before passing in to the API + //"hd", "network", "cdrom" + var formattedBootOrderOptions = []; + for (var i=0; i<bootOrderOptions.length; i++) { + var str = bootOrderOptions[i].trim(); + str = str.toLowerCase(); + if (str === "hdd") { + str = "hd"; + } else if (str === "cd-rom") { + str = "cdrom"; + } + formattedBootOrderOptions.push(str); + } + var data = { + bootorder: formattedBootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); + }; + }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..5424250 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -38,6 +38,7 @@ <li role="presentation"><a href="#form-guest-edit-pci" aria-controls="form-guest-edit-pci" role="form-guest-edit-pci" data-id="form-guest-edit-pci" data-toggle="tab">$_("Pci")</a></li> <li role="presentation"><a href="#form-guest-edit-snapshot" aria-controls="form-guest-edit-snapshot" role="tab" data-id="form-guest-edit-snapshot" data-toggle="tab">$_("Snapshot")</a></li> <li role="presentation"><a href="#form-edit-processor" aria-controls="form-edit-processor" role="tab" data-id="form-edit-processor" data-toggle="tab">$_("Processor")</a></li> + <li role="presentation"><a href="#form-guest-edit-boot-order" aria-controls="form-guest-edit-boot-order" role="tab" data-id="form-guest-edit-boot-order" data-toggle="tab">Boot Order</a></li> </ul> <div class="tab-content" id="guest-edit-tabs"> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> @@ -197,7 +198,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> @@ -231,6 +231,20 @@ </div> </div> </form> + <form role="tabpanel" class="tab-pane" id="form-guest-edit-boot-order"> + <div class="form-group"> + <div id="bootOrder"> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CD-ROM">CD-ROM</li> + <li class="list-group-item" data-value="HDD">HDD</li> + <li class="list-group-item" data-value="Network">Network</li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Change the boot order by dragging the items on the list.")</p> + </p> + </div> + </div> + </form> </div> </div> <div class="modal-footer"> -- 2.9.3

3 2

Re: [Kimchi-devel] mockmodel.py: unsubscribing from 'exit' channel on cleanup
by Aline Manera 26 Dec '16

26 Dec '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Kimchi 0/4] Fix for Multi-culture UI issues for kimchi plugin.
by rajgupta＠linux.vnet.ibm.com 20 Dec '16

20 Dec '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Rajat Gupta (4): Multi-culture UI issues for kimchi plugin template module Corrected position of close icon for create a network pop up alert Multi-culture UI issues for kimchi plugin Storage module Multi-culture UI issues for kimchi plugin Guest module ui/css/kimchi.css | 150 ++++++++++++++++++++++----------- ui/css/src/modules/_edit-guests.scss | 29 ++++--- ui/css/src/modules/_guests.scss | 6 +- ui/css/src/modules/_network.scss | 4 + ui/css/src/modules/_storage.scss | 61 ++++++++++---- ui/css/src/modules/_templates.scss | 19 +++-- ui/js/src/kimchi.guest_edit_main.js | 28 +++--- ui/js/src/kimchi.template_edit_main.js | 6 +- ui/pages/guest-edit.html.tmpl | 30 +++---- ui/pages/guest-storage-add.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 10 +++ ui/pages/tabs/guests.html.tmpl | 14 +-- ui/pages/tabs/storage.html.tmpl | 34 ++++---- ui/pages/tabs/templates.html.tmpl | 24 +++--- ui/pages/template-edit.html.tmpl | 28 +++--- 15 files changed, 281 insertions(+), 164 deletions(-) -- 2.1.0

3 6

Re: [Kimchi-devel] Kimchi/Wok
by Michael Cooper 20 Dec '16

20 Dec '16

Hello Guys, Are there any plans to develop this to manage multiple KVM servers from a centralized location? This is a great piece of software. Thanks Michael Cooper Linux & VMWare Certified Professionl

2 1

[RFC] Bizarre behaviour with libvirt on CentOS
by Ramon Medeiros 20 Dec '16

20 Dec '16

Hi, i was looking for root cause of this bug: "After creating a vepa network and adding it to a guest, the same is listed in Actions->Edit. If the guest is poweron, the interfaces is not listed". When offline, libvirt says vepa interface is "type" (i run a GET on vm/ifaces, see below): "network". When up, this parameter change to "macvtap", what is breaking UI: ui/js/src/kimchi.guest_edit_main.js 456 kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { 457 for (var i = 0; i < data.length; i++) { 458 data[i].viewMode = ""; 459 data[i].editMode = "hide"; 460 data[i].id = i; 461 if (data[i].type == 'network') 462 addItem(data[i]); 463 } 464 }); So, the if at 461 fails and the interface is not added. Need to figure out why libvirt is changing it. Here is a get at vms/ifaces: Poweroff: { "source":"eth0", "mac":"52:54:00:2f:48:f4", "model":"virtio", "type":"network", "mode":"vepa" } ] Poweron { "source":"eth0", "mac":"52:54:00:2f:48:f4", "model":"virtio", "type":"macvtap", "mode":"vepa" } Anyone know how to proceed? Can i open a bug against libvirt? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH][Kimchi] Bug fix #1026: CentOS: Unable to get and update memory values for a powered off guest
by Ramon Medeiros 20 Dec '16

20 Dec '16

Parse vm memory from xml when it isn't available at dom.info Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/model/vms.py b/model/vms.py index bff7ed2..22bb5ec 100644 --- a/model/vms.py +++ b/model/vms.py @@ -104,6 +104,7 @@ XPATH_BOOT = 'os/boot/@dev' XPATH_BOOTMENU = 'os/bootmenu/@enable' XPATH_CPU = './cpu' XPATH_DESCRIPTION = './description' +XPATH_MEMORY = './memory' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' XPATH_SNAP_VM_NAME = './domain/name' @@ -1307,6 +1308,11 @@ class VMModel(object): if memory != curr_mem: memory = curr_mem + (self._get_mem_dev_total_size(xml) >> 10) + # On CentOS, dom.info does not retrieve memory. So, if machine does + # not have memory hotplug, parse memory from xml + if memory == 0: + memory = int(xpath_get_text(xml, XPATH_MEMORY)[0]) >> 10 + # assure there is no zombie process left for proc in self._serial_procs[:]: if not proc.is_alive(): -- 2.7.4

2 2

[PATCH] [Kimchi] Bug fix #1064: In Migrate guest window, text boxes are not taking input properly from keyboard.
by bianca＠linux.vnet.ibm.com 20 Dec '16

20 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed listVmsAuto function in kimchi.guest_main.js file to not run it when Migrations modal are opened, so it prevents keyboard input problems from happenning. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 21ab262..b08b714 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -789,7 +789,8 @@ kimchi.listVmsAuto = function() { //Check if the actions button is opened or not, //if opended stop the reload of the itens until closed var $isDropdownOpened = $('[name="guest-actions"] ul.dropdown-menu').is(":visible"); - if (!$isDropdownOpened) { + var $isModalOpened = $('#migrate-guest-window').is(":visible"); + if (!$isDropdownOpened && !$isModalOpened) { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } -- 2.9.3

3 2

[PATCH] [Wok] Bug fix #130: Wok does not support multiple words in plugin tag name
by bianca＠linux.vnet.ibm.com 20 Dec '16

20 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed parseTabs function in wok.main.js file to replace whitespaces in the tab's name to raw character, doing that it will be possible to use more than one word in tab's name. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 8e986f7..658974a 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -82,7 +82,7 @@ wok.main = function() { var parseTabs = function(plugin, xmlData) { var tabs = []; var funcNode = $(xmlData).find('functionality'); - var functionality = funcNode.text(); + var functionality = funcNode.text().split(' ').join('\xa0'); var colorTab1 = funcNode.attr('colorTab1'); var colorTab2 = funcNode.attr('colorTab2'); wok.pluginsColor[plugin] = colorTab2; -- 2.9.3

2 2

[PATCH] [Wok] Bug fix #163: make check-local: whitespace verification is not excluding imported files
by bianca＠linux.vnet.ibm.com 20 Dec '16

20 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed Makefile.am to ignore ui imported files (ui/libs). Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 539c6a2..72ffb50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,7 @@ check-local: @if $(GIT) rev-parse &> /dev/null ; then \ echo "Whitespace verification ..."; \ git grep --cached -Il '' | \ - grep -v '^ui/css/src/vendor/' | xargs egrep '.* +$$' \ + grep -v '^ui/css/src/vendor/\|^ui/libs/' | xargs egrep '.* +$$' \ && echo "ERROR: Whitespaces found" || echo "Ok"; \ echo "Check IBM license header and copyright date ..." ; \ /bin/bash check-IBM-license-header.sh ; \ -- 2.9.3

2 1