July 2016 - Kimchi-devel - oVirt List Archives

[RFC] Wok / Ginger sidebar
by Samuel Henrique De Oliveira Guimaraes 31 Aug '16

31 Aug '16

Hi team, We currently have an issue with Ginger/Gingerbase navigation bar in small screen resolutions and we also have huge tables in System Services page. Since working on the navigation bar involves editing Wok styles, I'm sending this e-mail to Wok mailing list instead of Ginger group. I looked for successful combinations of sidebar + horizontal navigation bars and so far I couldn't find any example that would exactly fit with Wok and its plugins. The majority of examples I'm listing below are very good with traditional pages with deep subcategories and the navigation bars can work as sitemaps and replace breadcrumbs: * http://www.worldwildlife.org/ - https://vimeo.com/166812605 * https://www.theguardian.com/us - https://vimeo.com/166812599 * https://next.ft.com/fastft - https://vimeo.com/166812597 Wok currently has two navigation levels. Kimchi doesn't have multiple sections but Ginger and Gingerbase uses collapsible panel groups to separate sections that could be third level elements on a sidebar. This was already discussed when we moved some features from Ginger to Gingerbase but I think we could achieve a functional sidebar with up to three levels without using a "landing page" for second-level elements. In the attached screenshots ginger_sidebar1 and ginger_sidebar2 are mockups for an off-canvas menu that would slide the main content and hide itself once an option is clicked. It would also hide the other panel accordions. Here are two off-canvas menu in action: * http://codepen.io/SitePoint/full/uIemr/ * https://codepen.io/benske/full/cxrta/ Since this would require a change in Wok tabs and ginger/gingerbase tab-ext.xml, I think we could implement something entirely different that would with Wok and all plugins. This site menu only have first-level options on the sidebar but I think we could add collapsible links like a tree-table menu: https://www.sitepoint.com/ In addition to the sidebar, we could put a search/filter input on the top that would allow the user to type the desired option and show its position on the menu. Please take a look at the remaining attached screenshots. I did one variation with the content aligned to the center and another one aligned to the left. Regards, Samuel

4 17

[Wok] [RFC] Issue #122: Make AsyncTask stoppable.
by Paulo Ricardo Paz Vital 24 Aug '16

24 Aug '16

This is an RFC for "Make AsyncTask stoppable" in Wok (and any other plugin). The main idea is give to user a way to stop a Task that is still running, cleaning all references and processes and setting the Task status to "killed". To do this, the Task API need to be modified, by implementing the DELETE method in Task Resource. Said that, the API will look like: ### Resource: Task **URI:** /tasks/*:id* A task represents an asynchronous operation that is being performed by the server. **Methods:** * **GET**: Retrieve the full description of the Task * id: The Task ID is used to identify this Task in the API. * status: The current status of the Task * running: The task is running * finished: The task has finished successfully * failed: The task failed + * killed: The task was killed by user * message: Human-readable details about the Task status * target_uri: Resource URI related to the Task +* **DELETE**: Delete the Task * **POST**: *See Task Actions* **Actions (POST):** *No actions defined* Since an AsyncTask is basic a thread running in the system and this thread can execute a pure Python method or a background command (by using run_command() from wok.utils), the developer must pass as argument to the add_task() a method to be executed by the DELETE operation, called here as 'kill_cb'. With this idea, the add_task() method and also the AsyncTask constructor will be like: def add_task(target_uri, fn, objstore, kill_cb=None, opaque=None): class AsyncTask(object): def __init__(self, id, target_uri, fn, objstore, kill_cb=None, opaque=None): If none kill_cb is passed, the task will not be able to stopped and an error (or warning) message will be raised to user if DELETE operation is executed. Otherwise, the kill_cb method will be executed by kill() method (responsible to execute the DELETE operation) of AsyncTask class and its status set to 'killed'. If you have any comments or suggestions, please feel free to reply to ML. Thanks and bestr regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

3 5

[RFC] Use javascript libraries from rpms instead of hardcode it inside the git
by Ramon Medeiros 04 Aug '16

04 Aug '16

Hi, i want to use javascript libraries from rpms, but, not all libraries are available in distro repos. So let's discuss how i can do it: Fedora case: Fedora has jquery, lodash, moment, typeahead and es5-shim libraries available. Opensuse: No library available Ubuntu: Ubuntu has bootstrap, jquery, jquery-ui e lodash. As not all libraries are available, i received a suggestion to use a parameter at configure.ac, like --with-spice, to choose libs from rpm or from the code. So, what is best: Use single parameter (--use-js-from-rpms) I will need to check the distro by code and generate the html templates with the script tag changed. Use parameters with distros (--ubuntu-use-js-from-rpms) Same as above, but distro will not be checked. -- 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 v2] [Kimchi] Validate passthrough inside the task
by Jose Ricardo Ziviani 29 Jul '16

29 Jul '16

- In order to validade if a given PCI is ok to be attached, a heavy verification has to be done. This commit add such verification in the task. This will give a faster response to the UI, improving the user experience. - Add a small fix for an issue in PCI filter, added by commit eb3864f. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- v2: - Fix issue in PCI Filter button model/vmhostdevs.py | 22 ++++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 49 ++++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 15b5bec..ef39de3 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -89,7 +89,6 @@ class VMHostDevsModel(object): def create(self, vmid, params): dev_name = params['name'] - self._passthrough_device_validate(dev_name) dev_info = self.dev_model.lookup(dev_name) if dev_info['device_type'] == 'pci': @@ -216,6 +215,13 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: try: self._validate_pci_passthrough_env() @@ -455,6 +461,13 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: dom = VMModel.get_vm(vmid, self.conn) @@ -501,6 +514,13 @@ class VMHostDevsModel(object): dom = VMModel.get_vm(vmid, self.conn) lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: with RollbackContext() as rollback: xmlstr = self._get_usb_device_xml(dev_info) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c4f39c4..a59d51a 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -534,7 +534,7 @@ kimchi.guest_edit_main = function() { }); }; var pciDeviceButtonHandler = function() { - $('button', '#form-guest-edit-pci').on('click', function(event) { + $('.btn.btn-link', '#form-guest-edit-pci').on('click', function(event) { event.preventDefault(); var obj = $(this); var objIcon = obj.find('i'); @@ -546,9 +546,11 @@ kimchi.guest_edit_main = function() { wok.message.error(err.responseJSON.reason, '#alert-modal-container'); }); } else { + $('html').addClass('in-progress'); + $('#form-guest-edit-pci > .wok-mask').show(); + var haveCompanions = false; + var pciTitle = i18n['KCHVMED6007M'] + '\n'; kimchi.getPCIDeviceCompanions(id, function(infoData) { - var pciTitle = i18n['KCHVMED6007M'] + '\n'; - var haveCompanions = false; for (var p = 0; p < infoData.length; p++) { if (infoData[p].device_type === 'net') { haveCompanions = true; @@ -564,24 +566,19 @@ kimchi.guest_edit_main = function() { pciTitle += ', ' + i18n['KCHVMED6006M'] + ' ' + infoData[p].model + '\n'; } } - var settings = { - title: i18n['KCHVMED6012M'], - content: pciTitle, - confirm: i18n['KCHAPI6002M'], - cancel: i18n['KCHAPI6003M'] - }; + }); + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + $('html').removeClass('in-progress'); - if (haveCompanions) { - wok.confirm(settings, function() { - kimchi.addVMPCIDevice(kimchi.selectedGuest, { - name: id - }, function(task) { - getOngoingAttachingDevices(task); - }, function(err) { - wok.message.error(err.responseJSON.reason, '#alert-modal-container'); - }); - }); - } else { + var settings = { + title: i18n['KCHVMED6012M'], + content: pciTitle, + confirm: i18n['KCHAPI6002M'], + cancel: i18n['KCHAPI6003M'] + }; + + if (haveCompanions) { + wok.confirm(settings, function() { kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: id }, function(task) { @@ -589,8 +586,16 @@ kimchi.guest_edit_main = function() { }, function(err) { wok.message.error(err.responseJSON.reason, '#alert-modal-container'); }); - } - }); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { + name: id + }, function(task) { + getOngoingAttachingDevices(task); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + }); + } } }); }; -- 2.7.4

3 2

[PATCH] [Kimchi 0/2] Improve PCI passthrough experience
by Jose Ricardo Ziviani 29 Jul '16

29 Jul '16

This patch has improvements to both PCI tab (Edit Guest) and PCI Passthrough performances. Jose Ricardo Ziviani (2): Improve PCI passthrough performance Replace device companion check before the passthrough model/vmhostdevs.py | 34 ++++++++--------- ui/js/src/kimchi.guest_edit_main.js | 74 ++++++++++++++++++++++--------------- ui/pages/i18n.json.tmpl | 1 + 3 files changed, 61 insertions(+), 48 deletions(-) -- 2.7.4

2 3

[PATCH][Kimchi 0/2] Issue #467: Feature: Show boot menu for a guest
by Ramon Medeiros 28 Jul '16

28 Jul '16

based on "Make Kimchi able to change guest's boot order" Ramon Medeiros (2): Allow guest to enable bootmenu on startup Add test to verify bootmenu and update old tests API.json | 5 +++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 30 +++++++++++++++++++++--------- tests/test_mockmodel.py | 2 +- tests/test_model.py | 8 +++++++- xmlutils/bootorder.py | 3 +++ 7 files changed, 39 insertions(+), 11 deletions(-) -- 2.5.5

3 7

[PATCH] [Kimchi] Validate passthrough inside the task
by Jose Ricardo Ziviani 28 Jul '16

28 Jul '16

- In order to validade if a given PCI is ok to be attached, a heavy verification has to be done. This commit add such verification in the task. This will give a faster response to the UI, improving the user experience. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 22 ++++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 47 ++++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 15b5bec..ef39de3 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -89,7 +89,6 @@ class VMHostDevsModel(object): def create(self, vmid, params): dev_name = params['name'] - self._passthrough_device_validate(dev_name) dev_info = self.dev_model.lookup(dev_name) if dev_info['device_type'] == 'pci': @@ -216,6 +215,13 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: try: self._validate_pci_passthrough_env() @@ -455,6 +461,13 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: dom = VMModel.get_vm(vmid, self.conn) @@ -501,6 +514,13 @@ class VMHostDevsModel(object): dom = VMModel.get_vm(vmid, self.conn) lock = params['lock'] + try: + self._passthrough_device_validate(dev_info['name']) + + except InvalidParameter as e: + cb(e.message, False) + raise + with lock: with RollbackContext() as rollback: xmlstr = self._get_usb_device_xml(dev_info) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 507ae75..5d91b14 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -546,9 +546,11 @@ kimchi.guest_edit_main = function() { wok.message.error(err.responseJSON.reason, '#alert-modal-container'); }); } else { + $('html').addClass('in-progress'); + $('#form-guest-edit-pci > .wok-mask').show(); + var haveCompanions = false; + var pciTitle = i18n['KCHVMED6007M'] + '\n'; kimchi.getPCIDeviceCompanions(id, function(infoData) { - var pciTitle = i18n['KCHVMED6007M'] + '\n'; - var haveCompanions = false; for (var p = 0; p < infoData.length; p++) { if (infoData[p].device_type === 'net') { haveCompanions = true; @@ -564,24 +566,19 @@ kimchi.guest_edit_main = function() { pciTitle += ', ' + i18n['KCHVMED6006M'] + ' ' + infoData[p].model + '\n'; } } - var settings = { - title: i18n['KCHVMED6012M'], - content: pciTitle, - confirm: i18n['KCHAPI6002M'], - cancel: i18n['KCHAPI6003M'] - }; + }); + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + $('html').removeClass('in-progress'); - if (haveCompanions) { - wok.confirm(settings, function() { - kimchi.addVMPCIDevice(kimchi.selectedGuest, { - name: id - }, function(task) { - getOngoingAttachingDevices(task); - }, function(err) { - wok.message.error(err.responseJSON.reason, '#alert-modal-container'); - }); - }); - } else { + var settings = { + title: i18n['KCHVMED6012M'], + content: pciTitle, + confirm: i18n['KCHAPI6002M'], + cancel: i18n['KCHAPI6003M'] + }; + + if (haveCompanions) { + wok.confirm(settings, function() { kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: id }, function(task) { @@ -589,8 +586,16 @@ kimchi.guest_edit_main = function() { }, function(err) { wok.message.error(err.responseJSON.reason, '#alert-modal-container'); }); - } - }); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { + name: id + }, function(task) { + getOngoingAttachingDevices(task); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + }); + } } }); }; -- 2.7.4

5 4

[PATCH v2] [Kimchi] Disable vm statistics/screenshots in edit guest
by Jose Ricardo Ziviani 28 Jul '16

28 Jul '16

- When Edit Guest modal window is opened, Kimchi continues to make requests to get all VM' statistics and screenshots, that affects necessary and heavy requests like PCI queries. This commit disable those poolings when the modal window is opened and re-enable when the modal is closed. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- v2: - wrapped the setTimeout in a function to avoid duplication of hardcoded magic numbers ui/js/src/kimchi.guest_edit_main.js | 5 +++++ ui/js/src/kimchi.guest_main.js | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9099f39..c4f39c4 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -20,6 +20,11 @@ kimchi.guest_edit_main = function() { var formTargetId; var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); + clearTimeout(kimchi.vmTimeout); + + $('#modalWindow').on('hidden.bs.modal', function() { + kimchi.setListVMAutoTimeout(); + }); $('#guest-edit-window a[data-toggle="tab"]').on('show.bs.tab', function(tab) { tab.target; // newly activated tab diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index ab26fa4..9c1aa54 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -900,8 +900,7 @@ kimchi.listVmsAuto = function() { $('#guests-root-container > .wok-mask').fadeOut(300, function() {}); } } - - kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); + kimchi.setListVMAutoTimeout(); }, function(errorResponse, textStatus, errorThrown) { if (errorResponse.responseJSON && errorResponse.responseJSON.reason) { @@ -910,11 +909,11 @@ kimchi.listVmsAuto = function() { $('#guests-root-container > .wok-mask').addClass('hidden'); }); } - kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); + kimchi.setListVMAutoTimeout(); }); } else { clearTimeout(kimchi.vmTimeout); - kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); + kimchi.setListVMAutoTimeout(); } }; @@ -924,3 +923,7 @@ kimchi.editTemplate = function(guestTemplate, oldPopStat) { } return guestTemplate; }; + +kimchi.setListVMAutoTimeout = function() { + kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); +} -- 2.7.4

2 1

[PATCH] [Wok] Externalise the tab names and locale list
by pkulkark＠linux.vnet.ibm.com 28 Jul '16

