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

Re: [Kimchi-devel] [PATCH V2][Wok 04/12] FVT: Common classes/methods for API calls as per config file configuration.
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> > > Wrapper classes/methods for making API calls by reading > the config file configuration. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/restapilib.py | 738 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 738 insertions(+) > create mode 100644 tests/fvt/restapilib.py > > diff --git a/tests/fvt/restapilib.py b/tests/fvt/restapilib.py > new file mode 100644 > index 0000000..19634f1 > --- /dev/null > +++ b/tests/fvt/restapilib.py > @@ -0,0 +1,738 @@ > +#!/usr/bin/python > +# -*- coding: utf-8 -*- You only need to add this header when the source code file has non-ASCII characters which seems to not be the case. So you can 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 ConfigParser > +import jsonschema > +import json > +import requests > +import logging > +import os > + > +requests.packages.urllib3.disable_warnings() > + Why disable warning message? Aren't they important for debug? > +__all__ = ['APIError', 'APIRequestError', 'APISession', 'SessionParameters'] > + > +DEFAULT_CONF = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'config' > + > +_HTTP_SUCCESS_STATUS_RANGE = range(200, 299) # All of the 2XX status codes > + > + > +class APIError(Exception): > + """Base class for exceptions raised by this module.""" > + > + pass > + Could you elaborate on the proposal of this class? Why do not use Exception directly as this class does not add anything to Exception class? > + > +class APISession(object): > + """Represents an API session with the host Web Services API""" > + > + def __init__(self, conffile=DEFAULT_CONF): > + """ Creates an APISession object for use with the specified Host. > + """ > + self._session = None > + self._base_uri = None > + self.username = None > + self.passwd = None I am not comfortable to store password values in the application. Is it really needed? What are the other possibilities? > + self.host = None > + self.port = None > + # Holds the session from requests if self._session is None. > + self.session() > + self.sessionparams = SessionParameters(conffile=conffile) > + self.logging = self.sessionparams.getLogger() > + # base URI of connected machine > + self._base_uri = self.create_base_uri() > + > + def session(self): > + """ > + Create the session object for API Request if no existing session. > + """ > + if self._session is not None: > + raise APIError('Already have a session') > + > + self._session = requests.Session() > + return self._session > + How is this session different from the Wok session? Why do we need to handle 2 types of session? > + def auth(self): > + """ > + Set authentication to API session. > + """ > + > + if self._session is None: > + self.session() > + > + self.username, self.passwd = self.sessionparams.getCredentials() > + > + if self.username is None: > + raise APIError('Username is None') > + if self.passwd is None: > + raise APIError('password is None') > + # Set auth at session level > + self._session.auth = (self.username, self.passwd) > + > + # set password expiration currently it default value > + # self._session.expires = '1432091741' > + # For now keeping it False to disable SSL verification > + self._session.verify = False > + return > + > + def create_base_uri(self): > + """ > + Create the base URI using host and port. > + if no host is provided _base_uri is None. > + if port is None then _base_uri is just host > + if both is provided then append port to host. > + """ > + > + if self._base_uri is not None: > + return self._base_uri > + > + self.host, self.port = self.sessionparams.getUrlParams() > + if self.host is None: > + return None > + if self.port is None: > + return self.host > + > + self._base_uri = 'https://' + self.host + ':' + self.port > + return self._base_uri > + > + def end_session(self): > + """Ends an API session""" > + > + if self._session is None: > + return None # Silently ignore > + # The session to be terminated by setting None in session object we > + # have. > + self._session = None > + return > + Same I asked about that Session. > + def request( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, ): > + """ Use one line up to 80 characters. > + Issue an WS API request and return the response body, if any. > + > + \param method > + The HTTP method to issue (eg. GET, PUT, POST, DELETE). > + > + \param uri > + The URI path and query parameter string for the request. > + > + \param body > + The request body that is input to the request, as a Unicode > + or String, or None if there is no input body. > + > + \param expected_status_values > + The HTTP status code that is expected on completion of the request. > + If this parameter is specified, the function raises an exception > + if the HTTP status from the request was not exactly as specified. > + Otherwise, it raises an error if the HTTP status is not 2XX. > + > + \param headers > + Request headers for this request, in the form of a Python Dict. > + Optional. This function automatically augments these headers > + with the headers needed to specify the API session. Note that if > + input headers are provided, the supplied Dict object will be > + modified by this function. > + """ I like the documentation. But we need to agree on a format to be used overall. Do you mind to write a github wiki page with the instructions? (how to doc parameters and return function, etc) > + > + # Start with the headers supplied by caller, if any > + > + if headers is not None: > + hdrs = headers # Use caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If no session then throw error. > + > + if self._session is None: > + raise APIError('You have no session') > + > + resp = self._session.request(method, uri, data=body, headers=hdrs) > + > + # If an expected status was specified, check that the status exactly > + # matches wbat was expected, otherwise check that the status is one of > + # the success Statuses. > + > + if expected_status_values is not None: > + raise_exc = resp.status_code not in expected_status_values > + else: > + raise_exc = resp.status_code not in _HTTP_SUCCESS_STATUS_RANGE > + > + # Raise an exceptoin if the result is not as intended. > + > + if raise_exc: > + > + # If the request fails in some way WEb Services API response > + # will usually include a standard error response body > + # in JSON format that includes a more detailed reason > + # code (and message) for the failure. It provides this data > + # in JSON format even if the request would return some other > + # format if the request had been successful. > + # So if the request has failed, grab that additional info > + # for use in raising exceptions below. > + > + failure_reason = 0 > + failure_code = None > + # if response.status_code not in _HTTP_SUCCESS_STATUS_RANGE: > + > + # The API provides the JSON error response in all usual error > + # cases. But for certain less common errors this does not occur > + # because the error is caught higher in the processing stack. > + # So try to interpret the response as a JSON response body, but > + # just silently ignore problems if we can't do this. > + > + try: > + error_resp = json.loads(resp.text) > + failure_reason = error_resp['reason'] > + failure_code = error_resp['code'] > + except (ValueError, KeyError): > + pass > + > + raise APIRequestError(resp.status_code, failure_reason, > + failure_code) > + > + # Return the response > + return resp > + > + def request_octet( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + Use one line up to 80 characters. It applies to all the other functions/methods you created like above. > + # Start with the request headers the caller supplied if any, > + # otherwise start with an empty set of headers. > + > + if headers is not None: > + hdrs = headers # Using caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for not not set.) > + > + body_json = body > + if body is not None: > + body_json = json.dumps(body) > + > + # Supply an HTTP Accepts header indicating we accept/expect that any > + # response body be JSON. The Accepts header is optional, and the API > + # will defautl to supplying JSON for any operation defined in API V1.1 > + # to return JSON (even if in the future support for other formats would > + # be added). But its a good idea to specify this header as a safeguard > + # in case this function were called for an URI that is not capable of > + # returning JSON, as this function as currently coded would choke on > + # non-JSON responses. > + > + hdrs['Accept'] = 'application/json' > + > + # Now issue the request, and retrieve the response object and the > + # response body if provided. > + > + resp = self.request( > + method, > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=hdrs, > + ) > + > + return resp > + > + def request_json( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): Use one line up to 80 characters. > + """ > + Issue an WS API request that is defined to take JSON input and > + produce JSON output. (Nearly all WS API requests are like this.) > + > + Input and output bodies are specified as Python Dict or List objects, > + which are converted to/from JSON by this function. > + > + \param method > + The HTTP method to issue (eg. GET, PUT, POST, DELETE). > + > + \param uri > + The URI path and query parameter string for the request. > + > + \param body > + The request body that is input to the request, in the form of a > + Python Dict or List object. This object is automatically converted > + to corresponding JSON by this function. Optional. > + > + \param expected_status_values > + The HTTP status code that is expected on completion of the request. > + See corresponding parameter on request() method for more details. > + > + \param headers > + Request headers for this request, in the form of a Python Dict. > + Optional. This function automatically augments these headers > + with the headers needed to specify the JSON content type for input > + and output, and to specify the API session. Note that if input > + headers are provided, the supplied Dict object will be modified > + by this function. > + > + """ > + > + # Start with the request headers the caller supplied if any, > + # otherwise start with an empty set of headers. > + > + if headers is not None: > + hdrs = headers # Using caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for now have not set.) > + > + body_json = None > + if body is not None: > + body_json = json.dumps(body) > + hdrs['Content-Type'] = 'application/json' > + > + # Supply an HTTP Accepts header indicating we accept/expect that any > + # response body be JSON. The Accepts header is optional, and the API > + # will default to supplying JSON for any operation defined in API V1.1 > + # to return JSON (even if in the future support for other formats would > + # be added). But its a good idea to specify this header as a safeguard > + # in case this function were called for an URI that is not capable of > + # returning JSON, as this function as currently coded would choke on > + # non-JSON responses. > + > + hdrs['Accept'] = 'application/json' > + > + # Now issue the request, and retrieve the response object and the > + # response body if provided. > + > + response_body = self.request( > + method, > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=hdrs, > + ) > + > + # If a response body was returned, we presume it is JSON and > + # convert it into a Python dict we will return. > + > + resp_json = None > + if response_body is not None: > + try: > + resp_json = response_body.json() > + except ValueError, err: > + print 'response_body %s' % response_body > + print 'response_body headers %s' % response_body.headers > + raise APIError('Response body expected to be JSON but is' > + + 'not valid %s', err) > + return resp_json > + > + def request_get_json( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request that returns JSON.""" > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json('GET', uri, > + expected_status_values=expected_status_values, > + headers=headers) > + > + def request_put_json( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request that returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'PUT', > + uri, > + body=body, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_post_json( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a POST request that > + provides/returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'POST', > + uri, > + body=body, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_delete_json( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a DELETE request that returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'DELETE', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + Those methods request_json_X() have duplicated code. Why do not use only self.request_json() with the required parameters? > + def request_get( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request('GET', uri, > + expected_status_values=expected_status_values, > + headers=headers) > + > + def request_put( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a PUT request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'PUT', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_post( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a POST request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for now have not set.) > + > + body_json = None > + if body is not None: > + body_json = json.dumps(body) > + > + if headers is None: > + headers = dict() > + headers['Content-Type'] = 'application/json' > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'POST', > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_delete( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a DELETE request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'DELETE', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + Same I commented above. Those methods request_X() have duplicated code. Why do not use only self.request_json() with the required parameters? Having only one method to do a request would be better for maintenance and testing development. self.request() and self.request_json() should handle all the methods and do the right decision on which to do. So I don't see why specific methods are required. > +class APIRequestError(APIError): > + """ > + Raised when an API request ends in error or not as expected. > + > + Attributes: > + \param status > + HTTP status code from the request > + > + \param reason > + API reason code from the request > + > + \param message > + API diagnostic message from the request > + > + \param stack > + Internal diagnostic info for selected Status 500 errors > + """ > + > + def __init__( > + self, > + status, > + reason=None, > + code=None, > + ): Use one line up to 80 characters. > + self.status = status > + self.reason = reason > + self.code = code > + > + def __str__(self): > + if self.code is not None: > + s = 'Request ended with status %s-%s (%s)' \ > + % (self.status, self.reason, self.code) > + else: > + s = 'Request ended with status %s-%s' % (self.status, > + self.reason) > + return s > + > + > +class BadJSONResponse(APIError): > + """exceptions raised for Bad Json Response.""" > + > + def __init__( > + self, > + error, > + ): > + self.error = error > + > + def __str__(self): > + s = 'Bad response: %s' % self.error > + return s > + > + > +class InvalidInput(APIError): > + """exceptions raised for Invalid Input.""" > + > + def __init__( > + self, > + error, > + ): > + self.error = error > + > + def __str__(self): > + s = 'Bad response: %s' % self.error > + return s > + > + Why do we need specific error exception? Each request, when on error, will raise a WokException. Why do we need other exceptions types? > +class SessionParameters(object): > + """ > + Represents functionalities that could help in getting the > + session information. > + """ > + > + def __init__( > + self, > + conffile=DEFAULT_CONF): Use one line up to 80 characters. > + """ > + Attributes: > + \param conffile > + config file which contains all configuration > + information with sections > + """ > + self.conffile = conffile > + self.username = None > + self.passwd = None > + self.host = '127.0.0.1' > + self.port = '8001' > + self.params = 'config' > + self.logfile = 'wok-api-test-suite.log' > + self.session_section = 'Session' > + self.logging = logging > + self.loglevel = 'ERROR' > + self.LEVELS = {'INFO': self.logging.INFO, > + 'DEBUG': self.logging.DEBUG, > + 'WARNING': self.logging.WARNING, > + 'ERROR': self.logging.ERROR, > + 'CRITICAL': self.logging.CRITICAL} > + if self.conffile is None: > + print 'Configuration file required %s' \ > + % self.conffile It should raise an exception if it is required to run the tests. > + else: > + print 'Reading configuration file %s' % self.conffile > + self.params = ConfigParser.ConfigParser() > + print self.params.read(self.conffile) > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'logfile'): > + self.logfile = self.params.get( > + self.session_section, 'logfile') > + > + if self.params.has_option(self.session_section, 'loglevel'): > + self.loglevel = self.params.get( > + self.session_section, 'loglevel') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + Why happens on that case? Default values are assumed? > + self.logging.basicConfig(format='%(asctime)s %(levelname)s: \ > + %(message)s', > + filename=self.logfile, > + level=self.LEVELS[self.loglevel]) > + > + def getCredentials(self): > + """ > + Returns user and password details for a session obtained from config > + file > + """ > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'user'): > + self.username = self.params.get(self.session_section, 'user') > + > + if self.params.has_option(self.session_section, 'passwd'): > + self.passwd = self.params.get(self.session_section, 'passwd') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + raise APIError('Session section not present in config') > + > + return self.username, self.passwd > + > + def getUrlParams(self): > + """ > + Returns host and port details for a session obtained from config file > + """ > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'host'): > + self.host = self.params.get(self.session_section, 'host') > + > + if self.params.has_option(self.session_section, 'port'): > + self.port = self.params.get(self.session_section, 'port') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + > + return self.host, self.port > + > + def getLogger(self): > + return self.logging > + > + > +class Validator(object): > + """ > + validator class having different validate methods > + """ > + > + def __init__(self, logger=None): > + """ > + :param logger: > + :return: > + """ > + if logger is not None: > + self.logging = logger > + > + def validate_json(self, jsn, schma): > + """ > + validates json against schema using jsonschema.validate library > + > + :param jsn: JSON to validate > + :param schma: Schema against which JSON should get validated > + :return: > + """ > + if self.logging is not None: > + self.logging.info('--> validate_json()') > + self.logging.debug( > + 'validate_json(): jsn:%s' % jsn) > + self.logging.debug( > + 'validate_json(): schma:%s' % schma) > + jsonschema.validate(jsn, schma) > + if self.logging is not None: > + self.logging.debug( > + 'validate_json(): jsn is valid') > + self.logging.info('<-- validate_json()')

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 02/12] FVT: Wok level config file to have 'sectionsi required for fvt common across plugins.
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> > > Wok level config file to have 'sections' required for functional verification > test common across plugins. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/config | 7 +++++++ > 1 file changed, 7 insertions(+) > create mode 100644 tests/fvt/config > > diff --git a/tests/fvt/config b/tests/fvt/config > new file mode 100644 > index 0000000..13acc0b > --- /dev/null > +++ b/tests/fvt/config > @@ -0,0 +1,7 @@ > +[Session] > +user : > +passwd : It is not good to have passwd in a text configuration file. Any other possibility on that? > +host : localhost > +port : 8001 > +logfile : wok-api-test-suite.log > +loglevel : DEBUG It is good to list the valid values. So user can proper change the configuration for his/her needs.

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 01/12] FVT: Package for functional verification testcases.
by Aline Manera 19 Jul '16

19 Jul '16

Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > init python file for fvt package. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/__init__.py | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > create mode 100644 tests/fvt/__init__.py > > diff --git a/tests/fvt/__init__.py b/tests/fvt/__init__.py > new file mode 100644 > index 0000000..9316f95 > --- /dev/null > +++ b/tests/fvt/__init__.py > @@ -0,0 +1,18 @@ > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

1 0

[RFC] Issue 976 - Make able Ginger's 'Virt User' profile users manage Kimchi guests.
by Paulo Ricardo Paz Vital 14 Jul '16

14 Jul '16

Current implementation of Kimchi enables only users with root access (sudo ALL) to create and manage virtual machines. Once the virtual machine is created, 'normal users' access to the guest created can be granted by changing the virtual machine permission configuration. There are two different use cases (one of them related in [1]) which 'normal' users or users with virtualization permission can be able to create and manage virtual machines. Since Ginger's User Management feature provides a schema to add users in one of fours different profiles (Regular, Regular (No shell), Virt User and Administrator) this RFC comes to propose a change in the implementation to make 'Virt User's (user added to system's kvm group) be able to: 1. create new virtual machines, based in already created templates (templates creation/edition continue only granted to admin users); and 2. use/edit guests which the user was added in guest's permission list. Any comments and suggestions are welcome. Best regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