28 Jul '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> The tab names (Wok, Host, Virtualization) should be externalised. Also, the list of locales needs to be externalised so that it is translatable based on the language selected. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 3 +- ui/pages/i18n.json.tmpl | 3 + ui/pages/login.html.tmpl | 344 +++++++++++++++++++++++------------------------ 3 files changed, 177 insertions(+), 173 deletions(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 1d49c9e..b1828f4 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -35,6 +35,7 @@ wok.main = function() { var genTabs = function(tabs) { var tabsHtml = []; $(tabs).each(function(i, tab) { + tab_i18n = i18n[tab] ? i18n[tab] : tab; var functionality = tab['functionality']; var title = tab['title']; var path = tab['path']; @@ -62,7 +63,7 @@ wok.main = function() { functionalTabHtml.push( '<li>', '<a class="item',' ',tab.toLowerCase(),'Tab','" href="#">', - tab, + tab_i18n, '</a>', '</li>' ); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 5628479..aca2449 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -24,6 +24,9 @@ #silent _ = t.gettext #silent _t = t.gettext { + "Host": "$_("Host")", + "Virtualization": "$_("Virtualization")", + "Wok": "$_("Wok")", "Settings": "$_("Settings")", "WOKAPI6005E": "$_("No such data available.")", diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..170f8fe 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -144,178 +144,178 @@ <div class="form-group"> <label for="userLocale">$_("Locale")</label> <select id="userLocale" class="selectpicker col-md-12 col-lg-12"> - <option value="af-ZA">Afrikaans (South Africa)</option> - <option value="sq-AL">Albanian (Albania)</option> - <option value="am-ET">Amharic (Ethiopia)</option> - <option value="ar-DZ">Arabic (Algeria)</option> - <option value="ar-BH">Arabic (Bahrain)</option> - <option value="ar-EG">Arabic (Egypt)</option> - <option value="ar-IQ">Arabic (Iraq)</option> - <option value="ar-JO">Arabic (Jordan)</option> - <option value="ar-KW">Arabic (Kuwait)</option> - <option value="ar-LB">Arabic (Lebanon)</option> - <option value="ar-LY">Arabic (Libya)</option> - <option value="ar-MR">Arabic (Mauritania)</option> - <option value="ar-MA">Arabic (Morocco)</option> - <option value="ar-OM">Arabic (Oman)</option> - <option value="ar-QA">Arabic (Qatar)</option> - <option value="ar-SA">Arabic (Saudi Arabia)</option> - <option value="ar-SY">Arabic (Syria)</option> - <option value="ar-TN">Arabic (Tunisia)</option> - <option value="ar-AE">Arabic (United Arab Emirates)</option> - <option value="ar-YE">Arabic (Yemen)</option> - <option value="hy-AM">Armenian (Armenia)</option> - <option value="as-IN">Assamese (India)</option> - <option value="az-AZ">Azerbaijani (Azerbaijan)</option> - <option value="eu-ES">Basque (Spain)</option> - <option value="be-BY">Belarusian (Belarus)</option> - <option value="bn-BD">Bengali (Bangladesh)</option> - <option value="bn-IN">Bengali (India)</option> - <option value="bs-BA">Bosnian (Bosnia)</option> - <option value="bg-BG">Bulgarian (Bulgaria)</option> - <option value="my-MM">Burmese (Myanmar)</option> - <option value="ca-ES">Catalan (Spain)</option> - <option value="zh-CN">Chinese-simplified (China)</option> - <option value="zh-SG">Chinese-simplified (Singapore)</option> - <option value="zh-HK">Chinese-traditional (Hong Kong S.A.R. of China)</option> - <option value="zh-MO">Chinese-traditional (Macao)</option> - <option value="zh-TW">Chinese-traditional (Taiwan)</option> - <option value="hr-HR">Croatian (Croatia)</option> - <option value="cs-CZ">Czech (Czech Republic)</option> - <option value="da-DK">Danish (Denmark)</option> - <option value="nl-BE">Dutch (Belgium)</option> - <option value="nl-NL">Dutch (The Netherlands)</option> - <option value="en-AU">English (Australia)</option> - <option value="en-BE">English (Belgium)</option> - <option value="en-CM">English (Cameroon)</option> - <option value="en-CA">English (Canada)</option> - <option value="en-GH">English (Ghana)</option> - <option value="en-HK">English (Hong Kong S.A.R. of China)</option> - <option value="en-IN">English (India)</option> - <option value="en-IE">English (Ireland)</option> - <option value="en-KE">English (Kenya)</option> - <option value="en-MU">English (Mauritius)</option> - <option value="en-NZ">English (New Zealand)</option> - <option value="en-NG">English (Nigeria)</option> - <option value="en-PH">English (Philippines)</option> - <option value="en-SG">English (Singapore)</option> - <option value="en-ZA">English (South Africa)</option> - <option value="en-TZ">English (Tanzania)</option> - <option value="en-GB">English (United Kingdom)</option> - <option value="en-US">English (United States)</option> - <option value="en-ZM">English (Zambia)</option> - <option value="et-EE">Estonian (Estonia)</option> - <option value="tl-PH">Filipino (Philippines)</option> - <option value="fi-FI">Finnish (Finland)</option> - <option value="fr-DZ">French (Algeria)</option> - <option value="fr-CM">French (Cameroon)</option> - <option value="fr-CD">French (Democratic Republic of the Congo)</option> - <option value="fr-BE">French (Belgium)</option> - <option value="fr-CA">French (Canada)</option> - <option value="fr-FR">French (France)</option> - <option value="fr-CI">French (Ivory Coast [Côte d’Ivoire])</option> - <option value="fr-LU">French (Luxembourg)</option> - <option value="fr-MR">French (Mauritania)</option> - <option value="fr-MU">French (Mauritius)</option> - <option value="fr-MA">French (Morocco)</option> - <option value="fr-SN">French (Senegal)</option> - <option value="fr-CH">French (Switzerland)</option> - <option value="fr-TN">French (Tunisia)</option> - <option value="gl-ES">Galician (Spain)</option> - <option value="lg-UG">Ganda (Uganda)</option> - <option value="ka-GE">Georgian (Georgia)</option> - <option value="de-AT">German (Austria)</option> - <option value="de-DE">German (Germany)</option> - <option value="de-LU">German (Luxembourg)</option> - <option value="de-CH">German (Switzerland)</option> - <option value="el-GR">Greek (Greece)</option> - <option value="gu-IN">Gujarati (India)</option> - <option value="ha-NG">Hausa (Nigeria)</option> - <option value="he-IL">Hebrew (Israel)</option> - <option value="hi-IN">Hindi (India)</option> - <option value="hu-HU">Hungarian (Hungary)</option> - <option value="is-IS">Icelandic (Iceland)</option> - <option value="ig-NG">Igbo (Nigeria)</option> - <option value="id-ID">Indonesian (Indonesia)</option> - <option value="it-IT">Italian (Italy)</option> - <option value="it-CH">Italian (Switzerland)</option> - <option value="ja-JP">Japanese (Japan)</option> - <option value="kn-IN">Kannada (India)</option> - <option value="kk-KZ">Kazakh (Kazakhstan)</option> - <option value="km-KH">Khmer (Cambodia)</option> - <option value="rw-RW">Kinyarwanda (Rwanda)</option> - <option value="kok-IN">Konkani (India)</option> - <option value="ko-KR">Korean (Korea, South)</option> - <option value="lo-LA">Lao (Laos)</option> - <option value="lv-LV">Latvian (Latvia)</option> - <option value="lt-LT">Lithuanian (Lithuania)</option> - <option value="mk-MK">Macedonian (Macedonia)</option> - <option value="ms-MY">Malay-Latin (Malaysia)</option> - <option value="ml-IN">Malayalam (India)</option> - <option value="mt-MT">Maltese (Malta)</option> - <option value="mr-IN">Marathi (India)</option> - <option value="mn-Cyrl-MN">Mongolian-Cyrillic (Mongolia)</option> - <option value="ne-IN">Nepali (India)</option> - <option value="ne-NP">Nepali (Nepal)</option> - <option value="nb-NO">Norwegian Bokmål (Norway)</option> - <option value="nn-NO">Norwegian Nynorsk (Norway)</option> - <option value="or-IN">Oriya [aka, Odia] (India)</option> - <option value="om-ET">Oromo (Ethiopia)</option> - <option value="pl-PL">Polish (Poland)</option> - <option value="pt-AO">Portuguese (Angola)</option> - <option value="pt-BR">Portuguese (Brazil)</option> - <option value="pt-MO">Portuguese (Macao)</option> - <option value="pt-MZ">Portuguese (Mozambique)</option> - <option value="pt-PT">Portuguese (Portugal)</option> - <option value="pa-IN">Punjabi (India)</option> - <option value="ro-RO">Romanian (Romania)</option> - <option value="ru-RU">Russian (Russia)</option> - <option value="sr-RS">Serbian-Cyrillic (Serbia)</option> - <option value="sr-ME">Serbian-Latin (Montenegro)</option> - <option value="sr-Latn-RS">Serbian-Latin (Serbia)</option> - <option value="si-LK">Sinhala (Sri Lanka)</option> - <option value="sk-SK">Slovak (Slovakia)</option> - <option value="sl-SI">Slovenian (Slovenia)</option> - <option value="es-AR">Spanish (Argentina)</option> - <option value="es-BO">Spanish (Bolivia)</option> - <option value="es-CL">Spanish (Chile)</option> - <option value="es-CO">Spanish (Colombia)</option> - <option value="es-CR">Spanish (Costa Rica)</option> - <option value="es-DO">Spanish (Dominican Republic)</option> - <option value="es-EC">Spanish (Ecuador)</option> - <option value="es-SV">Spanish (El Salvador)</option> - <option value="es-GT">Spanish (Guatemala)</option> - <option value="es-HN">Spanish (Honduras)</option> - <option value="es-MX">Spanish (Mexico)</option> - <option value="es-NI">Spanish (Nicaragua)</option> - <option value="es-PA">Spanish (Panama)</option> - <option value="es-PY">Spanish (Paraguay)</option> - <option value="es-PE">Spanish (Peru)</option> - <option value="es-PR">Spanish (Puerto Rico)</option> - <option value="es-ES">Spanish (Spain)</option> - <option value="es-US">Spanish (United States)</option> - <option value="es-UY">Spanish (Uruguay)</option> - <option value="es-VE">Spanish (Venezuela)</option> - <option value="sw-KE">Swahili (Kenya)</option> - <option value="sw-TZ">Swahili (Tanzania)</option> - <option value="sv-SE">Swedish (Sweden)</option> - <option value="ta-IN">Tamil (India)</option> - <option value="te-IN">Telugu (India)</option> - <option value="th-TH">Thai (Thailand)</option> - <option value="tr-TR">Turkish (Turkey)</option> - <option value="uk-UA">Ukrainian (Ukraine)</option> - <option value="ur-IN">Urdu (India)</option> - <option value="ur-PK">Urdu (Pakistan)</option> - <option value="uz-Cyrl-UZ">Uzbek-Cyrillic (Uzbekistan)</option> - <option value="uz-Latn-UZ">Uzbek-Latin (Uzbekistan)</option> - <option value="vi-VN">Vietnamese (Vietnam)</option> - <option value="cy-GB">Welsh (United Kingdom)</option> - <option value="yo-NG">Yoruba (Nigeria)</option> - <option value="zu-ZA">Zulu (South Africa)</option> - <option value="az-AZ">Azerbaijani-Latin (Azerbaijan)</option> - <option value="sr-CS">Serbian-Cyrillic ()</option> - <option value="sr-Cyrl-CS">Serbian-Cyrillic (Serbia and Montenegro)</option> - <option value="sr-Latn-CS">Serbian-Latin (Serbia and Montenegro)</option> + <option value="af-ZA">$_("Afrikaans (South Africa)")</option> + <option value="sq-AL">$_("Albanian (Albania)")</option> + <option value="am-ET">$_("Amharic (Ethiopia)")</option> + <option value="ar-DZ">$_("Arabic (Algeria)")</option> + <option value="ar-BH">$_("Arabic (Bahrain)")</option> + <option value="ar-EG">$_("Arabic (Egypt)")</option> + <option value="ar-IQ">$_("Arabic (Iraq)")</option> + <option value="ar-JO">$_("Arabic (Jordan)")</option> + <option value="ar-KW">$_("Arabic (Kuwait)")</option> + <option value="ar-LB">$_("Arabic (Lebanon)")</option> + <option value="ar-LY">$_("Arabic (Libya)")</option> + <option value="ar-MR">$_("Arabic (Mauritania)")</option> + <option value="ar-MA">$_("Arabic (Morocco)")</option> + <option value="ar-OM">$_("Arabic (Oman)")</option> + <option value="ar-QA">$_("Arabic (Qatar)")</option> + <option value="ar-SA">$_("Arabic (Saudi Arabia)")</option> + <option value="ar-SY">$_("Arabic (Syria)")</option> + <option value="ar-TN">$_("Arabic (Tunisia)")</option> + <option value="ar-AE">$_("Arabic (United Arab Emirates)")</option> + <option value="ar-YE">$_("Arabic (Yemen)")</option> + <option value="hy-AM">$_("Armenian (Armenia)")</option> + <option value="as-IN">$_("Assamese (India)")</option> + <option value="az-AZ">$_("Azerbaijani (Azerbaijan)")</option> + <option value="eu-ES">$_("Basque (Spain)")</option> + <option value="be-BY">$_("Belarusian (Belarus)")</option> + <option value="bn-BD">$_("Bengali (Bangladesh)")</option> + <option value="bn-IN">$_("Bengali (India)")</option> + <option value="bs-BA">$_("Bosnian (Bosnia)")</option> + <option value="bg-BG">$_("Bulgarian (Bulgaria)")</option> + <option value="my-MM">$_("Burmese (Myanmar)")</option> + <option value="ca-ES">$_("Catalan (Spain)")</option> + <option value="zh-CN">$_("Chinese-simplified (China)")</option> + <option value="zh-SG">$_("Chinese-simplified (Singapore)")</option> + <option value="zh-HK">$_("Chinese-traditional (Hong Kong S.A.R. of China)")</option> + <option value="zh-MO">$_("Chinese-traditional (Macao)")</option> + <option value="zh-TW">$_("Chinese-traditional (Taiwan)")</option> + <option value="hr-HR">$_("Croatian (Croatia)")</option> + <option value="cs-CZ">$_("Czech (Czech Republic)")</option> + <option value="da-DK">$_("Danish (Denmark)")</option> + <option value="nl-BE">$_("Dutch (Belgium)")</option> + <option value="nl-NL">$_("Dutch (The Netherlands)")</option> + <option value="en-AU">$_("English (Australia)")</option> + <option value="en-BE">$_("English (Belgium)")</option> + <option value="en-CM">$_("English (Cameroon)")</option> + <option value="en-CA">$_("English (Canada)")</option> + <option value="en-GH">$_("English (Ghana)")</option> + <option value="en-HK">$_("English (Hong Kong S.A.R. of China)")</option> + <option value="en-IN">$_("English (India)")</option> + <option value="en-IE">$_("English (Ireland)")</option> + <option value="en-KE">$_("English (Kenya)")</option> + <option value="en-MU">$_("English (Mauritius)")</option> + <option value="en-NZ">$_("English (New Zealand)")</option> + <option value="en-NG">$_("English (Nigeria)")</option> + <option value="en-PH">$_("English (Philippines)")</option> + <option value="en-SG">$_("English (Singapore)")</option> + <option value="en-ZA">$_("English (South Africa)")</option> + <option value="en-TZ">$_("English (Tanzania)")</option> + <option value="en-GB">$_("English (United Kingdom)")</option> + <option value="en-US">$_("English (United States)")</option> + <option value="en-ZM">$_("English (Zambia)")</option> + <option value="et-EE">$_("Estonian (Estonia)")</option> + <option value="tl-PH">$_("Filipino (Philippines)")</option> + <option value="fi-FI">$_("Finnish (Finland)")</option> + <option value="fr-DZ">$_("French (Algeria)")</option> + <option value="fr-CM">$_("French (Cameroon)")</option> + <option value="fr-CD">$_("French (Democratic Republic of the Congo)")</option> + <option value="fr-BE">$_("French (Belgium)")</option> + <option value="fr-CA">$_("French (Canada)")</option> + <option value="fr-FR">$_("French (France)")</option> + <option value="fr-CI">$_("French (Ivory Coast [Côte d’Ivoire])")</option> + <option value="fr-LU">$_("French (Luxembourg)")</option> + <option value="fr-MR">$_("French (Mauritania)")</option> + <option value="fr-MU">$_("French (Mauritius)")</option> + <option value="fr-MA">$_("French (Morocco)")</option> + <option value="fr-SN">$_("French (Senegal)")</option> + <option value="fr-CH">$_("French (Switzerland)")</option> + <option value="fr-TN">$_("French (Tunisia)")</option> + <option value="gl-ES">$_("Galician (Spain)")</option> + <option value="lg-UG">$_("Ganda (Uganda)")</option> + <option value="ka-GE">$_("Georgian (Georgia)")</option> + <option value="de-AT">$_("German (Austria)")</option> + <option value="de-DE">$_("German (Germany)")</option> + <option value="de-LU">$_("German (Luxembourg)")</option> + <option value="de-CH">$_("German (Switzerland)")</option> + <option value="el-GR">$_("Greek (Greece)")</option> + <option value="gu-IN">$_("Gujarati (India)")</option> + <option value="ha-NG">$_("Hausa (Nigeria)")</option> + <option value="he-IL">$_("Hebrew (Israel)")</option> + <option value="hi-IN">$_("Hindi (India)")</option> + <option value="hu-HU">$_("Hungarian (Hungary)")</option> + <option value="is-IS">$_("Icelandic (Iceland)")</option> + <option value="ig-NG">$_("Igbo (Nigeria)")</option> + <option value="id-ID">$_("Indonesian (Indonesia)")</option> + <option value="it-IT">$_("Italian (Italy)")</option> + <option value="it-CH">$_("Italian (Switzerland)")</option> + <option value="ja-JP">$_("Japanese (Japan)")</option> + <option value="kn-IN">$_("Kannada (India)")</option> + <option value="kk-KZ">$_("Kazakh (Kazakhstan)")</option> + <option value="km-KH">$_("Khmer (Cambodia)")</option> + <option value="rw-RW">$_("Kinyarwanda (Rwanda)")</option> + <option value="kok-IN">$_("Konkani (India)")</option> + <option value="ko-KR">$_("Korean (Korea, South)")</option> + <option value="lo-LA">$_("Lao (Laos)")</option> + <option value="lv-LV">$_("Latvian (Latvia)")</option> + <option value="lt-LT">$_("Lithuanian (Lithuania)")</option> + <option value="mk-MK">$_("Macedonian (Macedonia)")</option> + <option value="ms-MY">$_("Malay-Latin (Malaysia)")</option> + <option value="ml-IN">$_("Malayalam (India)")</option> + <option value="mt-MT">$_("Maltese (Malta)")</option> + <option value="mr-IN">$_("Marathi (India)")</option> + <option value="mn-Cyrl-MN">$_("Mongolian-Cyrillic (Mongolia)")</option> + <option value="ne-IN">$_("Nepali (India)")</option> + <option value="ne-NP">$_("Nepali (Nepal)")</option> + <option value="nb-NO">$_("Norwegian Bokmål (Norway)")</option> + <option value="nn-NO">$_("Norwegian Nynorsk (Norway)")</option> + <option value="or-IN">$_("Oriya [aka, Odia] (India)")</option> + <option value="om-ET">$_("Oromo (Ethiopia)")</option> + <option value="pl-PL">$_("Polish (Poland)")</option> + <option value="pt-AO">$_("Portuguese (Angola)")</option> + <option value="pt-BR">$_("Portuguese (Brazil)")</option> + <option value="pt-MO">$_("Portuguese (Macao)")</option> + <option value="pt-MZ">$_("Portuguese (Mozambique)")</option> + <option value="pt-PT">$_("Portuguese (Portugal)")</option> + <option value="pa-IN">$_("Punjabi (India)")</option> + <option value="ro-RO">$_("Romanian (Romania)")</option> + <option value="ru-RU">$_("Russian (Russia)")</option> + <option value="sr-RS">$_("Serbian-Cyrillic (Serbia)")</option> + <option value="sr-ME">$_("Serbian-Latin (Montenegro)")</option> + <option value="sr-Latn-RS">$_("Serbian-Latin (Serbia)")</option> + <option value="si-LK">$_("Sinhala (Sri Lanka)")</option> + <option value="sk-SK">$_("Slovak (Slovakia)")</option> + <option value="sl-SI">$_("Slovenian (Slovenia)")</option> + <option value="es-AR">$_("Spanish (Argentina)")</option> + <option value="es-BO">$_("Spanish (Bolivia)")</option> + <option value="es-CL">$_("Spanish (Chile)")</option> + <option value="es-CO">$_("Spanish (Colombia)")</option> + <option value="es-CR">$_("Spanish (Costa Rica)")</option> + <option value="es-DO">$_("Spanish (Dominican Republic)")</option> + <option value="es-EC">$_("Spanish (Ecuador)")</option> + <option value="es-SV">$_("Spanish (El Salvador)")</option> + <option value="es-GT">$_("Spanish (Guatemala)")</option> + <option value="es-HN">$_("Spanish (Honduras)")</option> + <option value="es-MX">$_("Spanish (Mexico)")</option> + <option value="es-NI">$_("Spanish (Nicaragua)")</option> + <option value="es-PA">$_("Spanish (Panama)")</option> + <option value="es-PY">$_("Spanish (Paraguay)")</option> + <option value="es-PE">$_("Spanish (Peru)")</option> + <option value="es-PR">$_("Spanish (Puerto Rico)")</option> + <option value="es-ES">$_("Spanish (Spain)")</option> + <option value="es-US">$_("Spanish (United States)")</option> + <option value="es-UY">$_("Spanish (Uruguay)")</option> + <option value="es-VE">$_("Spanish (Venezuela)")</option> + <option value="sw-KE">$_("Swahili (Kenya)")</option> + <option value="sw-TZ">$_("Swahili (Tanzania)")</option> + <option value="sv-SE">$_("Swedish (Sweden)")</option> + <option value="ta-IN">$_("Tamil (India)")</option> + <option value="te-IN">$_("Telugu (India)")</option> + <option value="th-TH">$_("Thai (Thailand)")</option> + <option value="tr-TR">$_("Turkish (Turkey)")</option> + <option value="uk-UA">$_("Ukrainian (Ukraine)")</option> + <option value="ur-IN">$_("Urdu (India)")</option> + <option value="ur-PK">$_("Urdu (Pakistan)")</option> + <option value="uz-Cyrl-UZ">$_("Uzbek-Cyrillic (Uzbekistan)")</option> + <option value="uz-Latn-UZ">$_("Uzbek-Latin (Uzbekistan)")</option> + <option value="vi-VN">$_("Vietnamese (Vietnam)")</option> + <option value="cy-GB">$_("Welsh (United Kingdom)")</option> + <option value="yo-NG">$_("Yoruba (Nigeria)")</option> + <option value="zu-ZA">$_("Zulu (South Africa)")</option> + <option value="az-AZ">$_("Azerbaijani-Latin (Azerbaijan)")</option> + <option value="sr-CS">$_("Serbian-Cyrillic ()")</option> + <option value="sr-Cyrl-CS">$_("Serbian-Cyrillic (Serbia and Montenegro)")</option> + <option value="sr-Latn-CS">$_("Serbian-Latin (Serbia and Montenegro)")</option> </select> </div> </form> -- 2.1.0