2 1

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

13 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_model.py | 15 ++++++++++++++- xmlutils/bootorder.py | 19 +++++++++++++------ 6 files changed, 82 insertions(+), 9 deletions(-) -- 2.5.5

1 7

[PATCH V2] [Wok 0/2] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 13 Jul '16

13 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set works on Fedora 23, Ubuntu 16.04, Debian 8.5 and OpenSUSE 42.1 Due to issues with semanage in Fedora 24, it's not able to allow port 8001 in SELinux. A bug was opened against Fedora community to investigate this: https://bugzilla.redhat.com/show_bug.cgi?id=1355811 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 (2): Use system's nginx proxy service. Update troubleshooting documentation docs/troubleshooting.md | 3 +- 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 +--- 6 files changed, 65 insertions(+), 75 deletions(-) -- 2.7.4

1 2

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

13 Jul '16

Changes: 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_model.py | 13 +++++++++++++ xmlutils/bootorder.py | 19 +++++++++++++------ 6 files changed, 81 insertions(+), 8 deletions(-) -- 2.5.5

2 7

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

11 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 built 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 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 95 +++++++++++++++++++++------------------------------ src/wok/config.py.in | 6 +++- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 27 +++++++++------ src/wok/server.py | 6 +--- 5 files changed, 63 insertions(+), 73 deletions(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index cb05e4d..823d94d 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -22,71 +22,54 @@ # This is a template file to be used to generate a nginx # proxy config file at wokd script. -user ${user}; -worker_processes 1; +client_max_body_size ${max_body_size}k; -error_log /var/log/nginx/error.log; +# Timeout set to 10 minutes to avoid the 504 Gateway Timeout +# when Wok is processing a request. +proxy_connect_timeout 600; +proxy_send_timeout 600; +proxy_read_timeout 600; +send_timeout 600; -events { - worker_connections 1024; +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; } -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - sendfile on; +upstream websocket { + server 127.0.0.1:${websockets_port}; +} - client_max_body_size ${max_body_size}k; +server { + listen ${host_addr}:${proxy_ssl_port} ssl; - # Timeout set to 10 minutes to avoid the 504 Gateway Timeout - # when Wok is processing a request. - proxy_connect_timeout 600; - proxy_send_timeout 600; - proxy_read_timeout 600; - send_timeout 600; + ssl_certificate ${cert_pem}; + ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1.1 TLSv1.2; + ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; + ssl_prefer_server_ciphers on; + ssl_dhparam ${dhparams_pem}; + ssl_session_timeout ${session_timeout}m; - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } + add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; - upstream websocket { - server 127.0.0.1:${websockets_port}; + location / { + proxy_pass http://127.0.0.1:${cherrypy_port}; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_redirect http://127.0.0.1:${cherrypy_port}/ https://$host:${proxy_ssl_port}/; } - server { - listen ${host_addr}:${proxy_ssl_port} ssl; - - ssl_certificate ${cert_pem}; - ssl_certificate_key ${cert_key}; - ssl_protocols TLSv1.1 TLSv1.2; - ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; - ssl_prefer_server_ciphers on; - ssl_dhparam ${dhparams_pem}; - ssl_session_timeout ${session_timeout}m; - - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - - location / { - proxy_pass http://127.0.0.1:${cherrypy_port}; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_redirect http://127.0.0.1:${cherrypy_port}/ https://$host:${proxy_ssl_port}/; - } - - location /websockify { - proxy_pass http://websocket; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - } + location /websockify { + proxy_pass http://websocket; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; } - ${http_config} } + +${http_config} diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 1ca6f73..d0bca9b 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -76,9 +76,10 @@ class Paths(object): self.prefix = self.get_prefix() self.installed = (self.prefix == '@pkgdatadir@') self.ui_dir = self.add_prefix('ui') + self.sys_nginx_conf_dir = '@sysconfdir@/nginx/conf.d' if self.installed: - self.nginx_conf_dir = '@sysconfdir@/nginx/conf.d' + self.nginx_conf_dir = self.sys_nginx_conf_dir self.state_dir = '@localstatedir@/lib/wok' self.log_dir = '@localstatedir@/log/wok' self.conf_dir = '@sysconfdir@/wok' @@ -119,6 +120,9 @@ class Paths(object): def get_template_path(self, resource): return os.path.join(self.ui_dir, 'pages/%s.tmpl' % resource) + def is_wok_installed(self): + return self.installed + paths = Paths() diff --git a/src/wok/i18n.py b/src/wok/i18n.py index d6cb17c..33107ee 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -55,6 +55,8 @@ messages = { "WOKUTILS0004E": _("Invalid data value '%(value)s'"), "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), + "WOKPROXY0001E": _("Unable to (re)start system's nginx.service. Details: '%(error)s'"), + # These messages (ending with L) are for user log purposes "WOKCOL0001L": _("Request made on collection"), "WOKRES0001L": _("Request made on resource"), diff --git a/src/wok/proxy.py b/src/wok/proxy.py index a74e88a..ab959e1 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -31,6 +31,8 @@ from string import Template from wok import sslcert from wok.config import paths +from wok.exception import OperationFailed +from wok.utils import run_command HTTP_CONFIG = """ @@ -110,18 +112,21 @@ def _create_proxy_config(options): config_file.write(data) config_file.close() + # If not running from the installed path (from a cloned and builded source + # code), create a symbolic link in system's dir to prevent errors on read + # SSL certifications. + if not paths.is_wok_installed(): + dst = os.path.join(paths.sys_nginx_conf_dir, "wok.conf") + if os.path.isfile(dst): + os.remove(dst) + os.symlink(os.path.join(nginx_config_dir, "wok.conf"), dst) + def start_proxy(options): """Start nginx reverse proxy.""" _create_proxy_config(options) - nginx_config_dir = paths.nginx_conf_dir - config_file = "%s/wok.conf" % nginx_config_dir - cmd = ['nginx', '-c', config_file] - subprocess.call(cmd) - - -def terminate_proxy(): - """Stop nginx process.""" - config_file = "%s/wok.conf" % paths.nginx_conf_dir - term_proxy_cmd = ['nginx', '-s', 'stop', '-c', config_file] - subprocess.call(term_proxy_cmd) + # Restart system's nginx service to reload wok configuration + cmd = ['systemctl', 'restart', 'nginx.service'] + output, error, retcode = run_command(cmd, silent=True) + if retcode != 0: + raise OperationFailed('WOKPROXY0001E', {'error': error}) diff --git a/src/wok/server.py b/src/wok/server.py index 8a02596..b1185e3 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,7 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model -from wok.proxy import start_proxy, terminate_proxy +from wok.proxy import start_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot from wok.safewatchedfilehandler import SafeWatchedFileHandler @@ -180,10 +180,6 @@ 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 - cherrypy.engine.subscribe('exit', terminate_proxy) - cherrypy.lib.sessions.init() def _load_plugins(self, options): -- 2.7.4

4 5

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

08 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> 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

5 14

Plans for next releases (Wok 2.3 and Kimchi 2.3)
by Aline Manera 08 Jul '16

08 Jul '16

Hi all, Below are the links for the plans for the next release: Wok: https://github.com/kimchi-project/wok/milestone/5 Kimchi: https://github.com/kimchi-project/kimchi/milestone/22 Feel free to take any unassigned task but make sure to add a comment you are work on it so I can proper assign it to you later. Also, more and more ideas and suggestions are welcome. You can send it directly to the ML or open an issue on github. Regards, Aline Manera

1 0

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

08 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> 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 | 219 +++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 494 insertions(+), 6 deletions(-) create mode 100644 model/virtviewerfile.py -- 2.5.5

3 19

[PATCH v2] [Wok] Use callback instead of log file for run_command output
by Lucio Correia 06 Jul '16

06 Jul '16

* Ignore empty messages * Simplify exception message Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/asynctask.py | 13 +++++-------- src/wok/utils.py | 42 +++++++++++++----------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) Changes in V2: * removed unnecessary line diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index ec3fbc1..fb614a2 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -46,15 +46,12 @@ class AsyncTask(object): self.thread.start() def _status_cb(self, message, success=None): - if success is None: - self.message = message - self._save_helper() - return - if success is not None: self.status = 'finished' if success else 'failed' - self.message = message - self._save_helper() + + if message.strip(): + self.message = message + self._save_helper() def _save_helper(self): obj = {} @@ -73,4 +70,4 @@ class AsyncTask(object): except Exception, e: cherrypy.log.error_log.error("Error in async_task %s " % self.id) cherrypy.log.error_log.error(traceback.format_exc()) - cb("Unexpected exception: %s" % e.message, False) + cb(e.message, False) diff --git a/src/wok/utils.py b/src/wok/utils.py index 4b3b0ac..c78a77a 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -175,16 +175,21 @@ def import_module(module_name, class_name=''): return __import__(module_name, globals(), locals(), [class_name]) -def run_command(cmd, timeout=None, silent=False, tee=None, - env_vars=None): +def run_command(cmd, timeout=None, silent=False, out_cb=None, env_vars=None): """ cmd is a sequence of command arguments. timeout is a float number in seconds. timeout default value is None, means command run without timeout. silent is bool, it will log errors using debug handler not error. silent default value is False. - tee is a file path to store the output of the command, like 'tee' command. - tee default value is None, means output will not be logged. + out_cb is a callback that receives the whole command output every time a + new line is thrown by command. Default value is None, meaning that whole + output will be returned at the end of execution. + + Returns a tuple (out, error, returncode) where: + out is the output thrown by command + error is an error message if applicable + returncode is an integer equal to the result of command execution """ # subprocess.kill() can leave descendants running # and halting the execution. Using psutil to @@ -202,24 +207,6 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: timeout_flag[0] = True - # function to append the given msg into the log_file - def tee_log(msg=None, log_file=None): - if (msg is None) or (log_file is None): - return - - try: - f = open(log_file, 'a') - except IOError as e: - msg = "Failed to open file %s: " % log_file - wok_log.error("%s %s", msg, e) - return - msg += '\n' - try: - f.write(msg) - except TypeError: - f.write(msg.encode('utf_8')) - f.close() - proc = None timer = None timeout_flag = [False] @@ -239,9 +226,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, timer.start() wok_log.debug("Run command: '%s'", " ".join(cmd)) - if tee is not None: - if os.path.exists(tee): - os.remove(tee) + if out_cb is not None: output = [] while True: line = "" @@ -259,8 +244,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, output.append(line) if not line: break - line = line.rstrip('\n\r') - tee_log(line, tee) + out_cb(''.join(output)) out = ''.join(output) error = proc.stderr.read() returncode = proc.poll() @@ -281,8 +265,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) - if tee is not None: - tee_log(msg, tee) + if out_cb is not None: + out_cb(msg) elif error: wok_log.debug("error: %s returned from cmd: %s", decode_value(error), decode_value(' '.join(cmd))) -- 1.9.1

2 1

[PATCH] [Wok] Use callback instead of log file for run_command output
by Lucio Correia 06 Jul '16

06 Jul '16

* Ignore empty messages * Simplify exception message Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/asynctask.py | 13 +++++-------- src/wok/utils.py | 41 +++++++++++++---------------------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index ec3fbc1..fb614a2 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -46,15 +46,12 @@ class AsyncTask(object): self.thread.start() def _status_cb(self, message, success=None): - if success is None: - self.message = message - self._save_helper() - return - if success is not None: self.status = 'finished' if success else 'failed' - self.message = message - self._save_helper() + + if message.strip(): + self.message = message + self._save_helper() def _save_helper(self): obj = {} @@ -73,4 +70,4 @@ class AsyncTask(object): except Exception, e: cherrypy.log.error_log.error("Error in async_task %s " % self.id) cherrypy.log.error_log.error(traceback.format_exc()) - cb("Unexpected exception: %s" % e.message, False) + cb(e.message, False) diff --git a/src/wok/utils.py b/src/wok/utils.py index 4b3b0ac..d532f96 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -175,16 +175,21 @@ def import_module(module_name, class_name=''): return __import__(module_name, globals(), locals(), [class_name]) -def run_command(cmd, timeout=None, silent=False, tee=None, - env_vars=None): +def run_command(cmd, timeout=None, silent=False, out_cb=None, env_vars=None): """ cmd is a sequence of command arguments. timeout is a float number in seconds. timeout default value is None, means command run without timeout. silent is bool, it will log errors using debug handler not error. silent default value is False. - tee is a file path to store the output of the command, like 'tee' command. - tee default value is None, means output will not be logged. + out_cb is a callback that receives the whole command output every time a + new line is thrown by command. Default value is None, meaning that whole + output will be returned at the end of execution. + + Returns a tuple (out, error, returncode) where: + out is the output thrown by command + error is an error message if applicable + returncode is an integer equal to the result of command execution """ # subprocess.kill() can leave descendants running # and halting the execution. Using psutil to @@ -202,24 +207,6 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: timeout_flag[0] = True - # function to append the given msg into the log_file - def tee_log(msg=None, log_file=None): - if (msg is None) or (log_file is None): - return - - try: - f = open(log_file, 'a') - except IOError as e: - msg = "Failed to open file %s: " % log_file - wok_log.error("%s %s", msg, e) - return - msg += '\n' - try: - f.write(msg) - except TypeError: - f.write(msg.encode('utf_8')) - f.close() - proc = None timer = None timeout_flag = [False] @@ -239,9 +226,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, timer.start() wok_log.debug("Run command: '%s'", " ".join(cmd)) - if tee is not None: - if os.path.exists(tee): - os.remove(tee) + if out_cb is not None: output = [] while True: line = "" @@ -260,7 +245,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, if not line: break line = line.rstrip('\n\r') - tee_log(line, tee) + out_cb(''.join(output)) out = ''.join(output) error = proc.stderr.read() returncode = proc.poll() @@ -281,8 +266,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) - if tee is not None: - tee_log(msg, tee) + if out_cb is not None: + out_cb(msg) elif error: wok_log.debug("error: %s returned from cmd: %s", decode_value(error), decode_value(' '.join(cmd))) -- 1.9.1