2 1

[PATCH] [Wok] Date Calender should be as per locale selected in Advanced search of user-log
by pkulkark＠linux.vnet.ibm.com 28 Jul '16

28 Jul '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> The Calender shown when clicking on the date field in the Advanced search tab of user activity log, should be displayed as per the locale selected. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/wok.user-log.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index a46ef07..1606f47 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -166,10 +166,10 @@ wok.initUserLog = function() { }; wok.initUserLogWindow = function() { - var currentLang = wok.lang.get(); - currentLang = currentLang.substring(0, currentLang.indexOf('_')); + var currentLocale = wok.lang.get_locale(); + currentLocale = currentLocale.substring(0, currentLocale.indexOf('-')); $("#request-type").selectpicker(); - $.datepicker.setDefaults($.datepicker.regional[currentLang]); + $.datepicker.setDefaults($.datepicker.regional[currentLocale]); $("#date").datepicker({ dateFormat: 'yy-mm-dd', onSelect: function(dateText) { $('#button-search').prop('disabled',false); -- 2.1.0

2 1

[PATCH] [Kimchi] Disable vm statistics/screenshots in edit guest
by Jose Ricardo Ziviani 28 Jul '16

28 Jul '16

- When Edit Guest modal window is opened, Kimchi continues to make requests to get all VM' statistics and screenshots, that affects necessary and heavy requests like PCI queries. This commit disable those poolings when the modal window is opened and re-enable when the modal is closed. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9099f39..507ae75 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -20,6 +20,11 @@ kimchi.guest_edit_main = function() { var formTargetId; var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); + clearTimeout(kimchi.vmTimeout); + + $('#modalWindow').on('hidden.bs.modal', function() { + kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); + }); $('#guest-edit-window a[data-toggle="tab"]').on('show.bs.tab', function(tab) { tab.target; // newly activated tab -- 2.7.4

2 1

[PATCH] [Wok] Externalise request types in advanced search panel of user activity log
by pkulkark＠linux.vnet.ibm.com 28 Jul '16

28 Jul '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalises the request types in the dropdown list in the advanced search panel of user activity log. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/pages/tabs/settings-search.html.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/pages/tabs/settings-search.html.tmpl b/ui/pages/tabs/settings-search.html.tmpl index 16a98b6..0bf664f 100644 --- a/ui/pages/tabs/settings-search.html.tmpl +++ b/ui/pages/tabs/settings-search.html.tmpl @@ -42,11 +42,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <div class="form-group"> <label for="request-type">$_("Request")</label> <select class="form-control selectpicker" id="request-type" title="$_('Request Type')" name="req"> - <option value="">All Requests</option> - <option value="POST">POST</option> - <option value="GET">GET</option> - <option value="PUT">PUT</option> - <option value="DELETE">DELETE</option> + <option value="">$_("All Requests")</option> + <option value="POST">$_("POST")</option> + <option value="GET">$_("GET")</option> + <option value="PUT">$_("PUT")</option> + <option value="DELETE">$_("DELETE")</option> </select> </div> <div class="row clearfix"> -- 2.1.0

2 1

[PATCH] [Kimchi] Issue #968: Kimchi is searching for 'undefined' VM
by sguimaraes943＠gmail.com 27 Jul '16

27 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit also fixes an issue with an undefined variable with wok.substitute() when quickly switching from Guests to Templates tab. Samuel Guimarães (1): Issue #968: Kimchi is searching for 'undefined' VM ui/js/src/kimchi.guest_main.js | 919 +++++++++++++++++++------------------- ui/js/src/kimchi.template_main.js | 4 +- 2 files changed, 463 insertions(+), 460 deletions(-) -- 1.9.3

4 6

[PATCH v4][Kimchi 0/6] Make Kimchi able to change guest's boot order
by Ramon Medeiros 27 Jul '16

27 Jul '16

Changes: v4: Add bootorder to REST GET Add tests for REST API v3: Update test on test_model to keep working v2: Do not manipulate xml on model Improve parameters checking at API.json Increase test cases Ramon Medeiros (6): Add function get_bootorder_node Create method to change bootorder of a guest Update documentation about bootorder on vm update Update REST API Add function to retrieve bootorder on vm lookup Add test to check bootorder API.json | 23 +++++++++++++++++++++++ docs/API.md | 2 ++ i18n.py | 1 + model/vms.py | 32 ++++++++++++++++++++++++++++++-- tests/test_mockmodel.py | 2 +- tests/test_model.py | 15 ++++++++++++++- tests/test_rest.py | 11 +++++++++++ xmlutils/bootorder.py | 19 +++++++++++++------ 8 files changed, 95 insertions(+), 10 deletions(-) -- 2.5.5

2 7

[PATCH v4] [Kimchi 00/10] Virt-Viewer launcher backend
by dhbarboza82＠gmail.com 27 Jul '16

27 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v4: - changed NotFoundError to InvalidOperation in check_if_vm_running (patch 4/10) - added mockmodel and test_rest changes (patch 10/10) v3: - fixed 'virviewerfiles' dir to 'virtviewerfiles' in Makefile.am v2: - fixed typo and capital letters in i18n.py - fixed 'double dict' error in virtviewer module - added tests with virtual machine containing utf-8 characters This patch set adds the Virt-Viewer launcher backend to Kimchi. This feature consists of a new resource located in: **URI:** /plugins/kimchi/vms/*:name*/snapshots/current that retrieves a download link to a .vv file to be used by a Virt-Viewer compatible desktop app to connect to the remote virtual machine. This backend takes cares of handling firewall rules to allow the connection to be succesfull. Note that no firewall port will be opened unless a download is made - if the user decides to use noVNC or spice-html5 instead Kimchi will not touch the host firewall. Example: [danielhb@arthas kimchi]$ curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/plugins/kimchi/vms/OpenSUSE-Leap-42.1/virtviewerfile" Enter host password for user 'root': [virt-viewer] type=vnc host=localhost port=5904 After this call, port 5904 was opened in the host to allow for a virt-viewer connection. When shutting down the virtual machine or WoK, a cleanup is made to close any ports left opened. Daniel Henrique Barboza (10): Virt-Viewer launcher: docs and i18n changes Virt-Viewer launcher: Makefile and config changes Virt-Viewer launcher: control/vms.py and model/vms.py changes Virt-Viewer launcher: virtviewerfile module Virt-Viewer launcher: test changes Virt-Viewer launcher: adding FirewallManager class Virt-Viewer launcher: test changes for firewall manager Virt-Viewer launcher: libvirt events to control firewall Virt-Viewer launcher: changes after adding libvirt event listening Virt-Viewer launcher: mockmodel changes Makefile.am | 2 + config.py.in | 10 ++- control/vms.py | 12 +++ docs/API.md | 6 ++ i18n.py | 2 + mockmodel.py | 23 +++++ model/virtviewerfile.py | 234 ++++++++++++++++++++++++++++++++++++++++++++++++ model/vms.py | 9 +- tests/test_config.py.in | 6 ++ tests/test_model.py | 228 +++++++++++++++++++++++++++++++++++++++++++++- tests/test_rest.py | 12 +++ 11 files changed, 538 insertions(+), 6 deletions(-) create mode 100644 model/virtviewerfile.py -- 2.5.5

3 12

[PATCH] [Kimchi] Kimchi kills Wokd due to sys.exit() calls in files networks.py and storagepools.py
by bianca＠linux.vnet.ibm.com 26 Jul '16

26 Jul '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Removed all sys.exit(1) calls from both files to avoid killing Wokd. Also added an Exception to not load kimchi plugin in case network or storagepool does not exist or is not active. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/networks.py | 16 +++++++--------- model/storagepools.py | 19 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/model/networks.py b/model/networks.py index 4b722d3..35431d4 100644 --- a/model/networks.py +++ b/model/networks.py @@ -20,7 +20,6 @@ import copy import ipaddr import libvirt -import sys import time from libvirt import VIR_INTERFACE_XML_INACTIVE @@ -59,19 +58,19 @@ class NetworksModel(object): networks = list(set(tmpl_defaults['networks'])) conn = self.conn.get() - error_msg = ("Please, check the configuration in %s/template.conf to " - "ensure it lists only valid networks." % - kimchiPaths.sysconf_dir) - for net_name in networks: + error_msg = ("Network %s does not exist or is not " + "active. Please, check the configuration in " + "%s/template.conf to ensure it lists only valid " + "networks." % (net_name, kimchiPaths.sysconf_dir)) + try: net = conn.networkLookupByName(net_name) except libvirt.libvirtError, e: msg = "Fatal: Unable to find network %s." wok_log.error(msg, net_name) - wok_log.error(error_msg) wok_log.error("Details: %s", e.message) - sys.exit(1) + raise Exception(error_msg) if net.isActive() == 0: try: @@ -79,9 +78,8 @@ class NetworksModel(object): except libvirt.libvirtError as e: msg = "Fatal: Unable to activate network %s." wok_log.error(msg, net_name) - wok_log.error(error_msg) wok_log.error("Details: %s", e.message) - sys.exit(1) + raise Exception(error_msg) def create(self, params): conn = self.conn.get() diff --git a/model/storagepools.py b/model/storagepools.py index 3f6a734..a2dbaec 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -19,7 +19,6 @@ import libvirt import lxml.etree as ET -import sys from lxml.builder import E from wok.exception import InvalidOperation, MissingParameter @@ -82,21 +81,21 @@ class StoragePoolsModel(object): if config.get('kimchi', {}).get('create_iso_pool', False): pools['ISO'] = {'path': '/var/lib/kimchi/isos'} - error_msg = ("Please, check the configuration in %s/template.conf to " - "ensure it has a valid storage pool." % - kimchiPaths.sysconf_dir) - conn = self.conn.get() for pool_name in pools: + error_msg = ("Storage pool %s does not exist or is not " + "active. Please, check the configuration in " + "%s/template.conf to ensure it lists only valid " + "networks." % (pool_name, kimchiPaths.sysconf_dir)) try: pool = conn.storagePoolLookupByName(pool_name) except libvirt.libvirtError, e: pool_path = pools[pool_name].get('path') if pool_path is None: - msg = "Fatal: Unable to find storage pool %s. " + error_msg + msg = "Fatal: Unable to find storage pool %s. " wok_log.error(msg % pool_name) wok_log.error("Details: %s", e.message) - sys.exit(1) + raise Exception(error_msg) # Try to create the pool pool = E.pool(E.name(pool_name), type='dir') @@ -106,10 +105,9 @@ class StoragePoolsModel(object): pool = conn.storagePoolDefineXML(xml, 0) except libvirt.libvirtError, e: msg = "Fatal: Unable to create storage pool %s. " - msg += error_msg wok_log.error(msg % pool_name) wok_log.error("Details: %s", e.message) - sys.exit(1) + raise Exception(error_msg) # Build and set autostart value to pool # Ignore error as the pool was already successfully created @@ -127,10 +125,9 @@ class StoragePoolsModel(object): pool.create(0) except libvirt.libvirtError, e: msg = "Fatal: Unable to craete storage pool %s. " - msg += error_msg wok_log.error(msg % pool_name) wok_log.error("Details: %s", e.message) - sys.exit(1) + raise Exception(error_msg) def get_list(self): try: -- 2.7.4