2 2

[PATCH v4] [Wok 0/3] Adding DataTables.net plugin and Moment.js to Wok
by sguimaraes943＠gmail.com 04 Jul '16

04 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Some files are minified. Let me know if they were corrupted by git send-email --no-validate This commit adds DataTables.net jQuery plugin and Moment.js library to Wok. DataTables.net is a table plugin that supports pagination, instance search and multi-column ordering. It also has a responsive module and it is compatible with many different CSS libraries. In this commit it is included a customization for its Bootstrap integration and a default initialization script pre-loaded with Wok styles. Moment.js is a lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates. It is required in order to filter and sort dates properly in Wok User Logs and Ginger Configuration Backup. v2 - Added minified files that were ignored by .gitignore v3 - Included DataTables plugins and separated files in different commits. v4 - Fixed white-space and CSS errors Samuel Guimarães (3): Initial commit for Datatables.net and Moment.JS Added Moment.JS file with locales Added DataTables.net JS minified files configure.ac | 3 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 255 +++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 302 ++++++++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 42 +++++ ui/libs/Makefile.am | 2 +- ui/libs/datatables/Makefile.am | 23 +++ ui/libs/datatables/css/Makefile.am | 21 +++ ui/libs/datatables/css/datatables.min.css | 24 +++ ui/libs/datatables/datatables.min.js | 273 +++++++++++++++++++++++++++ ui/libs/moment/LICENSE | 22 +++ ui/libs/moment/Makefile.am | 21 +++ ui/libs/moment/moment-with-locales.min.js | 76 ++++++++ ui/pages/login.html.tmpl | 4 + ui/pages/wok-ui.html.tmpl | 4 + 15 files changed, 1077 insertions(+), 3 deletions(-) create mode 100644 ui/css/datatables.bootstrap.css create mode 100644 ui/css/src/datatables.bootstrap.scss create mode 100644 ui/js/src/wok.datatables.js create mode 100644 ui/libs/datatables/Makefile.am create mode 100644 ui/libs/datatables/css/Makefile.am create mode 100644 ui/libs/datatables/css/datatables.min.css create mode 100644 ui/libs/datatables/datatables.min.js create mode 100644 ui/libs/moment/LICENSE create mode 100644 ui/libs/moment/Makefile.am create mode 100644 ui/libs/moment/moment-with-locales.min.js -- 1.9.3

2 4

[PATCH v5 0/3] [Wok] Initial commit for Datatables.net and Moment.JS
by sguimaraes943＠gmail.com 04 Jul '16

04 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Some files are minified. Let me know if they were corrupted by git send-email --no-validate This commit adds DataTables.net jQuery plugin and Moment.js library to Wok. DataTables.net is a table plugin that supports pagination, instance search and multi-column ordering. It also has a responsive module and it is compatible with many different CSS libraries. In this commit it is included a customization for its Bootstrap integration and a default initialization script pre-loaded with Wok styles. Moment.js is a lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates. It is required in order to filter and sort dates properly in Wok User Logs and Ginger Configuration Backup. v2 - Added minified files that were ignored by .gitignore v3 - Included DataTables plugins and separated files in different commits. v4 - Fixed white-space and CSS errors v5 - Included license for Datatables files in libs folder and CSS Samuel Guimarães (3): Initial commit for Datatables.net and Moment.JS Added Moment.JS file with locales Added DataTables.net JS minified files configure.ac | 4 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 262 +++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 310 ++++++++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 42 ++++ ui/libs/Makefile.am | 2 +- ui/libs/datatables/LICENSE | 22 +++ ui/libs/datatables/Makefile.am | 19 ++ ui/libs/datatables/css/Makefile.am | 21 ++ ui/libs/datatables/css/datatables.min.css | 24 +++ ui/libs/datatables/js/Makefile.am | 21 ++ ui/libs/datatables/js/datatables.min.js | 273 ++++++++++++++++++++++++++ ui/libs/moment/LICENSE | 22 +++ ui/libs/moment/Makefile.am | 21 ++ ui/libs/moment/moment-with-locales.min.js | 76 ++++++++ ui/pages/login.html.tmpl | 4 + ui/pages/wok-ui.html.tmpl | 4 + 17 files changed, 1132 insertions(+), 3 deletions(-) create mode 100644 ui/css/datatables.bootstrap.css create mode 100644 ui/css/src/datatables.bootstrap.scss create mode 100644 ui/js/src/wok.datatables.js create mode 100644 ui/libs/datatables/LICENSE create mode 100644 ui/libs/datatables/Makefile.am create mode 100644 ui/libs/datatables/css/Makefile.am create mode 100644 ui/libs/datatables/css/datatables.min.css create mode 100644 ui/libs/datatables/js/Makefile.am create mode 100644 ui/libs/datatables/js/datatables.min.js create mode 100644 ui/libs/moment/LICENSE create mode 100644 ui/libs/moment/Makefile.am create mode 100644 ui/libs/moment/moment-with-locales.min.js -- 1.9.3