4 4

[PATCH] [Kimchi] Issue #969: Error message showing up in parent panel rather than modal window in Add Storage
by sguimaraes943＠gmail.com 26 Jul '16

26 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Samuel Guimarães (1): Issue #969: Error message showing up in parent panel rather than modal window in Add Storage ui/js/src/kimchi.storagepool_add_main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.9.3

3 3

[PATCH v2] [Kimchi] Handle libvirt events for device attachment/detachment
by Jose Ricardo Ziviani 26 Jul '16

26 Jul '16

- kimchi will only finish the device attachment/detachment after receiving the appropriate event from libvirt. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- v2: - removed functions to deregister events (unused functions) - improved the event handler - add a lock for tasks Depends on [Kimchi] Issue #956: Unable to assign pci passthrough devices through kimchi model/libvirtevents.py | 28 ++++ model/vmhostdevs.py | 382 ++++++++++++++++++++++++++++--------------------- 2 files changed, 248 insertions(+), 162 deletions(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index dfd22c6..2dd9904 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -89,3 +89,31 @@ class LibvirtEvents(object): else: reason = e.message wok_log.error("Register of ENOSPC event failed: %s" % reason) + + def registerAttachDevicesEvent(self, conn, cb, arg): + """ + register libvirt event to listen to devices attachment + """ + try: + return conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, + cb, + arg) + + except libvirt.libvirtError as e: + wok_log.error("register attach event failed: %s" % e.message) + + def registerDetachDevicesEvent(self, conn, cb, arg): + """ + register libvirt event to listen to devices detachment + """ + try: + return conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, + cb, + arg) + + except libvirt.libvirtError as e: + wok_log.error("register detach event failed: %s" % e.message) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index b57cbf0..5a63bb1 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -21,6 +21,7 @@ import glob import libvirt import os import platform +import threading from lxml import etree, objectify from lxml.builder import E, ElementMaker from operator import itemgetter @@ -47,8 +48,14 @@ class VMHostDevsModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] + self.events = kargs['eventsloop'] self.caps = CapabilitiesModel(**kargs) self.task = TaskModel(**kargs) + self._cb = None + self.events.registerAttachDevicesEvent( + self.conn, + self._event_devices, + self) def get_list(self, vmid): dom = VMModel.get_vm(vmid, self.conn) @@ -67,6 +74,17 @@ class VMHostDevsModel(object): if dev_name not in eligible_dev_names: raise InvalidParameter('KCHVMHDEV0002E', {'dev_name': dev_name}) + def _event_devices(self, conn, dom, alias, opaque): + """ + Callback to handle add/remove devices event + """ + if opaque._cb is None: + wok_log.error('opaque must be valid') + return + + wok_log.info("Device %s added successfuly" % alias) + opaque._cb('OK', True) + def create(self, vmid, params): dev_name = params['name'] self._passthrough_device_validate(dev_name) @@ -76,7 +94,8 @@ class VMHostDevsModel(object): taskid = add_task(u'/plugins/kimchi/vms/%s/hostdevs/' % VMModel.get_vm(vmid, self.conn).name(), self._attach_pci_device, self.objstore, - {'vmid': vmid, 'dev_info': dev_info}) + {'vmid': vmid, 'dev_info': dev_info, + 'lock': threading.RLock()}) return self.task.lookup(taskid) with RollbackContext() as rollback: @@ -93,7 +112,8 @@ class VMHostDevsModel(object): taskid = add_task(u'/plugins/kimchi/vms/%s/hostdevs/' % VMModel.get_vm(vmid, self.conn).name(), '_attach_%s_device' % dev_info['device_type'], - self.objstore, {'vmid': vmid, 'dev_info': dev_info}) + self.objstore, {'vmid': vmid, 'dev_info': dev_info, + 'lock': threading.RLock()}) return self.task.lookup(taskid) @@ -189,112 +209,118 @@ class VMHostDevsModel(object): def _attach_pci_device(self, cb, params): cb('Attaching PCI device') + self._cb = cb vmid = params['vmid'] dev_info = params['dev_info'] - self._validate_pci_passthrough_env() - - dom = VMModel.get_vm(vmid, self.conn) - # Due to libvirt limitation, we don't support live assigne device to - # vfio driver. - driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and - self.caps.kernel_vfio else 'kvm') - - # on powerkvm systems it must be vfio driver. - distro, _, _ = platform.linux_distribution() - if distro == 'IBM_PowerKVM': - driver = 'vfio' + lock = params['lock'] + + with lock: + self._validate_pci_passthrough_env() + + dom = VMModel.get_vm(vmid, self.conn) + # Due to libvirt limitation, we don't support live assigne device + # to vfio driver. + driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and + self.caps.kernel_vfio else 'kvm') + + # on powerkvm systems it must be vfio driver. + distro, _, _ = platform.linux_distribution() + if distro == 'IBM_PowerKVM': + driver = 'vfio' + + # Attach all PCI devices in the same IOMMU group + dev_model = DeviceModel(conn=self.conn) + devs_model = DevicesModel(conn=self.conn) + affected_names = devs_model.get_list( + _passthrough_affected_by=dev_info['name']) + passthrough_names = devs_model.get_list( + _cap='pci', _passthrough='true') + group_names = list(set(affected_names) & set(passthrough_names)) + pci_infos = [dev_model.lookup(dev_name) for dev_name in + group_names] + pci_infos.append(dev_info) + + is_multifunction = len(pci_infos) > 1 + pci_infos = sorted(pci_infos, key=itemgetter('name')) + + # does not allow hot-plug of 3D graphic cards + is_3D_device = dev_model.is_device_3D_controller(dev_info) + if is_3D_device and DOM_STATE_MAP[dom.info()[0]] != "shutoff": + raise InvalidOperation('KCHVMHDEV0006E', + {'name': dev_info['name']}) + + # all devices in the group that is going to be attached to the vm + # must be detached from the host first + with RollbackContext() as rollback: + for pci_info in pci_infos: + try: + dev = self.conn.get().nodeDeviceLookupByName( + pci_info['name']) + dev.dettach() + except Exception: + raise OperationFailed('KCHVMHDEV0005E', + {'name': pci_info['name']}) + else: + rollback.prependDefer(dev.reAttach) - # Attach all PCI devices in the same IOMMU group - dev_model = DeviceModel(conn=self.conn) - devs_model = DevicesModel(conn=self.conn) - affected_names = devs_model.get_list( - _passthrough_affected_by=dev_info['name']) - passthrough_names = devs_model.get_list( - _cap='pci', _passthrough='true') - group_names = list(set(affected_names) & set(passthrough_names)) - pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] - pci_infos.append(dev_info) - - is_multifunction = len(pci_infos) > 1 - pci_infos = sorted(pci_infos, key=itemgetter('name')) - - # does not allow hot-plug of 3D graphic cards - is_3D_device = dev_model.is_device_3D_controller(dev_info) - if is_3D_device and DOM_STATE_MAP[dom.info()[0]] != "shutoff": - raise InvalidOperation('KCHVMHDEV0006E', - {'name': dev_info['name']}) - - # all devices in the group that is going to be attached to the vm - # must be detached from the host first - with RollbackContext() as rollback: - for pci_info in pci_infos: - try: - dev = self.conn.get().nodeDeviceLookupByName( - pci_info['name']) - dev.dettach() - except Exception: - raise OperationFailed('KCHVMHDEV0005E', - {'name': pci_info['name']}) - else: - rollback.prependDefer(dev.reAttach) - - rollback.commitAll() - - device_flags = get_vm_config_flag(dom, mode='all') - - # when attaching a 3D graphic device it might be necessary to increase - # the window size memory in order to be able to attach more than one - # device to the same guest - if is_3D_device: - self.update_mmio_guest(vmid, True) - - slot = 0 - if is_multifunction: - # search for the first available slot in guest xml - slot = self._available_slot(dom) - - with RollbackContext() as rollback: - # multifunction hotplug is a special case where all functions - # must be attached together within one xml file, the same does - # not happen to multifunction coldplug - where each function is - # attached individually - if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and is_multifunction: - xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) - - try: - dom.attachDeviceFlags(xmlstr, device_flags) + rollback.commitAll() - except libvirt.libvirtError: - wok_log.error( - 'Failed to attach mutifunction device VM %s: \n%s', - vmid, xmlstr) - raise + device_flags = get_vm_config_flag(dom, mode='all') - rollback.prependDefer(dom.detachDeviceFlags, xmlstr, - device_flags) + # when attaching a 3D graphic device it might be necessary to + # increase the window size memory in order to be able to attach + # more than one device to the same guest + if is_3D_device: + self.update_mmio_guest(vmid, True) + + slot = 0 + if is_multifunction: + # search for the first available slot in guest xml + slot = self._available_slot(dom) + + with RollbackContext() as rollback: + # multifunction hotplug is a special case where all functions + # must be attached together within one xml file, the same does + # not happen to multifunction coldplug - where each function + # is attached individually + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and \ + is_multifunction: + xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) + + try: + dom.attachDeviceFlags(xmlstr, device_flags) + + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach mutifunction device VM %s: \n%s', + vmid, xmlstr) + raise + + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) + return + + for pci_info in pci_infos: + pci_info['detach_driver'] = driver + xmlstr = self._get_pci_device_xml(pci_info, + slot, + is_multifunction) + try: + dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach host device %s to VM %s: \n%s', + pci_info['name'], vmid, xmlstr) + raise + rollback.prependDefer(dom.detachDeviceFlags, + xmlstr, device_flags) rollback.commitAll() - cb('OK', True) - return - for pci_info in pci_infos: - pci_info['detach_driver'] = driver - cb('Reading source device XML') - xmlstr = self._get_pci_device_xml(pci_info, - slot, - is_multifunction) - try: - cb('Attaching device to VM') - dom.attachDeviceFlags(xmlstr, device_flags) - except libvirt.libvirtError: - wok_log.error( - 'Failed to attach host device %s to VM %s: \n%s', - pci_info['name'], vmid, xmlstr) - raise - rollback.prependDefer(dom.detachDeviceFlags, - xmlstr, device_flags) - rollback.commitAll() - - cb('OK', True) + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) def _count_3D_devices_attached(self, dom): counter = 0 @@ -403,25 +429,31 @@ class VMHostDevsModel(object): def _attach_scsi_device(self, cb, params): cb('Attaching SCSI device...') + self._cb = cb vmid = params['vmid'] dev_info = params['dev_info'] - dom = VMModel.get_vm(vmid, self.conn) + lock = params['lock'] - with RollbackContext() as rollback: - cb('Reading source device XML') - xmlstr = self._get_scsi_device_xml(dev_info) - device_flags = get_vm_config_flag(dom, mode='all') - try: - cb('Attaching device to VM') - dom.attachDeviceFlags(xmlstr, device_flags) - except libvirt.libvirtError: - wok_log.error('Failed to attach host device %s to VM %s: \n%s', - dev_info['name'], vmid, xmlstr) - raise - rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) - rollback.commitAll() + with lock: + dom = VMModel.get_vm(vmid, self.conn) + + with RollbackContext() as rollback: + xmlstr = self._get_scsi_device_xml(dev_info) + device_flags = get_vm_config_flag(dom, mode='all') + try: + cb('Attaching device to VM') + dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach host device %s to VM %s: \n%s', + dev_info['name'], vmid, xmlstr) + raise + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() - cb('OK', True) + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) def _get_usb_device_xml(self, dev_info): source = E.source( @@ -436,32 +468,43 @@ class VMHostDevsModel(object): def _attach_usb_device(self, cb, params): cb('Attaching USB device...') + self._cb = cb vmid = params['vmid'] dev_info = params['dev_info'] dom = VMModel.get_vm(vmid, self.conn) + lock = params['lock'] - with RollbackContext() as rollback: - cb('Reading source device XML') - xmlstr = self._get_usb_device_xml(dev_info) - device_flags = get_vm_config_flag(dom, mode='all') - try: - cb('Attaching device to VM') - dom.attachDeviceFlags(xmlstr, device_flags) - except libvirt.libvirtError: - wok_log.error('Failed to attach host device %s to VM %s: \n%s', - dev_info['name'], vmid, xmlstr) - raise - rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) - rollback.commitAll() + with lock: + with RollbackContext() as rollback: + xmlstr = self._get_usb_device_xml(dev_info) + device_flags = get_vm_config_flag(dom, mode='all') + try: + cb('Attaching device to VM') + dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach host device %s to VM %s: \n%s', + dev_info['name'], vmid, xmlstr) + raise + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() - cb('OK', True) + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) class VMHostDevModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] + self.events = kargs['eventsloop'] self.task = TaskModel(**kargs) + self._cb = None + self.events.registerDetachDevicesEvent( + self.conn, + self._event_devices, + self) def lookup(self, vmid, dev_name): dom = VMModel.get_vm(vmid, self.conn) @@ -502,57 +545,72 @@ class VMHostDevModel(object): task_params = {'vmid': vmid, 'dev_name': dev_name, 'dom': dom, - 'hostdev': hostdev} + 'hostdev': hostdev, + 'lock': threading.RLock()} task_uri = u'/plugins/kimchi/vms/%s/hostdevs/%s' % \ (VMModel.get_vm(vmid, self.conn).name(), dev_name) taskid = add_task(task_uri, self._detach_device, self.objstore, task_params) return self.task.lookup(taskid) + def _event_devices(self, conn, dom, alias, opaque): + """ + Callback to handle add/remove devices event + """ + if opaque._cb is None: + wok_log.error('opaque must be valid') + return + + wok_log.info("Device %s removed successfuly" % alias) + opaque._cb('OK', True) + def _detach_device(self, cb, params): cb('Detaching device') + self._cb = cb vmid = params['vmid'] dev_name = params['dev_name'] dom = params['dom'] hostdev = params['hostdev'] + lock = params['lock'] - pci_devs = [(DeviceModel.deduce_dev_name(e, self.conn), e) - for e in hostdev if e.attrib['type'] == 'pci'] + with lock: + pci_devs = [(DeviceModel.deduce_dev_name(e, self.conn), e) + for e in hostdev if e.attrib['type'] == 'pci'] - dev_model = DeviceModel(conn=self.conn) - dev_info = dev_model.lookup(dev_name) - is_3D_device = dev_model.is_device_3D_controller(dev_info) - if is_3D_device and DOM_STATE_MAP[dom.info()[0]] != "shutoff": - raise InvalidOperation('KCHVMHDEV0006E', - {'name': dev_info['name']}) - - if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): - if is_3D_device: - cb('Updating MMIO from VM...') - devsmodel = VMHostDevsModel(conn=self.conn) - devsmodel.update_mmio_guest(vmid, False) - cb('OK', True) - return + dev_model = DeviceModel(conn=self.conn) + dev_info = dev_model.lookup(dev_name) + is_3D_device = dev_model.is_device_3D_controller(dev_info) + if is_3D_device and DOM_STATE_MAP[dom.info()[0]] != "shutoff": + raise InvalidOperation('KCHVMHDEV0006E', + {'name': dev_info['name']}) - for e in hostdev: - if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: - xmlstr = etree.tostring(e) - cb('Detaching device from VM...') - dom.detachDeviceFlags( - xmlstr, get_vm_config_flag(dom, mode='all')) - if e.attrib['type'] == 'pci': - cb('Deleting affected PCI devices...') - self._delete_affected_pci_devices(dom, dev_name, pci_devs) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): if is_3D_device: - cb('Updating MMIO from VM...') devsmodel = VMHostDevsModel(conn=self.conn) devsmodel.update_mmio_guest(vmid, False) - break - else: - raise NotFoundError('KCHVMHDEV0001E', - {'vmid': vmid, 'dev_name': dev_name}) - cb('OK', True) + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) + return + + for e in hostdev: + if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: + xmlstr = etree.tostring(e) + dom.detachDeviceFlags( + xmlstr, get_vm_config_flag(dom, mode='all')) + if e.attrib['type'] == 'pci': + self._delete_affected_pci_devices(dom, dev_name, + pci_devs) + if is_3D_device: + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) + break + else: + raise NotFoundError('KCHVMHDEV0001E', + {'vmid': vmid, 'dev_name': dev_name}) + + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) def _get_devices_same_addr(self, hostdev, domain, bus, slot): devices = [] -- 2.7.4

3 3

[PATCH] [Kimchi] Send (de)attach fail messages to tasks
by Jose Ricardo Ziviani 26 Jul '16

26 Jul '16

- Today Kimchi is throwing exceptions when something wrong happens to device attachment/detachment but it also needs to notify the front-end by task callbacks, this commit implements it. --- Depends on [PATCH v2] [Kimchi] Handle libvirt events for device attachment/detachment i18n.py | 1 + model/vmhostdevs.py | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/i18n.py b/i18n.py index 08a3ac8..673390e 100644 --- a/i18n.py +++ b/i18n.py @@ -141,6 +141,7 @@ messages = { "KCHVMHDEV0004E": _('"name" should be a device name string'), "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'), "KCHVMHDEV0006E": _('Hot-(un)plug of device %(name)s is not supported.'), + "KCHVMHDEV0007E": _('Failed to attach %(device)s to %(vm)s'), "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"), "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"), diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 5a63bb1..70f0b17 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -28,6 +28,7 @@ from operator import itemgetter from wok.exception import InvalidOperation, InvalidParameter, NotFoundError from wok.exception import OperationFailed +from wok.message import WokMessage from wok.model.tasks import TaskModel from wok.rollbackcontext import RollbackContext from wok.utils import add_task, run_command, wok_log @@ -215,7 +216,12 @@ class VMHostDevsModel(object): lock = params['lock'] with lock: - self._validate_pci_passthrough_env() + try: + self._validate_pci_passthrough_env() + + except InvalidOperation as e: + cb(e.message, False) + raise dom = VMModel.get_vm(vmid, self.conn) # Due to libvirt limitation, we don't support live assigne device @@ -246,6 +252,8 @@ class VMHostDevsModel(object): # does not allow hot-plug of 3D graphic cards is_3D_device = dev_model.is_device_3D_controller(dev_info) if is_3D_device and DOM_STATE_MAP[dom.info()[0]] != "shutoff": + msg = WokMessage('KCHVMHDEV0006E', {'name': dev_info['name']}) + cb(msg.get_text(), False) raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) @@ -258,6 +266,9 @@ class VMHostDevsModel(object): pci_info['name']) dev.dettach() except Exception: + msg = WokMessage('KCHVMHDEV0005E', + {'name': pci_info['name']}) + cb(msg.get_text(), False) raise OperationFailed('KCHVMHDEV0005E', {'name': pci_info['name']}) else: @@ -291,6 +302,10 @@ class VMHostDevsModel(object): dom.attachDeviceFlags(xmlstr, device_flags) except libvirt.libvirtError: + msg = WokMessage('KCHVMHDEV0007E', + {'device': pci_info['name'], + 'vm': vmid}) + cb(msg.get_text(), False) wok_log.error( 'Failed to attach mutifunction device VM %s: \n%s', vmid, xmlstr) @@ -310,13 +325,20 @@ class VMHostDevsModel(object): is_multifunction) try: dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + msg = WokMessage('KCHVMHDEV0007E', + {'device': pci_info['name'], + 'vm': vmid}) + cb(msg.get_text(), False) wok_log.error( 'Failed to attach host device %s to VM %s: \n%s', pci_info['name'], vmid, xmlstr) raise + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) + rollback.commitAll() if DOM_STATE_MAP[dom.info()[0]] == "shutoff": @@ -443,11 +465,17 @@ class VMHostDevsModel(object): try: cb('Attaching device to VM') dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + msg = WokMessage('KCHVMHDEV0007E', + {'device': dev_info['name'], + 'vm': vmid}) + cb(msg.get_text(), False) wok_log.error( 'Failed to attach host device %s to VM %s: \n%s', dev_info['name'], vmid, xmlstr) raise + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) rollback.commitAll() @@ -481,11 +509,17 @@ class VMHostDevsModel(object): try: cb('Attaching device to VM') dom.attachDeviceFlags(xmlstr, device_flags) + except libvirt.libvirtError: + msg = WokMessage('KCHVMHDEV0007E', + {'device': dev_info['name'], + 'vm': vmid}) + cb(msg.get_text(), False) wok_log.error( 'Failed to attach host device %s to VM %s: \n%s', dev_info['name'], vmid, xmlstr) raise + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) rollback.commitAll() @@ -538,6 +572,7 @@ class VMHostDevModel(object): try: hostdev = root.devices.hostdev + except AttributeError: raise NotFoundError('KCHVMHDEV0001E', {'vmid': vmid, 'dev_name': dev_name}) @@ -606,6 +641,9 @@ class VMHostDevModel(object): devsmodel.update_mmio_guest(vmid, False) break else: + msg = WokMessage('KCHVMHDEV0001E', + {'vmid': vmid, 'dev_name': dev_name}) + cb(msg.get_text(), False) raise NotFoundError('KCHVMHDEV0001E', {'vmid': vmid, 'dev_name': dev_name}) -- 2.7.4

3 2

[PATCH v3] [Kimchi] This commit fixes an issue with PCI passthrough devices through Kimchi. It also addresses an enhancement to display success messages when some actions doesn't require the Save button and there's no UI feedback to the user (Issue #975).
by Jose Ricardo Ziviani 26 Jul '16

26 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com> Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 2 +- ui/css/kimchi.css | 5 + ui/css/src/modules/_edit-guests.scss | 4 + ui/js/src/kimchi.guest_edit_main.js | 204 +++++++++++++++++++++-------------- ui/js/src/kimchi.guest_main.js | 10 +- ui/pages/guest-edit.html.tmpl | 20 ++-- ui/pages/i18n.json.tmpl | 2 + 7 files changed, 148 insertions(+), 99 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 2130ac4..b57cbf0 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -510,7 +510,7 @@ class VMHostDevModel(object): return self.task.lookup(taskid) def _detach_device(self, cb, params): - cb('Detaching device.') + cb('Detaching device') vmid = params['vmid'] dev_name = params['dev_name'] dom = params['dom'] diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 34347c2..59d96e1 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1039,6 +1039,11 @@ body.wok-gallery { width: 22%; } +#guest-edit-window #form-guest-edit-pci .wok-mask { + top: 0 !important; + z-index: 2 !important; +} + #guest-edit-window #form-guest-edit-pci .column-actions { width: 4.47%; } diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 6196ed9..b7e6941 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -62,6 +62,10 @@ } } #form-guest-edit-pci { + .wok-mask { + top: 0 !important; + z-index: 2 !important; + } .column-actions { width: 4.47%; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index fc67d82..cabd497 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -425,16 +425,16 @@ kimchi.guest_edit_main = function() { var filterPCINodes = function(group, text) { text = text.trim().split(" "); var rows = $('.body', '#form-guest-edit-pci').find('div'); - if(text === ""){ + if (text === "") { rows.show(); return; } rows.hide(); - rows.filter(function(index, value){ + rows.filter(function(index, value) { var $span = $(this); var $itemGroup = $('button i', this); - for (var i = 0; i < text.length; ++i){ + for (var i = 0; i < text.length; ++i) { if ($span.is(":containsNC('" + text[i] + "')")) { if (group === 'all') { return true; @@ -448,87 +448,26 @@ kimchi.guest_edit_main = function() { return false; }).show(); }; - var setupPCIDevice = function() { - kimchi.getAvailableHostPCIDevices(function(hostPCIs) { - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { - setupNode(hostPCIs, 'fa-power-off'); - setupNode(vmPCIs, 'fa-ban'); - }); - }); - $('select', '#form-guest-edit-pci').change(function() { - filterPCINodes($(this).val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); - }); - $('select', '#form-guest-edit-pci').selectpicker(); - $('input#guest-edit-pci-filter', '#form-guest-edit-pci').on('keyup', function() { - filterPCINodes($('select', '#form-guest-edit-pci').val(), $(this).val()); - }); - }; - var setupNode = function(arrPCIDevices, iconClass) { + + var _generatePciDeviceHtml = function(devices, pciType) { var pciEnabled = kimchi.capabilities.kernel_vfio; - var pciDeviceName, pciDeviceProduct, pciDeviceProductDesc, pciDeviceVendor, pciDeviceVendorDesc, pciDeviceStatus; - for (var i = 0; i < arrPCIDevices.length; i++) { - pciDeviceName = arrPCIDevices[i].name; - pciDeviceProduct = arrPCIDevices[i].product; - pciDeviceVendor = arrPCIDevices[i].vendor; - pciDeviceStatus = (iconClass === 'fa-ban') ? 'enabled' : 'disabled'; - if (pciDeviceProduct !== null) { - pciDeviceProductDesc = pciDeviceProduct.description; - } - if (pciDeviceVendor !== null) { - pciDeviceVendorDesc = pciDeviceVendor.description; - } - var itemNode = $.parseHTML(wok.substitute($('#pci-tmpl').html(), { - status: pciDeviceStatus, - name: pciDeviceName, - product: pciDeviceProductDesc, - vendor: pciDeviceVendorDesc + var deviceHTml = devices.map(function(device, index) { + device.iconClass = (pciType === 'hostPCIs' ? 'fa-power-off' : (pciType === 'vmPCIs' ? 'fa-ban' : 'fa-power-off')); + device.status = (pciType === 'vmPCIs' ? 'enabled' : 'disabled'); + device.product = (device.product !== null ? device.product.description : ''); + device.vendor = (device.vendor !== null ? device.vendor.description : ''); + deviceHtml = $.parseHTML(wok.substitute($('#pci-tmpl').html(), { + status: device.status, + name: device.name, + product: device.product, + vendor: device.vendor })); - $('.body', '#form-guest-edit-pci').append(itemNode); - pciEnabled || $('button', itemNode).remove(); - $('button i', itemNode).addClass(iconClass); - if (kimchi.thisVMState === "running" && arrPCIDevices[i].vga3d) { - $('button', itemNode).prop("disabled", true); + pciEnabled || $('button', deviceHtml).remove(); + $('button > i', deviceHtml).addClass(device.iconClass); + if (kimchi.thisVMState === "running" && device.vga3d) { + $('button', deviceHtml).prop("disabled", true); } - $('button', itemNode).on('click', function(event) { - event.preventDefault(); - var obj = $(this); - var objIcon = obj.find('i'); - var id = obj.parent().parent().attr('id'); - if (objIcon.hasClass('fa-ban')) { - kimchi.removeVMPCIDevice(kimchi.selectedGuest, id, function() { - kimchi.getAvailableHostPCIDevices(function(arrPCIDevices) { - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { - for (var k = 0; k < arrPCIDevices.length; k++) { - $('#' + arrPCIDevices[k].name + '.item').removeClass('enabled').addClass('disabled'); - $('#' + arrPCIDevices[k].name + ' .action-area button i').removeClass('fa-ban').addClass('fa-power-off'); - } - for (var k = 0; k < vmPCIs.length; k++) { - $('#' + arrPCIDevices[k].name + '.item').removeClass('disabled').addClass('enabled'); - $('#' + arrPCIDevices[k].name + ' .action-area button i').removeClass('fa-power-off').addClass('fa-ban'); - } - }); - }); - //id is for the object that is being added back to the available PCI devices - filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); - }, null); - } else { - kimchi.addVMPCIDevice(kimchi.selectedGuest, { - name: id - }, function() { - kimchi.getAvailableHostPCIDevices(function(arrPCIDevices) { - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { - for (var k = 0; k < vmPCIs.length; k++) { - $('#' + vmPCIs[k].name + '.item').removeClass('disabled').addClass('enabled'); - $('#' + vmPCIs[k].name + ' .action-area button i').removeClass('fa-power-off').addClass('fa-ban'); - } - }); - }); - //id is for the object that is being removed from the available PCI devices - filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); - }, null); - } - }); - kimchi.getPCIDeviceCompanions(pciDeviceName, function(infoData) { + kimchi.getPCIDeviceCompanions(device.name, function(infoData) { var pciTitle = i18n['KCHVMED6007M'] + '\n'; var haveCompanions = false; for (var p = 0; p < infoData.length; p++) { @@ -552,8 +491,109 @@ kimchi.guest_edit_main = function() { haveCompanions && $('.vendor', '#' + infoData[q].parent).attr('title', pciTitle); } }); - } + device = deviceHtml[0].outerHTML; + $('.body', '#form-guest-edit-pci').append(device); + }); + }; + var getOngoingAttachingDevices = function(task) { + kimchi.trackTask(task.id, function(result) { + kimchi.getAvailableHostPCIDevices(function(arrPCIDevices) { + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { + for (var k = 0; k < vmPCIs.length; k++) { + $('#' + vmPCIs[k].name + '.item').removeClass('disabled').addClass('enabled'); + $('#' + vmPCIs[k].name + ' .action-area button i').removeClass('fa-power-off').addClass('fa-ban'); + } + }); + }); + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + wok.message.success(i18n['KCHVMED6010M'], '#alert-modal-container'); + filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); + }, function(result) { + if (result['message']) { + var errText = result['message']; + } else { + var errText = result['responseJSON']['reason']; + } + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); + result && wok.message.error(errText, '#alert-modal-container'); + }, function(result) { + $('#form-guest-edit-pci > .wok-mask').show(); + }); }; + var getOngoingDetachingDevices = function(task) { + kimchi.trackTask(task.id, function(result) { + kimchi.getAvailableHostPCIDevices(function(arrPCIDevices) { + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { + for (var k = 0; k < arrPCIDevices.length; k++) { + $('#' + arrPCIDevices[k].name + '.item').removeClass('enabled').addClass('disabled'); + $('#' + arrPCIDevices[k].name + ' .action-area button i').removeClass('fa-ban').addClass('fa-power-off'); + } + for (var k = 0; k < vmPCIs.length; k++) { + $('#' + arrPCIDevices[k].name + '.item').removeClass('disabled').addClass('enabled'); + $('#' + arrPCIDevices[k].name + ' .action-area button i').removeClass('fa-power-off').addClass('fa-ban'); + } + }); + }); + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + wok.message.success(i18n['KCHVMED6011M'], '#alert-modal-container'); + //id is for the object that is being added back to the available PCI devices + filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); + }, function(result) { + if (result['message']) { + var errText = result['message']; + } else { + var errText = result['responseJSON']['reason']; + } + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + filterPCINodes($('select', '#form-guest-edit-pci').val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); + result && wok.message.error(errText, '#alert-modal-container'); + }, function(result) { + $('#form-guest-edit-pci > .wok-mask').show(); + }); + }; + var pciDeviceButtonHandler = function() { + $('button', '#form-guest-edit-pci').on('click', function(event) { + event.preventDefault(); + var obj = $(this); + var objIcon = obj.find('i'); + var id = obj.parent().parent().attr('id'); + if (objIcon.hasClass('fa-ban')) { + kimchi.removeVMPCIDevice(kimchi.selectedGuest, id, function(task) { + getOngoingDetachingDevices(task); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { + name: id + }, function(task) { + getOngoingAttachingDevices(task); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + }); + } + }); + }; + + var setupPCIDevice = function() { + kimchi.getAvailableHostPCIDevices(function(hostPCIs) { + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs) { + _generatePciDeviceHtml(hostPCIs, 'hostPCIs'); + _generatePciDeviceHtml(vmPCIs, 'vmPCIs'); + pciDeviceButtonHandler(); + $('#form-guest-edit-pci > .wok-mask').fadeOut(300, function() {}); + }); + }); + $('select', '#form-guest-edit-pci').change(function() { + filterPCINodes($(this).val(), $('input#guest-edit-pci-filter', '#form-guest-edit-pci').val()); + }); + $('select', '#form-guest-edit-pci').selectpicker(); + $('input#guest-edit-pci-filter', '#form-guest-edit-pci').on('keyup', function() { + filterPCINodes($('select', '#form-guest-edit-pci').val(), $(this).val()); + }); + }; + var setupSnapshot = function() { var currentSnapshot; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 0e11aa1..605cd2d 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -315,7 +315,7 @@ kimchi.initClone = function() { kimchi.listVmsAuto = function() { - $('.wok-mask').removeClass('hidden'); + $('#guests-root-container > .wok-mask').removeClass('hidden'); //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"); @@ -431,13 +431,13 @@ kimchi.listVmsAuto = function() { }); }); } - $('.wok-mask').fadeOut(300, function() { + $('#guests-root-container > .wok-mask').fadeOut(300, function() { }); } else { $('.grid-control').addClass('hidden'); $('#guestListField').hide(); $('#noGuests').show(); - $('.wok-mask').fadeOut(300, function() {}); + $('#guests-root-container > .wok-mask').fadeOut(300, function() {}); } } @@ -446,8 +446,8 @@ kimchi.listVmsAuto = function() { function(errorResponse, textStatus, errorThrown) { if (errorResponse.responseJSON && errorResponse.responseJSON.reason) { wok.message.error(errorResponse.responseJSON.reason); - $('.wok-mask').fadeOut(300, function() { - $('.wok-mask').addClass('hidden'); + $('#guests-root-container > .wok-mask').fadeOut(300, function() { + $('#guests-root-container > .wok-mask').addClass('hidden'); }); } kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index f18d42c..a9a468e 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -160,6 +160,14 @@ </div> <div class="body"></div> </div> + <div class="wok-mask" role="presentation" class="hidden"> + <div class="wok-mask-loader-container"> + <div class="wok-mask-loading"> + <div class="wok-mask-loading-icon"></div> + <div class="wok-mask-loading-text">$_("Loading")...</div> + </div> + </div> + </div> </form> <form role="tabpanel" id="form-guest-edit-snapshot" class="guest-edit-snapshot tab-pane"> <div class="btn-group"> @@ -273,17 +281,7 @@ <label>{val}</label> </div> </script> -<script id="pci-tmpl" type="text/html"> -<div class="item {status}" id="{name}"> - <span class="cell status column-pci-status"> - <i class="fa fa-power-off"></i> - </span> - <span class="cell name column-pci-name" title="{name}">{name}</span> - <span class="cell product column-product" title="{product}">{product}</span> - <span class="cell vendor column-vendor" title="{vendor}">{vendor}</span> - <span class="cell column-actions action-area"><button class="btn btn-link"><i class="fa"></i></button></span> -</div> -</script> +<script id="pci-tmpl" type="text/html"><div class="item {status}" id="{name}"><span class="cell status column-pci-status"><i class="fa fa-power-off"></i></span><span class="cell name column-pci-name" title="{name}">{name}</span><span class="cell product column-product" title="{product}">{product}</span><span class="cell vendor column-vendor" title="{vendor}">{vendor}</span><span class="cell column-actions action-area"><button class="btn btn-link"><i class="fa"></i></button></span></div></script> <script id="snapshot-tmpl" type="text/html"> <div class="item" id="{name}"> <span class="cell column-sel"> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 4efc1ec..610debc 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -84,6 +84,8 @@ "KCHVMED6007M": "$_("Affected devices:")", "KCHVMED6008M": "$_("More")", "KCHVMED6009M": "$_("Less")", + "KCHVMED6010M": "$_("Successfully attached device to VM")", + "KCHVMED6011M": "$_("Successfully detached device from VM")", "KCHNET6001M": "$_("unavailable")", "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")", -- 2.7.4

2 1

[PATCH v2] [Kimchi] Issue #956: Unable to assign pci passthrough devices through kimchi
by sguimaraes943＠gmail.com 26 Jul '16

26 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit fixes an issue with PCI passthrough devices through Kimchi. It also addresses an enhancement to display success messages when some actions doesn't require the Save button and there's no UI feedback to the user (Issue #975). v2 - Added error callbacks for kimchi.addVMPCIDevice() and kimchi.removeVMPCIDevice() to display error messages before if starts to track ongoing tasks. Samuel Guimarães (1): Issue #956: Unable to assign pci passthrough devices through kimchi model/vmhostdevs.py | 2 +- ui/css/kimchi.css | 5 + ui/css/src/modules/_edit-guests.scss | 4 + ui/js/src/kimchi.guest_edit_main.js | 236 +++++++++++++++++++++++------------ ui/js/src/kimchi.guest_main.js | 10 +- ui/pages/guest-edit.html.tmpl | 20 ++- ui/pages/i18n.json.tmpl | 2 + 7 files changed, 180 insertions(+), 99 deletions(-) -- 1.9.3

4 10

[PATCH V3] [Wok] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 26 Jul '16

26 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set works on Fedora 23 and 24, RHEL 7.2, Ubuntu 16.04, Debian 8.5 and OpenSUSE 42.1 Just pay attention to follow current steps reported in Troubleshooting wiki page of Wok: https://github.com/kimchi-project/wok/blob/master/docs/troubleshooting.md V3: - removed unnecessary semanage command. V2: - fixed PEP8 errors V1: This patch removes the code that executes a dedicated nginx proxy, making Wok to use the system's nginx service. This is a requirement to make Wok acceptable in community repositories. It also make sure that a Wok executed from path different than installed (from a cloned and builded source code, for example) will create a symbolic link in system's nginx config dir to the running configuration file. This patch solves part of issue #25 Paulo Vital (1): Use system's nginx proxy service. src/nginx/wok.conf.in | 95 +++++++++++++++++++++------------------------------ src/wok/config.py.in | 6 +++- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 28 ++++++++------- src/wok/server.py | 6 +--- 5 files changed, 63 insertions(+), 74 deletions(-) -- 2.7.4

4 5

[PATCH V4] [Wok] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 26 Jul '16

26 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch works on Fedora 23 and 24, RHEL 7.2, Ubuntu 16.04, Debian 8.5 and OpenSUSE 42.1 It's recommended to follow the current steps reported in Troubleshooting wiki page of Wok: https://github.com/kimchi-project/wok/blob/master/docs/troubleshooting.md V4: - Use values of session timeout from configuration to set proxy timeout - remove un-necessary method to check if Wok is installed V3: - removed unnecessary semanage command. V2: - fixed PEP8 errors V1: This patch removes the code that executes a dedicated nginx proxy, making Wok to use the system's nginx service. This is a requirement to make Wok acceptable in community repositories. It also make sure that a Wok executed from path different than installed (from a cloned and builded source code, for example) will create a symbolic link in system's nginx config dir to the running configuration file. This patch solves part of issue #25 Paulo Vital (1): Use system's nginx proxy service. src/nginx/wok.conf.in | 95 +++++++++++++++++++++------------------------------ src/wok/config.py.in | 3 +- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 28 ++++++++------- src/wok/server.py | 6 +--- 5 files changed, 60 insertions(+), 74 deletions(-) -- 2.7.4

2 2

[PATCH V4] [Wok] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 26 Jul '16

26 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch works on Fedora 23 and 24, RHEL 7.2, Ubuntu 16.04, Debian 8.5 and OpenSUSE 42.1 It's recommended to follow the current steps reported in Troubleshooting wiki page of Wok: https://github.com/kimchi-project/wok/blob/master/docs/troubleshooting.md V4: - Use values of session timeout from configuration to set proxy timeout - remove un-necessary method to check if Wok is installed V3: - removed unnecessary semanage command. V2: - fixed PEP8 errors V1: This patch removes the code that executes a dedicated nginx proxy, making Wok to use the system's nginx service. This is a requirement to make Wok acceptable in community repositories. It also make sure that a Wok executed from path different than installed (from a cloned and builded source code, for example) will create a symbolic link in system's nginx config dir to the running configuration file. This patch solves part of issue #25 Paulo Vital (1): Use system's nginx proxy service. src/nginx/wok.conf.in | 95 +++++++++++++++++++++------------------------------ src/wok/config.py.in | 3 +- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 28 ++++++++------- src/wok/server.py | 6 +--- 5 files changed, 60 insertions(+), 74 deletions(-) -- 2.7.4

2 2

[RFC] Using WebSockets and Server Sent Events for handling tasks in Wok and plugins
by Samuel Henrique De Oliveira Guimaraes 26 Jul '16

26 Jul '16

Hi team, I was thinking that combining websockets with local/session storage could solve the problems that we have with asynchronous tasks but after reading this, I think it could also be used for notifications and error messages as well. Check this out: https://www.sitepoint.com/real-time-apps-websockets-server-sent-events/ I think it is already enabled for the Serial Console in Kimchi, am I right? Regards, Samuel

3 2

[PATCH] [Wok] User session alert UI
by peterpnns＠gmail.com 26 Jul '16

26 Jul '16

From: peterpennings <peterpnns(a)gmail.com> This patch get a request header parameter to trigger a counter which shows up a alert to the user when the session is getting to expire peterpennings (1): User session timeout alert (UI) ui/css/src/wok.scss | 27 ++++ ui/css/wok.css | 30 ++++ ui/js/src/wok.api.js | 23 +++ ui/js/src/wok.session.js | 67 +++++++++ ui/pages/i18n.json.tmpl | 2 + ui/pages/wok-ui.html.tmpl | 15 +- 5 files changed, 443 insertions(+), 20 deletions(-) create mode 100644 ui/js/src/wok.session.js -- 2.5.0

3 3

[PATCH v2] [Wok] Kimchi kills Wokd due to sys.exit() calls in files networks.py and storagepools.py
by bianca＠linux.vnet.ibm.com 26 Jul '16

26 Jul '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Added an Exception to not load kimchi plugin (servers.py) in case network or storagepool does not exist or is not active. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wok/server.py b/src/wok/server.py index 8a02596..04bf1bc 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -179,6 +179,7 @@ class Server(object): self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env), config=self.configObj) + self._load_plugins(options) # Terminate proxy when cherrypy server is terminated @@ -201,7 +202,7 @@ class Server(object): try: plugin_app = import_class(plugin_class)(options) - except ImportError, e: + except (ImportError, Exception), e: cherrypy.log.error_log.error( "Failed to import plugin %s, " "error: %s" % (plugin_class, e.message) -- 2.7.4

3 2

[PATCH] [Wok] Kimchi kills Wokd due to sys.exit() calls in files networks.py and storagepools.py
by bianca＠linux.vnet.ibm.com 25 Jul '16

25 Jul '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Removed all sys.exit(1) calls from both files to avoid killing Wokd. Also added an Exception to not load kimchi plugin (servers.py) in case network or storagepool does not exist or is not active. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wok/server.py b/src/wok/server.py index 8a02596..04bf1bc 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -179,6 +179,7 @@ class Server(object): self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env), config=self.configObj) + self._load_plugins(options) # Terminate proxy when cherrypy server is terminated @@ -201,7 +202,7 @@ class Server(object): try: plugin_app = import_class(plugin_class)(options) - except ImportError, e: + except (ImportError, Exception), e: cherrypy.log.error_log.error( "Failed to import plugin %s, " "error: %s" % (plugin_class, e.message) -- 2.7.4

2 1

[Wok][RFC] Manage async tasks.
by Peter Pennings 22 Jul '16

22 Jul '16

Hey guys, We want to suggest here a new discussion which can maybe turn into a new feature to improve the system. During the development of some activities involving assincronous tasks, we were thinking about a new way to manage a tasks queue and a new way to get informed about the tasks in the system. We divided the idea into two parts: *1-)* First of all, an idea to the backend take care of a tasks queue, allowing the user to trigger tasks as many as he wants. Any request involving an async task triggered by the user, will be pushed into a queue in the back-end. There will be a consumer of this queue, getting the first task to process, and the others will be set with a "Waiting" status. This "consumer" will manage the queue of tasks. One idea to implement this is using the "Publish Subscribe" Desing Pattern. Another idea is to keep the task with a "Waiting" status in the database, and the consumer consumes from this database instead of a queue (updating the status and message of the task). At the moment, we don't have a way to control this queue, when it's necessary, the frontend try to do it. The problem is when the user wants to trigger more then one task, then he can't make a logout in the system because he will lose this queue. *2-)* Develop a new tab in Wok to show the tasks in the system. We can show the tasks for each plugin separeted. For example: if the user has kimchi, ginger and gingerbase installed, this tab will contain three sections, each one with a table of tasks containg the id, status (running, waiting, failure, etc), message and target uri of each task. We can develop a filter for this tables too, allowing the user to search the tasks respecting some filters. The main idea with this suggestion, is a way to display what is happening in the system with the async tasks and allow the user to make more then one async request without waiting for the last getting finished. All of this is just a suggestion, we are open to any doubts or to discuss and improve this idea. Feel free to any suggestions or criticizes. :) Thank you. Peter Pennings

4 4

Re: [Kimchi-devel] [PATCH V2][Wok 00/12] FVT testcases wok framework
by Aline Manera 21 Jul '16

21 Jul '16

Hi Archana, First of all, thanks for contribution to this patch set. I did some comments and have some doubts that I asked in the patch set. Hopefully, we can go through that soon and make it available upstream. Also sorry about the delay to review the patches. Regards, Aline Manera On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Patch for adding FVT testcases wok framework which can be used across plugins. > The changes are: > 1) Added fvt package inside tests directory. > 2) Added config file inside fvt package to have session details. > 3) restapilib.py to have common classes/methods for REST API calls. > 4) fvt_base.py, a base test class to take care of doing > common setup and treadown required for any fvt test cases like > creating/destroying session using config file and restapilib.py. > 5) run_test.sh.in script to install all the dependencies and to run all FVT. > 6) make file changes to have 'make check-fvt' for running all the FVT. > 7) Instruction added in REDME.md for make check-fvt. > 8) Added tests/fvt/config into IBM license blacklist. > > Archana Singh (12): > FVT: Package for functional verification testcases. > FVT: Wok level config file to have 'sectionsi required for fvt common > across plugins. > FVT: Lists all dependecies for fvt testcases. > FVT: Common classes/methods for API calls as per config file > configuration. > FVT: Base test class, takes care common actions required for any FVT > test cases. > FVT: Install all the dependencies from requirements.txt and runs FVT > testcases > FVT: Makefile needed for build and run fvt. > FVT: Added fvt as subdirs and check-fvt to run fvt testcases using > make. > FVT: Added FVT Makefile path in AC_CONFIG_FILES list. > FVT: Added check-fvt to run FVT testcases using make and venv dir to > be cleaned. > FVT: Added Readme instruction for running fvt testcases. > Added tests/fvt/config file into backlist. > > IBM-license-blacklist | 1 + > Makefile.am | 6 + > configure.ac | 1 + > docs/README.md | 8 + > tests/Makefile.am | 7 + > tests/fvt/Makefile.am | 43 +++ > tests/fvt/__init__.py | 18 ++ > tests/fvt/config | 7 + > tests/fvt/fvt_base.py | 92 ++++++ > tests/fvt/requirements.txt | 23 ++ > tests/fvt/restapilib.py | 738 +++++++++++++++++++++++++++++++++++++++++++++ > tests/fvt/run_tests.sh.in | 92 ++++++ > 12 files changed, 1036 insertions(+) > create mode 100644 tests/fvt/Makefile.am > create mode 100644 tests/fvt/__init__.py > create mode 100644 tests/fvt/config > create mode 100644 tests/fvt/fvt_base.py > create mode 100644 tests/fvt/requirements.txt > create mode 100644 tests/fvt/restapilib.py > create mode 100755 tests/fvt/run_tests.sh.in >

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 10/12] FVT: Added check-fvt to run FVT testcases using make and venv dir to be cleaned.
by Aline Manera 21 Jul '16