2 5

[PATCH] [Kimchi] Disable ISOs with wrong permission and add mouse hover message
by peterpnns＠gmail.com 04 Jul '16

04 Jul '16

From: peterpennings <peterpnns(a)gmail.com> This patch turns impossible to select an ISO which does not have user's permission. Including so, a message and an icon to show it. peterpennings (1): Disable ISOs templates with wrong permission ui/css/kimchi.css | 11 +++++++++++ ui/css/src/modules/_templates.scss | 9 +++++++++ ui/js/src/kimchi.template_add_main.js | 12 +++++++++++- ui/pages/template-add.html.tmpl | 3 ++- 4 files changed, 33 insertions(+), 2 deletions(-) -- 2.5.0

3 3

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

04 Jul '16

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/js/src/kimchi.template_add_main.js | 74 ++++++++++++++++++++++++++++++++--- ui/pages/template-add.html.tmpl | 29 +++++++++----- 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 948f710..28057a7 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -17,6 +17,7 @@ */ kimchi.template_add_main = function() { "use strict"; + var currentPage = 'iso-local-box'; $('#loading-isos').removeClass('hidden'); kimchi.deepScanHandler = null; var isos = []; @@ -53,6 +54,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(); @@ -64,6 +66,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 }; @@ -98,6 +101,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 }; @@ -116,6 +120,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(); @@ -222,12 +227,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() { @@ -238,6 +242,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'); @@ -250,6 +255,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']); @@ -299,11 +314,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 }; @@ -340,6 +353,57 @@ 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: "635px" + }, 400); + initLocalIsoField(); + initIsoFileField(); + $('#loading-isos').removeClass('hidden'); + 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() { + $('#loading-isos').addClass('hidden'); + }); + }); + 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 4226a8f..87d6cb4 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -30,11 +30,18 @@ <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 id="loading-isos hidden"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> <div class="wok-mask-loading-icon"></div> @@ -103,16 +110,20 @@ </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> + <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] Save last view for templates - fix for issue# 799
by Socorro Stoppler 04 Jul '16

04 Jul '16