21 Jul '16

You can join patches 7 to 10 into one single patch. It is easier to review as they modifies the same file for the same proposal. On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Added check-fvt to run FVT testcases using make and venv dir to be cleaned. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > Makefile.am | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index 325d0c9..9827e66 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -52,6 +52,7 @@ check-local: > find . -path './.git' -prune -o \ > -name '*.py' -o -name '*.py.in' | \ > xargs $(PYFLAKES) | \ > + grep -w -v "venv" | \ > while read LINE; do echo "$$LINE"; false; done \ > else \ > find . -name '*.py' -o -name '*.py.in' | \ > @@ -70,6 +71,10 @@ check-local: > /bin/bash check-IBM-license-header.sh ; \ > fi > > +check-fvt: > + tests/fvt/run_tests.sh > + rm -fr venv > + > # Link built mo files in the source tree to enable use of translations from > # within the source tree > all-local: > @@ -185,5 +190,6 @@ VERSION: > > clean-local: > rm -rf mo rpm > + rm -rf mo rpm tests/fvt/venv > > CLEANFILES = wok.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 06/12] FVT: Install all the dependencies from requirements.txt and runs FVT testcases
by Aline Manera 21 Jul '16

21 Jul '16

On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Script to run FVT test cases which also take care of > installing all > dependencies from requirements.txt. The part of installing dependencies should be done separated. Thinking about a completed CI infrastructure, it would be done by a Chef/Puppet recipe to launch a new server to run the tests. > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/run_tests.sh.in | 92 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 92 insertions(+) > create mode 100755 tests/fvt/run_tests.sh.in > > diff --git a/tests/fvt/run_tests.sh.in b/tests/fvt/run_tests.sh.in > new file mode 100755 > index 0000000..ee31b95 > --- /dev/null > +++ b/tests/fvt/run_tests.sh.in > @@ -0,0 +1,92 @@ > +#!/bin/bash > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301USA > + > +mkdir -p venv > + > +HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ > +PYTHON_VER=@PYTHON_VERSION@ > + > +# Verify if the required commands exists on the system > +command -v virtualenv >/dev/null 2>&1 || { echo >&2 "virtualenv must be installed for your distribution. Aborting."; exit 1; } > +command -v pip >/dev/null 2>&1 || { echo >&2 "pip must be installed for your distribution. Aborting."; exit 1; } > + > +# Get absolute path of this script > +pushd `dirname $0` > /dev/null > +SCRIPTPATH=`pwd -P` > +reqfile=$SCRIPTPATH'/requirements.txt' > + > +# Start the virtual environment > +virtualenv venv --no-site-packages > + > + > +# Actiate the virtual environment > +source venv/bin/activate > + > +while read line; do > + > + case "$line" in > + \#*) > + continue ;; # skip comments > + "") > + continue ;; # skip empty lines > + *) > + venv/bin/python$PYTHON_VER -c "import $line" > /dev/null 2>&1 > + status=$? > + if [ $status -ne 0 ]; then > + pip install -r $reqfile # Install the required modules to run tests > + break > + fi > + esac > +done < $reqfile > + > +# Execute the test suite > +#python registered_tests.py > +#nosetests --with-html --html-file=test_report.html registered_tests.py > + > +if [ "$1" = "-v" ]; then > + OPTS="-v" > + shift > +else > + OPTS="" > +fi > + > +if [ $# -ne 0 ]; then > + ARGS="$@" > +else > + ARGS=`find -name "fvt_*.py" | xargs -I @ basename @ .py` > +fi > + > +if [ "$HAVE_UNITTEST" != "yes" -o "$PYTHON_VER" == "2.6" ]; then > + CMD="unit2" > +else > + CMD="python -m unittest" > +fi > + > +LIST=($ARGS) > +FVT_LIST=() > +for ((i=0;i<${#LIST[@]};i++)); do > + FVT_LIST+=(${LIST[$i]}) > +done > +PYTHONPATH=../ $CMD $OPTS ${FVT_LIST[@]} > + > +# Deativate the virtual environment > +deactivate > + > +rm -fr venv

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 05/12] FVT: Base test class, takes care common actions required for any FVT test cases.
by Aline Manera 21 Jul '16

21 Jul '16

On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Common action methods like creating/destoring session, > authorization using wok level fvt config file, > creating JSON validator and logging. I'd like to understand better what you are calling 'session'. Wok works with an internal user session on backend. Why do we need a different one to do the tests? > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/fvt_base.py | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 92 insertions(+) > create mode 100644 tests/fvt/fvt_base.py > > diff --git a/tests/fvt/fvt_base.py b/tests/fvt/fvt_base.py > new file mode 100644 > index 0000000..8d152a5 > --- /dev/null > +++ b/tests/fvt/fvt_base.py > @@ -0,0 +1,92 @@ > +#!/usr/bin/python > +# -*- coding: utf-8 -*- > +# The same I commented before about that coding macro. It is only needed when you have non-ASCII characters in the code source file. And it seems to not be the case. So you can safely remove it. > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301USA > + > +import unittest > +import os > +from restapilib import APISession, APIError, APIRequestError > +from restapilib import Validator > + The import section must be in alphabetic order. > +DEFAULT_CONF = os.path.dirname(os.path.abspath(__file__)) + 'config' > + > + > +class TestBase(unittest.TestCase): > + """Represents an API session setup with the host Web Services API""" > + > + session = None > + > + def __init__(self, method='runTest'): > + """init with default method as runTest""" > + super(TestBase, self).__init__(method) > + > + @classmethod > + def setUpClass(cls): > + """ > + Hook method for setting up class fixture > + before running tests in the class. > + Create session and set auth to the session > + """ > + print '--> TestBase.setUpClass(): Create session ' > + cls.session = APISession() > + # Log on to the API. An exception will be raised if this fails. > + cls.logging = cls.session.logging > + cls.logging.debug('--> TestBase.setUpClass()') > + cls.validator = Validator(cls.logging) > + cls.logging.debug('TestBase.setUpClass(): Setting auth to session') > + try: > + cls.session.auth() > + cls.logging.debug('TestBase.setUpClass(): Auth details set to ' > + 'session and base URI created as %s' > + % cls.session._base_uri) > + except APIError, err: > + print 'ERROR %s' % err > + print err.__str__() > + if cls.session is not None: > + cls.logging.error('TestBase.setUpClass(): Ending session' > + ' as API error happened') > + cls.session.end_session() > + finally: > + cls.logging.debug('<-- TestBase.setUpClass()') > + > + def setUp(self): > + """Hook method for setting up the test fixture before exercising it.""" > + pass > + > + def tearDown(self): > + """Hook method for deconstructing the test fixture after testing it.""" > + pass > + > + @classmethod > + def tearDownClass(cls): > + """ > + Hook method for deconstructing the class > + fixture after running all tests in the class. > + """ > + if cls.session is not None: > + print 'TestBase.tearDownClass(): Ending session' > + cls.session.end_session() > + > + def get(self): > + try: > + resp_net = self.session.request_get_json('/') > + print resp_net > + except APIRequestError as err: > + print 'ERROR %s' % err > + print err.__str__()

1 0

[PATCH] [Kimchi] Issue #956: Unable to assign pci passthrough devices through kimchi
by sguimaraes943＠gmail.com 21 Jul '16