This patch addresses github issue# 799. The last view of the Templates tab is not being remembered either after switching tabs or exiting Kimchi. When switching view from List to Gallery (or vice versa), the next time the user goes back to the Templates tab, whatever view it was last on should be what is shown when going back to the Templates tab. Thanks to samhenri in helping resolve the last issue. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_main.js | 63 +++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 22a3509..ed49246 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -30,7 +30,7 @@ kimchi.doListTemplates = function() { } listHtml += wok.substitute(templateHtml, value); }); - $('.wok-vm-list').removeClass('hidden'); + $('ul#templates-grid').removeClass('hidden'); $('#templates-container').removeClass('hidden'); $('#templateList').html(listHtml); kimchi.templateBindClick(); @@ -39,7 +39,7 @@ kimchi.doListTemplates = function() { } else { $('#templateList').html(''); $('#noTemplates').show(); - $('.wok-vm-list').addClass('hidden'); + $('ul#templates-grid').addClass('hidden'); $('#templates-container').addClass('hidden'); $('.wok-mask').fadeOut(300, function() {}); } @@ -58,10 +58,47 @@ kimchi.doListTemplates = function() { }; kimchi.toggleTemplatesGallery = function() { - $(".wok-vm-list, .wok-vm-gallery").toggleClass("wok-vm-list wok-vm-gallery"); - $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); - var text = $('#gallery-table-button span.text').text(); - $('#gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + $(".wok-vm-list, .wok-vm-gallery").toggleClass("wok-vm-list wok-vm-gallery"); + $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); + var text = $('#gallery-table-button span.text').text(); + $('#gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + var buttonText = $('#gallery-table-button span.text').text(); + if (buttonText.indexOf("Gallery") !== -1) { + // Currently in list view + kimchi.setTemplateView("templateView", "list"); + } else { + // Currently in gallery + kimchi.setTemplateView("templateView", "gallery"); + } +}; + +kimchi.setTemplateView = function(name, value) { + window.localStorage.setItem(name, value); +}; + +kimchi.readTemplateView = function(name) { + var viewName = window.localStorage.getItem(name); + if (viewName !== "") { + return viewName; + } else { + return null; + } +}; + +kimchi.showTemplateGallery = function() { + $(".wok-vm-list").addClass("wok-vm-gallery"); + $(".wok-list").addClass("wok-gallery"); + $(".wok-vm-gallery").removeClass("wok-vm-list"); + $(".wok-gallery").removeClass("wok-list"); + $('#gallery-table-button span.text').text(i18n['KCHTMPL6004M']); +}; + +kimchi.showTemplateList = function() { + $(".wok-vm-gallery").addClass("wok-vm-list"); + $(".wok-gallery").addClass("wok-list"); + $(".wok-vm-list").removeClass("wok-vm-gallery"); + $(".wok-list").removeClass("wok-gallery"); + $('#gallery-table-button span.text').text(i18n['KCHTMPL6005M']); }; kimchi.templateBindClick = function() { @@ -117,6 +154,20 @@ kimchi.hideTitle = function() { kimchi.template_main = function() { $('body').addClass('wok-list'); + var viewFound = kimchi.readTemplateView("templateView"); + if (viewFound) { + if(viewFound === "gallery") { + // should be showing gallery + kimchi.showTemplateGallery(); + } else { + // Should be showing list + kimchi.showTemplateList(); + } + } else { + // Default to showing list + kimchi.showTemplateList(); + } + if (wok.tabMode['templates'] === 'admin') { $('.tools').attr('style', 'display'); $("#template-add").on("click", function(event) { -- 2.5.0

2 1

[PATCH] [Kimchi] model/vms.py: changing all interfaces VM
by dhbarboza82＠gmail.com 04 Jul '16

04 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch changes XPATH_DOMAIN_MAC and XPATH_DOMAIN_MAC_BY_ADDRESS to include search and replace of all mac addresses, not just those that belongs to type='network' interfaces. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- model/vms.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/model/vms.py b/model/vms.py index 7745027..6a309fc 100644 --- a/model/vms.py +++ b/model/vms.py @@ -86,9 +86,8 @@ VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" XPATH_DOMAIN_NAME = '/domain/name' -XPATH_DOMAIN_MAC = "/domain/devices/interface[@type='network']/mac/@address" -XPATH_DOMAIN_MAC_BY_ADDRESS = "./devices/interface[@type='network']/"\ - "mac[@address='%s']" +XPATH_DOMAIN_MAC = "/domain/devices/interface/mac/@address" +XPATH_DOMAIN_MAC_BY_ADDRESS = "./devices/interface/mac[@address='%s']" XPATH_DOMAIN_MEMORY = '/domain/memory' XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' -- 2.5.5

3 2

[PATCH] [Kimchi] Github #972: spice-html5 dir incorrect
by dhbarboza82＠gmail.com 04 Jul '16

04 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Before this patch, spice_dir was given by: self.spice_dir = self.add_prefix('ui/spice-html5') This results in the '/usr/share/wok/ui/spice-html5' dir when installing Kimchi in an Opensuse Leap system, which is not where the spice-html5 files are located. This is probably a remnant of the Kimchi -> WoK transition. This patch changes it to: self.spice_dir = os.path.join(self.ui_dir, 'spice-html5') That will give us '/usr/share/wok/plugins/kimchi/ui/spice-html5' instead, making spice-html5 work as intended in Opensuse or any other distro that requires the --with-spice-html5 flag in autogen.sh. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- config.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py.in b/config.py.in index e645d5d..937f1ec 100644 --- a/config.py.in +++ b/config.py.in @@ -102,7 +102,7 @@ class KimchiPaths(PluginPaths): 'spice-html5/pages/spice_auto.html') if __with_spice__ == 'yes': - self.spice_dir = self.add_prefix('ui/spice-html5') + self.spice_dir = os.path.join(self.ui_dir, 'spice-html5') elif os.path.exists('@datadir@/spice-html5'): self.spice_dir = '@datadir@/spice-html5' else: -- 2.5.5

3 2

Kimchi 2.2 pre-installed images available.
by Paulo Ricardo Paz Vital 01 Jul '16

01 Jul '16

It's a pleasure to announce the availability of the Kimchi 2.2 pre-installed images. A Kimchi pre-installed image is a QCOW2 image with Wok, Gingerbase and Kimchi 2.2 on top of a fresh install distro. The images with Kimchi 2.2 are available on top of: * Fedora 23 * Ubuntu 16.04 * opensSUSE Leap 42.1 and you can easily grab the images from the following links: * http://bit.ly/kimchi22_on_f23 * http://bit.ly/kimchi22_on_xenial * http://bit.ly/kimchi22_on_leap To use them, just decompress the images and create a VM pointing the default storage to the image. All images have the user 'kimchi' added with the password 'k1mch1' (same password for root). Don't forget to set up nested virtualization to be able to start up Kimchi on the VM. Once running, point your browser to the IP address of the VM on port 8000 (http) or 8001 (https) and log in using 'kimchi' user. Go ahead! Download the image with your preferred distro and test Kimchi NOW! Best regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

1 0