21 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit fixes an issue with PCI passthrough devices through Kimchi. It also addresses an enhancement to display success messages when some actions doesn't require the Save button and there's no UI feedback to the user (Issue #975). Samuel Guimarães (1): Issue #956: Unable to assign pci passthrough devices through kimchi model/vmhostdevs.py | 2 +- ui/css/kimchi.css | 5 + ui/css/src/modules/_edit-guests.scss | 4 + ui/js/src/kimchi.guest_edit_main.js | 232 ++++++++++++++++++++++------------- ui/js/src/kimchi.guest_main.js | 10 +- ui/pages/guest-edit.html.tmpl | 20 ++- ui/pages/i18n.json.tmpl | 2 + 7 files changed, 176 insertions(+), 99 deletions(-) -- 1.9.3

4 6

[PATCH] [Kimchi] Added cursor for tasks in progress
by sguimaraes943＠gmail.com 21 Jul '16

21 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates kimchi.trackTask() progress callback to add a css class and change mouse cursor to "progress" instead of the default mouse pointer. It requires a patch sent to Wok. Samuel Guimarães (1): Added cursor for tasks in progress ui/js/src/kimchi.api.js | 4 ++++ 1 file changed, 4 insertions(+) -- 1.9.3

3 4

[PATCH v2][Kimchi 0/2] Issue #467: Feature: Show boot menu for a guest
by Ramon Medeiros 21 Jul '16

21 Jul '16

Changes: v2: fix import order Ramon Medeiros (2): Issue #467: Feature: Show boot menu for a guest Add test to verify bootmenu and update old tests API.json | 5 +++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 30 +++++++++++++++++++++--------- tests/test_mockmodel.py | 2 +- tests/test_model.py | 8 +++++++- xmlutils/bootorder.py | 4 ++++ 7 files changed, 40 insertions(+), 11 deletions(-) -- 2.5.5

2 3

Changing the way federation feature (peers) is exposed to user
by Aline Manera 21 Jul '16

21 Jul '16

Hi all, Kimchi provides an feature called federation to discover other Wok servers running in the same network. This feature is not enabled by default. To enable it, the user needs to follow the instructions in https://github.com/kimchi-project/kimchi/blob/master/docs/README-federation… The problem is: this feature is exposed by the user as a drop down menu with a list of servers found. But it is displayed in the top header, ie, on Wok header. That way, we have some code on Wok related to a Kimchi feature. To fix it, we should change the way we expose that feature on UI moving it as a content tab. As it is not strictly related to virtualization I don't see it fits in any current Kimchi tabs and I don't think it justifies a new tab. But from the other hand, there is a plan to integrate the federation feature with guest migration, so user don't need to input the server details to do the migration - he/she only needs to select one from the list. Said that, the federation feature is still required for Kimchi. So I have 3 proposals: 1. Move federation feature to WOK The peers will continue to be displayed as part of the top header but all code (backend/API) will be moved to Wok. 2. Move federation feature to Ginger Base The Dashboard tab will display a new section with the peers information when federation is enabled. 3. Keep federation feature on Kimchi and make Kimchi extend the Ginger Base UI (the same way Ginger s390x does with Ginger tabs) The Dashboard tab will be extended by Kimchi to display a new section with the peers information when federation is enabled. *I prefer the option 3* as it solves the original issue (having UI code related to a Kimchi feature on Wok) and do not affect any other plugin or Wok behavior. Once we get an agreement on it, I will proper involve Ginger community if needed. What are you thoughts on it? Regards, Aline Manera

5 11

[PATCH v3][Kimchi 0/6] Make Kimchi able to change guest's boot order
by Ramon Medeiros 21 Jul '16

21 Jul '16

Changes: v3: Update test on test_model to keep working v2: Do not manipulate xml on model Improve parameters checking at API.json Increase test cases Ramon Medeiros (6): Add function get_bootorder_node Create method to change bootorder of a guest Update documentation about bootorder on vm update Update REST API Add function to retrieve bootorder on vm lookup Add test to check bootorder API.json | 23 +++++++++++++++++++++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 32 ++++++++++++++++++++++++++++++-- tests/test_mockmodel.py | 2 +- tests/test_model.py | 15 ++++++++++++++- xmlutils/bootorder.py | 19 +++++++++++++------ 7 files changed, 83 insertions(+), 10 deletions(-) -- 2.5.5

3 9

[PATCH v3] [Kimchi 0/9] Virt-Viewer launcher backend
by dhbarboza82＠gmail.com 21 Jul '16

21 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - fixed 'virviewerfiles' dir to 'virtviewerfiles' in Makefile.am v2: - fixed typo and capital letters in i18n.py - fixed 'double dict' error in virtviewer module - added tests with virtual machine containing utf-8 characters This patch set adds the Virt-Viewer launcher backend to Kimchi. This feature consists of a new resource located in: **URI:** /plugins/kimchi/vms/*:name*/snapshots/current that retrieves a download link to a .vv file to be used by a Virt-Viewer compatible desktop app to connect to the remote virtual machine. This backend takes cares of handling firewall rules to allow the connection to be succesfull. Note that no firewall port will be opened unless a download is made - if the user decides to use noVNC or spice-html5 instead Kimchi will not touch the host firewall. Example: [danielhb@arthas kimchi]$ curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/plugins/kimchi/vms/OpenSUSE-Leap-42.1/virtviewerfile" Enter host password for user 'root': [virt-viewer] type=vnc host=localhost port=5904 After this call, port 5904 was opened in the host to allow for a virt-viewer connection. When shutting down the virtual machine or WoK, a cleanup is made to close any ports left opened. Daniel Henrique Barboza (9): Virt-Viewer launcher: docs and i18n changes Virt-Viewer launcher: Makefile and config changes Virt-Viewer launcher: control/vms.py and model/vms.py changes Virt-Viewer launcher: virtviewerfile module Virt-Viewer launcher: test changes Virt-Viewer launcher: adding FirewallManager class Virt-Viewer launcher: test changes for firewall manager Virt-Viewer launcher: libvirt events to control firewall Virt-Viewer launcher: changes after adding libvirt event listening Makefile.am | 2 + config.py.in | 10 ++- control/vms.py | 12 +++ docs/API.md | 6 ++ i18n.py | 2 + model/virtviewerfile.py | 234 ++++++++++++++++++++++++++++++++++++++++++++++++ model/vms.py | 9 +- tests/test_config.py.in | 6 ++ tests/test_model.py | 228 +++++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 503 insertions(+), 6 deletions(-) create mode 100644 model/virtviewerfile.py -- 2.5.5

3 13

[RFC] Feature: Show boot menu for a guest #467
by Ramon Medeiros 21 Jul '16

21 Jul '16

Propose: Add bootmenu at guest startup Questions about it: Add bootmenu by default on guest creation, or, create a entry at REST API to enable/disable it, and also change the timeout? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 2

[PATCH] [Wok] Fixes loading message position inside panel-groups
by sguimaraes943＠gmail.com 21 Jul '16

21 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes a minor issue with the "Loading..." backdrop mask covering panel titles in Ginger Samuel Guimarães (1): Fixes loading message position inside panel-groups ui/css/src/wok.scss | 4 ++++ ui/css/wok.css | 4 ++++ 2 files changed, 8 insertions(+) -- 1.9.3

4 4

[PATCHv3] [Kimchi] Add UI netboot support for adding templates; add loading icon when switching back to image src
by Socorro Stoppler 21 Jul '16

21 Jul '16

v3: Addressed the issue pointed out by Aline regarding the loading icon not going away even after the list of isos have finished loading when switching to the image template radio button. Also fixed the double scrollbars in the panel that Samuel pointed out. v2: Add loading icon when switching back to image src radio button per feedback from pvital v1: Add UI netboot support for adding templates Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 5 +++ ui/css/src/modules/_templates.scss | 4 ++ ui/js/src/kimchi.template_add_main.js | 78 +++++++++++++++++++++++++++++++---- ui/pages/template-add.html.tmpl | 45 +++++++++++++------- 4 files changed, 107 insertions(+), 25 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 261d203..34347c2 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1730,6 +1730,11 @@ body.wok-gallery { display: none; } +#template-add-window #loading-isos { + top: 0 !important; + z-index: 4 !important; +} + /* VM List View classes*/ #templates-root-container .grid-control input[type="text"] { height: 38px; diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index 2f58385..d8f3da8 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -270,6 +270,10 @@ .tooltip-arrow { display: none; } + #loading-isos { + top: 0 !important; + z-index: 4 !important; + } } diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 7bdfc51..341bab3 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -17,7 +17,8 @@ */ kimchi.template_add_main = function() { "use strict"; - $('#loading-isos').removeClass('hidden'); + var currentPage = 'iso-local-box'; + $('#loading-isos').fadeIn(100, function() {}); kimchi.deepScanHandler = null; var isos = []; var local_isos = []; @@ -54,6 +55,7 @@ kimchi.template_add_main = function() { $('#local-iso-field').hide(); $('#select-all-local-iso').prop('checked', false); $('#btn-template-local-iso-create').attr('disabled', 'disabled'); + $('#btn-template-netboot-create').attr('disabled', 'disabled'); $('#iso-search').hide(); $('#iso-more').hide(); $('#iso-search-loading').hide(); @@ -65,6 +67,7 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); // 4 - Remote folder path text $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'inline-block'); // 1 - Folder path $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -107,6 +110,7 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'inline-block'); $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -125,6 +129,7 @@ kimchi.template_add_main = function() { } else { $('#btn-template-file-create').attr('disabled', 'disabled'); } + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot }); initLocalIsoField(); @@ -144,9 +149,7 @@ kimchi.template_add_main = function() { }); }, function(err) { wok.message.error(err.responseJSON.reason, '#local-iso-error-container'); - $('#loading-isos').fadeOut(300, function() { - $('#loading-isos').addClass('hidden'); - }); + $('#loading-isos').fadeOut(300, function() {}); }); $('#template-add-window .modal-body .template-pager').animate({ @@ -232,12 +235,11 @@ kimchi.template_add_main = function() { $('#iso-file').parent().removeClass('has-error'); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path - $('#btn-template-local-iso-create').removeAttr('disabled').css('display', 'inline-block'); // 2 - Selected ISOs - } else { $('#btn-template-local-iso-create').attr('disabled', 'disabled'); } + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot }); $('#list-local-iso').on('click', '[type="checkbox"]', function() { @@ -248,6 +250,7 @@ kimchi.template_add_main = function() { $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'inline-block'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot if (checkedLength) { $('#btn-template-local-iso-create').removeAttr('disabled'); @@ -260,6 +263,16 @@ kimchi.template_add_main = function() { } }); + $('#btn-template-netboot-create').click(function() { + var data = { + "source_media": {"type": "netboot"} + }; + addTemplate(data, function() { + $('#btn-template-netboot-create').text(i18n['KCHAPI6005M']); + $('#btn-template-netboot-create').prop('disabled', false); + }); + }); + $('#btn-template-local-iso-create').click(function() { $('input', '#iso-file-box').prop('disabled', true); $('#btn-template-local-iso-create').text(i18n['KCHAPI6008M']); @@ -309,11 +322,9 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path - $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs - + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes - $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -350,6 +361,55 @@ kimchi.template_add_main = function() { $('input#iso-url').parent().toggleClass('has-error', !isValid); }, 0); }); + + $('#image-src').change(function() { + if (this.checked) { + if (currentPage === 'netboot-path') { + kimchi.switchPage(currentPage, 'iso-local-box', 'right'); + } + currentPage = 'iso-local-box'; + $('#template-add-window .modal-body .template-pager').animate({ + height: "700px" + }, 400); + initLocalIsoField(); + initIsoFileField(); + $('#loading-isos').fadeIn(100, function() {}); + kimchi.listIsos(function(local_isos) { //local ISOs + kimchi.listDistros(function(remote_isos) { //remote ISOs + + isos = local_isos.concat(remote_isos); //all isos + if (isos && isos.length) { + showLocalIsoField(isos); + $('#iso-more').show(); + } else { + $('#iso-search').show(); + } + $('#loading-isos').fadeOut(100, function() {}); + }); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#local-iso-error-container'); + $('#loading-isos').fadeOut(300, function() {}); + }); + setupFilters(); + enabledRemoteIso(); + } + }); + + $('#netboot-src').change(function() { + if (this.checked) { + if (currentPage === 'iso-local-box') { + kimchi.switchPage(currentPage, 'netboot-path', 'left'); + } + currentPage = 'netboot-path'; + $('#template-add-window .modal-body .template-pager').animate({ + height: "300px" + }, 400); + $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path + $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').removeAttr('disabled').css('display', 'inline-block'); // 3 - Netboot + } + }); + //do create var addTemplate = function(data, callback) { kimchi.createTemplate(data, function() { diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 5584f00..d4c7216 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -30,18 +30,17 @@ <div class="modal-body"> <div class="template-modal-container"> <div id="alert-modal-container"></div> + <div> + <h5>$_("Where is the source media for this template? ")</h5> + <input type="radio" checked="checked" name="iso-source" id="image-src" value="image-src" class="wok-radio"> + <label for="image-src">$_("Image Template")</label> + <input type="radio" name="iso-source" id="netboot-src" value="netboot-src" class="wok-radio"> + <label for="netboot-src">$_("Netboot Template")</label> + </div> </div> <div class="template-pager"> <div class="page-list"> <div class="page" id="iso-local-box"> - <div id="loading-isos"> - <div class="wok-mask-loader-container"> - <div class="wok-mask-loading"> - <div class="wok-mask-loading-icon"></div> - <div class="wok-mask-loading-text">$_("Loading...")</div> - </div> - </div> - </div>  <div id="iso-file-field"> <div id="iso-file-box" class="custom-iso-field"> @@ -104,16 +103,30 @@ </div> </div> </div> - </div> - </div> - <div class="modal-footer"> - <button class="btn btn-default" id="btn-template-file-create" disabled="disabled">$_("Create")</button> - <button class="btn btn-default" id="btn-template-local-iso-create" disabled="disabled">$_("Create")</button> - <button class="btn btn-default" data-dismiss="modal" type="button">$_("Cancel")</button> - </div> -</div> + <div class="page" id="netboot-path"> + </div> + </div> + <div id="loading-isos"> + <div class="wok-mask-loader-container"> + <div class="wok-mask-loading"> + <div class="wok-mask-loading-icon"></div> + <div class="wok-mask-loading-text">$_("Loading...")</div> + </div> + </div> + </div> + </div> + <div class="modal-footer"> + <button class="btn btn-default" id="btn-template-file-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" id="btn-template-local-iso-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" id="btn-template-netboot-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" data-dismiss="modal" type="button">$_("Cancel")</button> + </div> + </div> <script> kimchi.template_add_main(); </script> + + +</div> </body> </html> -- 2.5.0

3 2

[PATCH] [Kimchi] Show error message for untracked and failed cloning tasks
by Lucio Correia 21 Jul '16

21 Jul '16

When the asynchronous task for the cloning of a guest fails too early, the task is not tracked by listVmsAuto(), which does it only for 'running' tasks. Consequently, the error message is not showed to the user. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 8e12fb2..0e11aa1 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -360,6 +360,17 @@ kimchi.listVmsAuto = function() { return guests; }; + var trackFailedCloningGuests = function() { + kimchi.getTasksByFilter('status=failed&target_uri=' + encodeURIComponent('^/plugins/kimchi/vms/.+/clone'), function(tasks) { + for (var i = 0; i < tasks.length; i++) { + if (kimchi.trackingTasks.indexOf(tasks[i].id) == -1) + kimchi.trackTask(tasks[i].id, null, function(err) { + wok.message.error(err.message); + }, null); + } + }, null, true); + }; + var getMigratingGuests = function() { var guests = []; kimchi.getTasksByFilter('status=running&target_uri=' + encodeURIComponent('^/plugins/kimchi/vms/.+/migrate'), function(tasks) { @@ -381,7 +392,9 @@ kimchi.listVmsAuto = function() { kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus == "success") { - + // Some clone tasks may fail before being tracked. Show + // error message for them. + trackFailedCloningGuests(); var migrated = getMigratingGuests(); for (i = migrated.length - 1; i >= 0; i--) { for (j = result.length - 1; j >= 0; j--) { -- 1.9.1

3 2

[PATCH][Wok 0/2] Kimchi is logging out due to session timeout even when user is typing or using the webpage
by Ramon Medeiros 21 Jul '16

21 Jul '16

Ramon Medeiros (2): Move constant from auth.py to template.py Issue #133: Kimchi is logging out due to session timeout even when user is typing or using the webpage src/wok/auth.py | 9 ++++----- src/wok/template.py | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) -- 2.5.5

3 6

[PATCH] [Wok] Issue 136: Changes for User Log UI
by sguimaraes943＠gmail.com 21 Jul '16

21 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes a minor issue with date not being properly converted and adds ip address and timezone columns to User Activity Log table. IT also removes the "search by time" field from the advanced search and replaces it with "search by user IP address". Samuel Guimarães (1): Issue 136: Changes for User Log UI ui/js/src/wok.utils.js | 4 ++-- ui/js/wok.user-log.js | 8 ++++++++ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/tabs/settings-search.html.tmpl | 14 +++++++------- 4 files changed, 19 insertions(+), 9 deletions(-) -- 1.9.3

3 3

[PATCH] [Wok 0/2] Loading mask position and "progress" mouse cursor
by sguimaraes943＠gmail.com 21 Jul '16

21 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patchset contains "Fixes loading message position inside panel-groups" v2 (rebased) and the CSS class to change mouse cursor when tasks are in progress (still requires individual patches for each plugin). Samuel Guimarães (2): Fixes loading message position inside panel-groups Added cursor for tasks in progress ui/css/src/wok.scss | 20 ++++++++++++++++++++ ui/css/wok.css | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) -- 1.9.3

2 4

[PATCH v2][Kimchi 0/2] Issue #467: Feature: Show boot menu for a guest
by Ramon Medeiros 21 Jul '16

21 Jul '16

based on "Make Kimchi able to change guest's boot order" Changes: v2: pep8 fixes Ramon Medeiros (2): Allow guest to enable bootmenu on startup Add test to verify bootmenu and update old tests API.json | 5 +++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 30 +++++++++++++++++++++--------- tests/test_mockmodel.py | 2 +- tests/test_model.py | 8 +++++++- xmlutils/bootorder.py | 4 ++++ 7 files changed, 40 insertions(+), 11 deletions(-) -- 2.5.5

2 3

[RFC] Kimchi is logging out due to session timeout even when user is typing or using the webpage #133
by Ramon Medeiros 21 Jul '16

21 Jul '16

Proposal: Return the remaining time for the end of the session by REST API. This will add a functionality in the UI, that will popup a warning asking if user wants to keep it logged. More information on issue: https://github.com/kimchi-project/wok/issues/133 Doubts: How i will return this on the header? Where timeout of authentication (session) is ? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

4 4

[PATCH] [Kimchi] Handle libvirt events for device attachment/detachment
by Jose Ricardo Ziviani 21 Jul '16

21 Jul '16

- kimchi will only finish the device attachment/detachment after receiving the appropriate event from libvirt. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 48 ++++++++++++++++++++++++++++++++++++++++ model/vmhostdevs.py | 60 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 98 insertions(+), 10 deletions(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index dfd22c6..0f3bfd5 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -89,3 +89,51 @@ class LibvirtEvents(object): else: reason = e.message wok_log.error("Register of ENOSPC event failed: %s" % reason) + + def registerAttachDevicesEvent(self, conn, cb, arg): + """ + register libvirt event to listen to devices attachment + """ + try: + return conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, + cb, + arg) + + except libvirt.libvirtError as e: + wok_log.error("register attach event failed: %s" % e.message) + + def registerDetachDevicesEvent(self, conn, cb, arg): + """ + register libvirt event to listen to devices detachment + """ + try: + return conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, + cb, + arg) + + except libvirt.libvirtError as e: + wok_log.error("register detach event failed: %s" % e.message) + + def deregisterAttachDevicesEvent(self, conn, id): + """ + deregister libvirt event to listen to devices attachment + """ + try: + conn.get().domainEventDeregisterAny(id) + + except libvirt.libvirtError as e: + wok_log.error("deregister attach event failed: %s" % e.message) + + def deregisterDetachDevicesEvent(self, conn, id): + """ + deregister libvirt event to listen to devices detachment + """ + try: + conn.get().domainEventDeregisterAny(id) + + except libvirt.libvirtError as e: + wok_log.error("deregister detach event failed: %s" % e.message) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 2130ac4..676e40a 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -47,8 +47,10 @@ class VMHostDevsModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] + self.events = kargs['eventsloop'] self.caps = CapabilitiesModel(**kargs) self.task = TaskModel(**kargs) + self._eid = None def get_list(self, vmid): dom = VMModel.get_vm(vmid, self.conn) @@ -67,6 +69,17 @@ class VMHostDevsModel(object): if dev_name not in eligible_dev_names: raise InvalidParameter('KCHVMHDEV0002E', {'dev_name': dev_name}) + def _event_devices(self, conn, dom, alias, opaque): + """ + Callback to handle add/remove devices event + """ + if self._eid is None: + wok_log.error("callbackID cannot be None") + return + + wok_log.info("Device %s added successfuly" % alias) + opaque('OK', True) + def create(self, vmid, params): dev_name = params['name'] self._passthrough_device_validate(dev_name) @@ -224,6 +237,12 @@ class VMHostDevsModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._eid is None: + self._eid = self.events.registerAttachDevicesEvent( + self.conn, + self._event_devices, + cb) + # all devices in the group that is going to be attached to the vm # must be detached from the host first with RollbackContext() as rollback: @@ -273,7 +292,6 @@ class VMHostDevsModel(object): rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) rollback.commitAll() - cb('OK', True) return for pci_info in pci_infos: @@ -294,8 +312,6 @@ class VMHostDevsModel(object): xmlstr, device_flags) rollback.commitAll() - cb('OK', True) - def _count_3D_devices_attached(self, dom): counter = 0 root = objectify.fromstring(dom.XMLDesc(0)) @@ -407,6 +423,12 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] dom = VMModel.get_vm(vmid, self.conn) + if self._eid is None: + self._eid = self.events.registerAttachDevicesEvent( + self.conn, + self._event_devices, + cb) + with RollbackContext() as rollback: cb('Reading source device XML') xmlstr = self._get_scsi_device_xml(dev_info) @@ -421,8 +443,6 @@ class VMHostDevsModel(object): rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) rollback.commitAll() - cb('OK', True) - def _get_usb_device_xml(self, dev_info): source = E.source( E.vendor(id=dev_info['vendor']['id']), @@ -440,6 +460,12 @@ class VMHostDevsModel(object): dev_info = params['dev_info'] dom = VMModel.get_vm(vmid, self.conn) + if self._eid is None: + self._eid = self.events.registerAttachDevicesEvent( + self.conn, + self._event_devices, + cb) + with RollbackContext() as rollback: cb('Reading source device XML') xmlstr = self._get_usb_device_xml(dev_info) @@ -454,14 +480,14 @@ class VMHostDevsModel(object): rollback.prependDefer(dom.detachDeviceFlags, xmlstr, device_flags) rollback.commitAll() - cb('OK', True) - class VMHostDevModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] + self.events = kargs['eventsloop'] self.task = TaskModel(**kargs) + self._eid = None def lookup(self, vmid, dev_name): dom = VMModel.get_vm(vmid, self.conn) @@ -509,6 +535,17 @@ class VMHostDevModel(object): task_params) return self.task.lookup(taskid) + def _event_devices(self, conn, dom, alias, opaque): + """ + Callback to handle add/remove devices event + """ + if self._eid is None: + wok_log.error("callbackID cannot be None") + return + + wok_log.info("Device %s removed successfuly" % alias) + opaque('OK', True) + def _detach_device(self, cb, params): cb('Detaching device.') vmid = params['vmid'] @@ -526,12 +563,17 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._eid is None: + self._eid = self.events.registerDetachDevicesEvent( + self.conn, + self._event_devices, + cb) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): if is_3D_device: cb('Updating MMIO from VM...') devsmodel = VMHostDevsModel(conn=self.conn) devsmodel.update_mmio_guest(vmid, False) - cb('OK', True) return for e in hostdev: @@ -552,8 +594,6 @@ class VMHostDevModel(object): raise NotFoundError('KCHVMHDEV0001E', {'vmid': vmid, 'dev_name': dev_name}) - cb('OK', True) - def _get_devices_same_addr(self, hostdev, domain, bus, slot): devices = [] for device in hostdev: -- 2.7.4

3 2

Re: [Kimchi-devel] [PATCH V2][Wok 03/12] FVT: Lists all dependecies for fvt testcases.
by Aline Manera 19 Jul '16

19 Jul '16

On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > All the dependecies to be installed which is required by fvt > testcases should be added here. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/requirements.txt | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > create mode 100644 tests/fvt/requirements.txt > > diff --git a/tests/fvt/requirements.txt b/tests/fvt/requirements.txt > new file mode 100644 > index 0000000..9941793 > --- /dev/null > +++ b/tests/fvt/requirements.txt > @@ -0,0 +1,23 @@ > +# This requirements file lists all dependecies for fvt testcases. > +# Run 'pip install -r requirements.txt' to install these dependencies > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301USA > + > +jsonschema > +requests I am almost sure that there is RPM/DEB packages for those python modules so we don't need to use pip. Or any special reason to prefer pip?

1 1