June 2016 - Kimchi-devel - oVirt List Archives

[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] 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 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] [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 v2] [Wok 0/3] Adding DataTables.net plugin and Moment.js to Wok
by sguimaraes943＠gmail.com 30 Jun '16

30 Jun '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. 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 | 243 +++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 289 ++++++++++++++++++++++++++++++ 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, 1052 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

1 3

[PATCH V3] [Kimchi 0/7] Updates to support Fedora 24 and new distros
by pvital＠linux.vnet.ibm.com 28 Jun '16

28 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V2 -> V3: - Updated remote links to Debian, OpenSUSE, Gentoo and Ubuntu - Updated test_rest.py to support changes in the distros info. V1 -> V2: - Fix missing "," V1: This patch-set adds support to recognize Fedora 24 ISO images and add new options for remote Fedora images. Paulo Vital (7): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. Update Debian remote images. Update Gentoo remote images. Update OpenSUSE remote images. Update Ubuntu remote images. Update unit tests to changes in Remote links. distros.d/debian.json | 6 ++--- distros.d/fedora.json | 57 ++++++++++++++++++++++++++++------------- distros.d/gentoo.json | 13 +++++++--- distros.d/opensuse.json | 7 ++++++ distros.d/ubuntu.json | 67 +++++++++++++++++++++++++++++++++++++------------ isoinfo.py | 1 + tests/test_rest.py | 10 ++++---- 7 files changed, 116 insertions(+), 45 deletions(-) -- 2.5.5

3 9

[PATCH] [Wok] Make sure all log messages have required parameters
by Lucio Correia 28 Jun '16

28 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/root.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wok/root.py b/src/wok/root.py index e2b9216..8601b71 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -146,9 +146,12 @@ class WokRoot(Root): self.paths = wok_paths self.domain = 'wok' self.messages = messages - self.log_map = ROOT_REQUESTS self.extends = None + # set user log messages and make sure all parameters are present + self.log_map = ROOT_REQUESTS + self.log_args.update({'username': ''}) + @cherrypy.expose def login(self, *args): method = 'POST' -- 1.9.1

2 1

[PATCH v2] [Kimchi] Issue #948: Kimchi not throwing errors when migration is performed and gives impression of migration doesn't work
by sguimaraes943＠gmail.com 28 Jun '16

28 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes an issue related to error messages not being captured by failed live migration tasks. This requires Wok patch for issue #79 otherwise it will repeat error messages once the guests list is refreshed. v2: - Removed function from kimchi.guest_main.js and inserted error message on kimchi.trackTask error callback. Samuel Guimarães (1): Issue #948: Kimchi not throwing errors when migration is performed and gives impression of migration doesn't work ui/js/src/kimchi.guest_livemigration.js | 9 +++++---- ui/js/src/kimchi.guest_main.js | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.8.3.1

3 3

[PATCH v2] [Wok] Adding DataTables.net plugin and Moment.js to Wok
by sguimaraes943＠gmail.com 28 Jun '16

28 Jun '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 Samuel Guimarães (1): Adding DataTables.net plugin and Moment.js to Wok configure.ac | 3 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 243 +++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 289 +++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 26 +++ 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 | 15 ++ ui/libs/datatables/datatables.bootstrap.min.js | 8 + ui/libs/datatables/datatables.min.js | 190 ++++++++++++++++ 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 | 5 + ui/pages/wok-ui.html.tmpl | 5 + 16 files changed, 954 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.bootstrap.min.js 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 2

[PATCH] [Kimchi] Make sure all log messages have required parameters
by Lucio Correia 28 Jun '16

28 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/networks.py | 3 +++ control/storagepools.py | 3 +++ control/storagevolumes.py | 3 +++ control/templates.py | 3 +++ control/vm/hostdevs.py | 5 +++++ control/vm/ifaces.py | 4 ++++ control/vm/snapshots.py | 4 ++++ control/vm/storages.py | 5 +++++ control/vms.py | 5 +++++ i18n.py | 4 ++-- 10 files changed, 37 insertions(+), 2 deletions(-) diff --git a/control/networks.py b/control/networks.py index 4b18638..1b8012e 100644 --- a/control/networks.py +++ b/control/networks.py @@ -42,7 +42,10 @@ class Networks(Collection): self.role_key = 'network' self.admin_methods = ['POST'] self.resource = Network + + # set user log messages and make sure all parameters are present self.log_map = NETWORKS_REQUESTS + self.log_args.update({'connection': '', 'name': ''}) class Network(Resource): diff --git a/control/storagepools.py b/control/storagepools.py index 2f25746..e188aae 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -52,7 +52,10 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + + # set user log messages and make sure all parameters are present self.log_map = STORAGEPOOLS_REQUESTS + self.log_args.update({'name': '', 'type': ''}) def create(self, params, *args): try: diff --git a/control/storagevolumes.py b/control/storagevolumes.py index c121b5e..a27396f 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -68,9 +68,12 @@ class StorageVolume(Resource): self.resize = self.generate_action_handler('resize', ['size']) self.wipe = self.generate_action_handler('wipe') self.clone = self.generate_action_handler_task('clone') + + # set user log messages and make sure all parameters are present self.log_map = STORAGEVOLUME_REQUESTS self.log_args.update({ 'pool': self.pool.encode('utf-8') if self.pool else '', + 'size': '', }) @property diff --git a/control/templates.py b/control/templates.py index 82697d0..bb2e068 100644 --- a/control/templates.py +++ b/control/templates.py @@ -41,7 +41,10 @@ class Templates(Collection): self.role_key = 'templates' self.admin_methods = ['GET', 'POST'] self.resource = Template + + # set user log messages and make sure all parameters are present self.log_map = TEMPLATES_REQUESTS + self.log_args.update({'name': ''}) class Template(Resource): diff --git a/control/vm/hostdevs.py b/control/vm/hostdevs.py index d21e19d..c39d7fb 100644 --- a/control/vm/hostdevs.py +++ b/control/vm/hostdevs.py @@ -40,8 +40,11 @@ class VMHostDevs(AsyncCollection): self.vmid = vmid self.resource_args = [self.vmid, ] self.model_args = [self.vmid, ] + + # set user log messages and make sure all parameters are present self.log_map = VMHOSTDEVS_REQUESTS self.log_args.update({ + 'name': '', 'vmid': self.vmid.encode('utf-8') if self.vmid else '', }) @@ -52,6 +55,8 @@ class VMHostDev(AsyncResource): self.vmid = vmid self.ident = ident self.model_args = [self.vmid, self.ident] + + # set user log messages and make sure all parameters are present self.log_map = VMHOSTDEV_REQUESTS self.log_args.update({ 'vmid': self.vmid.encode('utf-8') if self.vmid else '', diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index 7e133a6..cd9bd31 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -45,6 +45,8 @@ class VMIfaces(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + + # set user log messages and make sure all parameters are present self.log_map = VMIFACES_REQUESTS self.log_args.update({ 'network': '', @@ -60,6 +62,8 @@ class VMIface(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/ifaces/%s' + + # set user log messages and make sure all parameters are present self.log_map = VMIFACE_REQUESTS self.log_args.update({ 'vm': self.vm.encode('utf-8') if self.vm else '', diff --git a/control/vm/snapshots.py b/control/vm/snapshots.py index 20f07a7..d66fa06 100644 --- a/control/vm/snapshots.py +++ b/control/vm/snapshots.py @@ -42,6 +42,8 @@ class VMSnapshots(AsyncCollection): self.resource_args = [self.vm, ] self.model_args = [self.vm, ] self.current = CurrentVMSnapshot(model, vm) + + # set user log messages and make sure all parameters are present self.log_map = VMSNAPSHOTS_REQUESTS self.log_args.update({ 'vm': self.vm.encode('utf-8') if self.vm else '', @@ -57,6 +59,8 @@ class VMSnapshot(Resource): self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/snapshots/%s' self.revert = self.generate_action_handler('revert') + + # set user log messages and make sure all parameters are present self.log_map = VMSNAPSHOT_REQUESTS self.log_args.update({ 'vm': self.vm.encode('utf-8') if self.vm else '', diff --git a/control/vm/storages.py b/control/vm/storages.py index 615074a..5ef5f1a 100644 --- a/control/vm/storages.py +++ b/control/vm/storages.py @@ -41,10 +41,13 @@ class VMStorages(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + + # set user log messages and make sure all parameters are present self.log_map = VMSTORAGES_REQUESTS self.log_args.update({ 'vm': self.vm.encode('utf-8') if self.vm else '', 'path': '', + 'type': '', }) @@ -56,6 +59,8 @@ class VMStorage(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/storages/%s' + + # set user log messages and make sure all parameters are present self.log_map = VMSTORAGE_REQUESTS self.log_args.update({ 'vm': self.vm.encode('utf-8') if self.vm else '', diff --git a/control/vms.py b/control/vms.py index b351c72..bbf0fa4 100644 --- a/control/vms.py +++ b/control/vms.py @@ -54,6 +54,8 @@ class VMs(AsyncCollection): self.resource = VM self.role_key = 'guests' self.admin_methods = ['POST'] + + # set user log messages and make sure all parameters are present self.log_map = VMS_REQUESTS self.log_args.update({'name': '', 'template': ''}) @@ -82,7 +84,10 @@ class VM(Resource): self.suspend = self.generate_action_handler('suspend') self.resume = self.generate_action_handler('resume') self.serial = self.generate_action_handler('serial') + + # set user log messages and make sure all parameters are present self.log_map = VM_REQUESTS + self.log_args.update({'remote_host': ''}) @property def data(self): diff --git a/i18n.py b/i18n.py index b33c6ec..08a3ac8 100644 --- a/i18n.py +++ b/i18n.py @@ -339,12 +339,12 @@ messages = { "KCHEVENT0004W": _("I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)."), # These messages (ending with L) are for user log purposes - "KCHNET0001L": _("Created %(connection)s virtual network '%(name)s'"), + "KCHNET0001L": _("Created virtual network '%(name)s' type '%(connection)s'"), "KCHNET0002L": _("Removed virtual network '%(ident)s'"), "KCHNET0003L": _("Updated virtual network '%(ident)s'"), "KCHNET0004L": _("Activated virtual network '%(ident)s'"), "KCHNET0005L": _("Deactivated virtual network '%(ident)s'"), - "KCHPOOL0001L": _("Created %(type)s storage pool '%(name)s'"), + "KCHPOOL0001L": _("Created storage pool '%(name)s' type '%(type)s'"), "KCHPOOL0002L": _("Removed storage pool '%(ident)s'"), "KCHPOOL0003L": _("Updated storage pool '%(ident)s'"), "KCHPOOL0004L": _("Activated storage pool '%(ident)s'"), -- 1.9.1

2 1

[PATCH] [Kimchi] VM migrate: generic remote path check
by dhbarboza82＠gmail.com 28 Jun '16

28 Jun '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> The method _check_if_path_exists_in_remote_host was using 'test -f' to check if a file exist in the remote host. Hovewer, when using iSCSI disks, this path is a symlink instead of a regular file. This results in failure, making the code wrongly go to the 'non-shared' migration scenario. This patch changes the 'test' flag to '-e', which will simply check for the existence of the path in the remote host. There is no need to distinguish between whether the path is a file or a symlink in this method - we just want to know if the path is valid in the remote host. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 3b08c10..7745027 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1731,7 +1731,7 @@ class VMModel(object): def _check_if_path_exists_in_remote_host(self, path, remote_host, user): username_host = "%s@%s" % ('root', remote_host) cmd = ['ssh', '-oStrictHostKeyChecking=no', username_host, - 'test', '-f', path] + 'test', '-e', path] _, _, returncode = run_command(cmd, 5, silent=True) return returncode == 0 -- 2.5.5

2 1

[PATCH v2][Kimchi] Avoid break Wok when register events, if Libvirt is down
by Rodrigo Trujillo 27 Jun '16

27 Jun '16

When Wok starts up it loads Kimcho model, which tries to register Libvirt events. A problem happens if Libvirt service is down when Wok starts (usually manually/command line start up), because the connection is None, raising an error that breaks Wok. This patch fixes this problem and return a proper log message. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 632d399..dfd22c6 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -83,5 +83,9 @@ class LibvirtEvents(object): self.event_enospc_cb, libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON ) - except libvirt.libvirtError as e: - wok_log.error("Register of ENOSPC event failed: %s" % e.message) + except (libvirt.libvirtError, AttributeError) as e: + if type(e) == AttributeError: + reason = 'Libvirt service is not running' + else: + reason = e.message + wok_log.error("Register of ENOSPC event failed: %s" % reason) -- 2.1.0

3 2

[PATCH] [Wok] Fix PEP8 issue
by Lucio Correia 27 Jun '16

27 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/server.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index 567364d..8a02596 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -152,10 +152,10 @@ class Server(object): # redefine logrotate configuration according to wok.conf data = Template(LOGROTATE_TEMPLATE) - data = data.safe_substitute(log_dir=configParser.get("logging", - "log_dir"), - log_size=configParser.get("logging", - "log_size")) + data = data.safe_substitute( + log_dir=configParser.get("logging", "log_dir"), + log_size=configParser.get("logging", "log_size") + ) # Write file to be used for nginx. config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") -- 1.9.1

3 2

[PATCH ][Wok] Issue #116:No indication of debug reports being generated(Gingerbase)
by atreyee＠linux.vnet.ibm.com 27 Jun '16

27 Jun '16

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> pending reports are masked with 'generating..' message which was not getting parsed by locale datetime converter.invalid date message was shown and pending report was not disabled for operations. --- ui/js/src/wok.utils.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 54f8cf0..afe4020 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -232,9 +232,14 @@ wok.notificationsLoop = function notificationsLoop() { } wok.datetimeLocaleConverter = function datetimeLocaleConverter(datetime_string, locale){ - var dte = new Date(datetime_string.substr(0,10) + 'T' + datetime_string.substr(11)); - var options = { year: 'numeric', month: 'long', day: 'numeric' }; - return dte.toLocaleString(locale, options); + var dateRegEx = /(\d{4})-(\d{2})-(\d{2})/; + if(dateRegEx.test(datetime_string.substr(0,10))){ + var dte = new Date(datetime_string.substr(0,10) + 'T' + datetime_string.substr(11)); + var options = { year: 'numeric', month: 'long', day: 'numeric' }; + return dte.toLocaleString(locale, options); + }else{ + return datetime_string; + } } wok.dateLocaleConverter = function dateLocaleConverter(date_string, locale){ -- 2.1.0

2 1

[PATCH] [Wok] Adds DataTables.net plugin and Moment.js to Wok
by sguimaraes943＠gmail.com 27 Jun '16

27 Jun '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. Samuel Guimarães (1): Adding DataTables.net plugin and Moment.js to Wok configure.ac | 3 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 243 +++++++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 289 +++++++++++++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 26 ++++ ui/libs/Makefile.am | 2 +- ui/libs/datatables/Makefile.am | 23 +++ ui/libs/datatables/css/Makefile.am | 21 +++ ui/libs/moment/LICENSE | 22 +++ ui/libs/moment/Makefile.am | 21 +++ ui/pages/login.html.tmpl | 5 + ui/pages/wok-ui.html.tmpl | 5 + 12 files changed, 665 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/moment/LICENSE create mode 100644 ui/libs/moment/Makefile.am -- 1.9.3

3 3

[PATCH v2] [Wok] Issue #79: All error messages should keep on UI until user dismiss it
by sguimaraes943＠gmail.com 27 Jun '16

27 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit makes all messages closeable by default, removing the fade animation after 10 seconds. A parameter to allow a custom ID for each alert was also added to wok.message function. v2: - Fixed an issue where some alerts were not dismissible; - This commit also fixes a bug where alert "close" buttons would close modal windows. Samuel Guimarães (1): Issue #79: All error messages should keep on UI until user dismiss it ui/js/src/wok.message.js | 69 +++++++++++++++++++++++++----------------------- ui/js/src/wok.window.js | 2 +- 2 files changed, 37 insertions(+), 34 deletions(-) -- 1.8.3.1

3 3

[PATCH] [Kimchi] Do not break the logging of failed requests
by Lucio Correia 27 Jun '16

27 Jun '16

Now that failed requests are also logged, this fix is necessary to avoid breaking the logging itself due to lack of parameters. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/storagevolumes.py | 1 + control/vm/ifaces.py | 1 + control/vms.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/control/storagevolumes.py b/control/storagevolumes.py index c3f1c29..c121b5e 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -46,6 +46,7 @@ class StorageVolumes(AsyncCollection): self.model_args = [self.pool, ] self.log_map = STORAGEVOLUMES_REQUESTS self.log_args.update({ + 'name': '', 'pool': self.pool.encode('utf-8') if self.pool else '', }) diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index 0cea8b5..7e133a6 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -47,6 +47,7 @@ class VMIfaces(Collection): self.model_args = [self.vm, ] self.log_map = VMIFACES_REQUESTS self.log_args.update({ + 'network': '', 'vm': self.vm.encode('utf-8') if self.vm else '', }) diff --git a/control/vms.py b/control/vms.py index 2339017..b351c72 100644 --- a/control/vms.py +++ b/control/vms.py @@ -55,7 +55,7 @@ class VMs(AsyncCollection): self.role_key = 'guests' self.admin_methods = ['POST'] self.log_map = VMS_REQUESTS - self.log_args.update({'name': ''}) + self.log_args.update({'name': '', 'template': ''}) class VM(Resource): -- 1.9.1

2 1

[PATCH V2] [Wok 0/6] Log failed user requests
by Lucio Correia 27 Jun '16

27 Jun '16

Important: * This patchset depends on [PATCH V2] [Wok 0/3] User Request Log improvements. * This patch requires "[Kimchi] Do not break the logging of failed requests". Otherwise, some tests will be broken. Changes in V2: * Applied review suggestions Lucio Correia (6): Revert "Use past verbs" Parse request before authorization check Use status code 200 for PUT requests on resource Log failed login/logout attempts Log failed user requests Add status code to request log message docs/API/logs.md | 1 + src/wok/control/base.py | 130 ++++++++++++++++++++++-------------------------- src/wok/exception.py | 28 ++++++++--- src/wok/i18n.py | 4 +- src/wok/reqlogger.py | 10 ++-- src/wok/root.py | 44 +++++++++++----- tests/test_api.py | 2 +- 7 files changed, 122 insertions(+), 97 deletions(-) -- 1.9.1

2 12

[Wok] [Accessibility] Free web accessibility course on udacity
by Samuel Henrique De Oliveira Guimaraes 24 Jun '16

24 Jun '16

Hi team, I just saw this link on my front-end development reading list and I think we can learn a lot from it in order to improve Wok/Kimchi/Ginger/Gingerbase user experience. Check this out: https://www.udacity.com/course/web-accessibility--ud891 It is a free course on udacity from Google and based on the program lessons I believe it covers most of the problems that were detected and posted on Github. I think this should come in handy to anyone that is performing accessibility tests or developing new pages for the UI. Regards, Samuel

1 0

Kimchi 2.2 is released!
by Aline Manera 24 Jun '16

24 Jun '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 2.2*! Kimchi 2.2 depends on *Wok 2.2*! So make sure to have both of them properly installed in your system. Find more information about Wok 2.2 at http://kimchi-project.github.io/wok/downloads/ Among many features, this release includes: ✔ Multiple interfaces support for VEPA network ✔ Create Template without specifying media type ✔ Edit virtual network support ✔ Disable Templates with invalid data ✔ Memory hotplug support for non-NUMA PPC guests ✔ Passthrough macvtap network support ✔ Multi-function PCI hotplug support ✔ Storage volume management support ✔ Bug fixes We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 23, Ubuntu 16.04, openSUSE LEAP 42.1, and RHEL 7.2. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/kimchi/archive/2.2.0.tar.gz ✔ git clone --recursivehttps://github.com/kimchi-project/wok.git <recursivehttps://github.com/kimchi-project/wok.git> There are also some packages available for download at: ✔ http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

Wok 2.2 is released!
by Aline Manera 24 Jun '16

24 Jun '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.2*! Among many features, Wok 2.2 includes: ✔ Asynchronous notification support ✔ Make session timeout configurable ✔ Locale support ✔ Remove TLS v1.0 support ✔ Bug fixes We have worked hard to ensure that Wok runs well on the most popular Linux distributions including: Fedora 23, Ubuntu 16.04, openSUSE LEAP 42.1, and RHEL 7.2. Wok uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/wok/archive/2.2.0.tar.gz ✔ git clone --recursivehttps://github.com/kimchi-project/wok.git <recursivehttps://github.com/kimchi-project/wok.git> There are also some packages available at: ✔http://kimchi-project.github.io/wok/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

Re: [Kimchi-devel] [RFC] Replace jQuery Bootgrid with Datatables.net
by Samuel Henrique De Oliveira Guimaraes 23 Jun '16

23 Jun '16

FYI, This is what the Datatables.net would look like with Wok Styles: http://jsfiddle.net/sguimaraes/rrjpcdgv/ Notice that the sort arrows are using FontAwesome icons. Regards, Samuel From: Samuel Henrique De Oliveira Guimaraes Sent: terça-feira, 21 de junho de 2016 18:13 To: Kimchi Devel <kimchi-devel(a)ovirt.org> Subject: [RFC] Replace jQuery Bootgrid with Datatables.net Hi team, As part of the redesign process of some Ginger and Gingerbase panels, one of the main issues is that the jQuery Bootgrid tables are not exactly fitting with the Design Spec. If you compare System Modules and System Services tables with Kimchi they look and feel like part of the same application but if you navigate through Ginger Network and Storage tabs, there are some alignment and spacing issues. Most of these UI glitches could be fixed with plain CSS and / or editing jQuery Bootgrid "formatters" but we already faced some issues with the Software Updates and Network Configuration that required some workarounds that were not documented by jQuery Bootgrid authors. Based on that, I suggested to Aline and Daniel if we could redesign these panels using Datatables.net instead of just shaping Bootgrid with CSS changes that may require rework once or if we update Bootgrid library due security or any other reason. I've mentioned before that we would probably have to update to this library if we decided to use Bootstrap 4 in the future but it seems that we may need to change the library and rewrite some panels a little bit earlier. For the UI development it makes sense to use this library instead of adding "native" sort, filters and paging to wok.datagrid component because it has a larger community, a support board and tons of documented examples. Plus, it already has accessibility improvements that we would have to manually implement to our panels. In the future we could even drop wok.datagrid entirely and port everything that doesn't have a Gallery / List view design pattern to Datatables.net. Here's the plan: 1- jQuery Bootgrid and Datatables.net will coexist within Wok and we will update Ginger panel by panel until there isn't a trace of jQuery Bootgrid. 2- Update Software Updates to Datatables.net 3- Update User Logs to Datatables.net 4- Remove jQuery Bootgrid from Wok 5- Update Kimchi Storage to Datatables.net (at least the main table can be replaced, the Storage Volumes view would have to keep the old wok.datagrid because of the Gallery/List switch) 6- Update Kimchi Network to Datatables.net 7- Rename or rewrite wok.datagrid to something else like wok.gallery-view for Kimchi Guests, Templates and Storage Volumes About Datatables.net: 1- License: https://datatables.net/faqs/index#Licensing<https://datatables.net/faqs/index%23Licensing> 2- Support: Although the license is MIT, they offer a paid and the community support - https://datatables.net/support/index 3- API Examples: https://datatables.net/examples/index 4- Manual: https://datatables.net/manual/index 5- Styling (spoiler alert: they support almost every CSS library): https://datatables.net/examples/styling/bootstrap.html Let me know your opinions. Regards, Samuel

1 0

[PATCH] [Kimchi] Handle URLError exception when creating Template.
by pvital＠linux.vnet.ibm.com 23 Jun '16

23 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> urllib2 raised URLError when could not access a remote file due to unauthorized access, for example. This patch gives to VMTemplate the ability of handle this exception and raises a relevant error message to user. This patch fixes Issue #959 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 1 + vmtemplate.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/i18n.py b/i18n.py index 2d8390f..b33c6ec 100644 --- a/i18n.py +++ b/i18n.py @@ -52,6 +52,7 @@ messages = { "to file access control lists for '%(user)s' user if possible, or add the " "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'." "Details: %(err)s" ), + "KCHISO0009E": _("Unable to access remote ISO. Details: %(err)s"), "KCHIMG0001E": _("An error occurred when probing image OS information."), "KCHIMG0003E": _("Unable to read image file %(filename)s"), diff --git a/vmtemplate.py b/vmtemplate.py index ef92914..6faf4c5 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -24,6 +24,7 @@ import urlparse import uuid from lxml import etree from lxml.builder import E +from urllib2 import URLError from wok.exception import InvalidParameter, ImageFormatError, IsoFormatError from wok.exception import MissingParameter, OperationFailed @@ -172,6 +173,8 @@ class VMTemplate(object): return iso_img.probe() except IsoFormatError: raise InvalidParameter("KCHISO0001E", {'filename': iso}) + except URLError as e: + raise OperationFailed("KCHISO0009E", {'err': e}) def _get_cdrom_xml(self, libvirt_stream_protocols): if 'cdrom' not in self.info: -- 2.5.5

4 6

[PATCH] [Kimchi] Fixing Opensuse Leap package name
by dhbarboza82＠gmail.com 23 Jun '16

23 Jun '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> In Opensuse Leap 42.1, 'python-pillow' is named 'python-Pillow'. This subtle change was enough to break Kimchi RPM install in that system. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.suse.in | 2 +- docs/opensuse-deps.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index c12bcab..3d0896b 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -17,7 +17,7 @@ Requires: libvirt-daemon-config-network Requires: python-websockify Requires: python-configobj Requires: novnc -Requires: python-pillow +Requires: python-Pillow Requires: python-parted Requires: python-psutil >= 0.6.0 Requires: python-jsonschema >= 1.3.0 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a8763b3..a69dacd 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -34,7 +34,7 @@ Runtime Dependencies nfs-client open-iscsi python-parted \ python-libguestfs python-configobj guestfs-tools \ python-websockify novnc python-magic \ - python-paramiko python-pillow + python-paramiko python-Pillow Packages required for UI development ------------------------------------ -- 2.5.5

2 1

[PATCH] [Kimchi] Issue #948: Kimchi not throwing errors when migration is performed and gives impression of migration doesn't work
by sguimaraes943＠gmail.com 23 Jun '16

23 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes an issue related to error messages not being captured by failed live migration tasks. This requires Wok patch for issue #79 otherwise it will repeat error messages once the guests list is refreshed. Samuel Guimarães (1): Issue #948: Kimchi not throwing errors when migration is performed and gives impression of migration doesn't work ui/js/src/kimchi.guest_main.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) -- 1.8.3.1

2 2

[PATCH] [Wok] Issue #79: All error messages should keep on UI until user dismiss it
by sguimaraes943＠gmail.com 23 Jun '16

23 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit makes all messages closeable by default, removing the fade animation after 10 seconds. A parameter to allow a custom ID for each alert was also added to wok.message function. v2: - Fixed an issue where some alerts were not dismissible; - This commit also fixes a bug where alert "close" buttons would close modal windows. Samuel Guimarães (1): Issue #79: All error messages should keep on UI until user dismiss it ui/js/src/wok.message.js | 69 +++++++++++++++++++++++++----------------------- ui/js/src/wok.window.js | 2 +- 2 files changed, 37 insertions(+), 34 deletions(-) -- 1.8.3.1

1 0

[PATCH][Kimchi] Avoid break Wok when register events, if Libvirt is down
by Rodrigo Trujillo 23 Jun '16

23 Jun '16

When Wok starts up it loads Kimcho model, which tries to register Libvirt events. A problem happens if Libvirt service is down when Wok starts (usually manually/command line start up), because the connection is None, raising an error that breaks Wok. This patch fixes this problem and return a proper log message. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 632d399..cb06cf0 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -76,8 +76,13 @@ class LibvirtEvents(object): """ Register Libvirt IO_ERROR_REASON event to handle host ENOSPC """ + libv_conn = conn.get() + if libv_conn is None: + wok_log.error("Register of ENOSPC event failed because Libvirt " + "service seems to be not running") + return try: - conn.get().domainEventRegisterAny( + libv_conn.domainEventRegisterAny( None, libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, self.event_enospc_cb, -- 2.1.0

3 3

[PATCH] [Wok] Issue #79: All error messages should keep on UI until user dismiss it
by sguimaraes943＠gmail.com 23 Jun '16

23 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit makes all messages closeable by default, removing the fade animation after 10 seconds. A parameter to allow a custom ID for each alert was also added to wok.message function. Samuel Guimarães (1): Issue #79: All error messages should keep on UI until user dismiss it ui/js/src/wok.message.js | 53 +++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 25 deletions(-) -- 1.8.3.1

3 3

[PATCH V2] [Kimchi 0/2] Updates to support Fedora 24
by pvital＠linux.vnet.ibm.com 22 Jun '16

22 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V1 -> V2: - Fix missing "," V1: This patch-set adds support to recognize Fedora 24 ISO images and add new optins for remote Fedora images. Paulo Vital (2): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. distros.d/fedora.json | 32 +++++++++++++++++++++++--------- isoinfo.py | 1 + 2 files changed, 24 insertions(+), 9 deletions(-) -- 2.5.5

2 3

[PATCH] [Kimchi 0/2] Updates to support Fedora 24
by pvital＠linux.vnet.ibm.com 22 Jun '16

22 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set adds support to recognize Fedora 24 ISO images and add new optins for remote Fedora images. Paulo Vital (2): Issue #965: Recognize Fedora 24 ISO image. Update Fedora remote images. distros.d/fedora.json | 32 +++++++++++++++++++++++--------- isoinfo.py | 1 + 2 files changed, 24 insertions(+), 9 deletions(-) -- 2.5.5

3 5

[RFC] Replace jQuery Bootgrid with Datatables.net
by Samuel Henrique De Oliveira Guimaraes 21 Jun '16

21 Jun '16

Hi team, As part of the redesign process of some Ginger and Gingerbase panels, one of the main issues is that the jQuery Bootgrid tables are not exactly fitting with the Design Spec. If you compare System Modules and System Services tables with Kimchi they look and feel like part of the same application but if you navigate through Ginger Network and Storage tabs, there are some alignment and spacing issues. Most of these UI glitches could be fixed with plain CSS and / or editing jQuery Bootgrid "formatters" but we already faced some issues with the Software Updates and Network Configuration that required some workarounds that were not documented by jQuery Bootgrid authors. Based on that, I suggested to Aline and Daniel if we could redesign these panels using Datatables.net instead of just shaping Bootgrid with CSS changes that may require rework once or if we update Bootgrid library due security or any other reason. I've mentioned before that we would probably have to update to this library if we decided to use Bootstrap 4 in the future but it seems that we may need to change the library and rewrite some panels a little bit earlier. For the UI development it makes sense to use this library instead of adding "native" sort, filters and paging to wok.datagrid component because it has a larger community, a support board and tons of documented examples. Plus, it already has accessibility improvements that we would have to manually implement to our panels. In the future we could even drop wok.datagrid entirely and port everything that doesn't have a Gallery / List view design pattern to Datatables.net. Here's the plan: 1- jQuery Bootgrid and Datatables.net will coexist within Wok and we will update Ginger panel by panel until there isn't a trace of jQuery Bootgrid. 2- Update Software Updates to Datatables.net 3- Update User Logs to Datatables.net 4- Remove jQuery Bootgrid from Wok 5- Update Kimchi Storage to Datatables.net (at least the main table can be replaced, the Storage Volumes view would have to keep the old wok.datagrid because of the Gallery/List switch) 6- Update Kimchi Network to Datatables.net 7- Rename or rewrite wok.datagrid to something else like wok.gallery-view for Kimchi Guests, Templates and Storage Volumes About Datatables.net: 1- License: https://datatables.net/faqs/index#Licensing<https://datatables.net/faqs/index%23Licensing> 2- Support: Although the license is MIT, they offer a paid and the community support - https://datatables.net/support/index 3- API Examples: https://datatables.net/examples/index 4- Manual: https://datatables.net/manual/index 5- Styling (spoiler alert: they support almost every CSS library): https://datatables.net/examples/styling/bootstrap.html Let me know your opinions. Regards, Samuel

1 0

[PATCH V2] [Kimchi] Handle URLError exception when creating Template.
by pvital＠linux.vnet.ibm.com 21 Jun '16

21 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> urllib2 raised URLError when could not access a remote file due to unauthorized access, for example. This patch gives to IsoImage the ability to handle this exception and raises a relevant error message to user. This patch fixes Issue #959 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 1 + isoinfo.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/i18n.py b/i18n.py index 2d8390f..b33c6ec 100644 --- a/i18n.py +++ b/i18n.py @@ -52,6 +52,7 @@ messages = { "to file access control lists for '%(user)s' user if possible, or add the " "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'." "Details: %(err)s" ), + "KCHISO0009E": _("Unable to access remote ISO. Details: %(err)s"), "KCHIMG0001E": _("An error occurred when probing image OS information."), "KCHIMG0003E": _("Unable to read image file %(filename)s"), diff --git a/isoinfo.py b/isoinfo.py index 4cb0209..7c000b7 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -28,7 +28,7 @@ import sys import urllib2 -from wok.exception import IsoFormatError +from wok.exception import IsoFormatError, OperationFailed from wok.plugins.kimchi.utils import check_url_path from wok.utils import wok_log @@ -419,11 +419,14 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ def _get_iso_data(self, offset, size): if self.remote: - request = urllib2.Request(self.path) - range_header = "bytes=%d-%d" % (offset, offset + size - 1) - request.add_header("range", range_header) - with contextlib.closing(urllib2.urlopen(request)) as response: - data = response.read() + try: + request = urllib2.Request(self.path) + range_header = "bytes=%d-%d" % (offset, offset + size - 1) + request.add_header("range", range_header) + with contextlib.closing(urllib2.urlopen(request)) as response: + data = response.read() + except urllib2.URLError as e: + raise OperationFailed("KCHISO0009E", {'err': e}) else: with open(self.path) as fd: fd.seek(offset) -- 2.5.5

2 1

[PATCH] [WoK] Github #138: fix loadash Makefile.am
by dhbarboza82＠gmail.com 21 Jun '16

21 Jun '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Co-authored-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> The path to lodashdir was wrong and was breaking WoK startup when executing into RPM. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/libs/lodash/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/libs/lodash/Makefile.am b/ui/libs/lodash/Makefile.am index 25c9cb1..f534901 100644 --- a/ui/libs/lodash/Makefile.am +++ b/ui/libs/lodash/Makefile.am @@ -16,6 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -lodashdir = $(datadir)/wok/ui/libs/lodash.js +lodashdir = $(datadir)/wok/ui/libs/lodash dist_lodash_DATA = $(wildcard *.js) $(NULL) -- 2.5.5

2 1

[PATCH][Wok] UI: Create notification-container and make notifications persistent
by Rodrigo Trujillo 21 Jun '16

21 Jun '16

There is an issue in frontend that does not allow notification messages to be showed more than once if the problem happens again. Also, when notifications are created, they are showed in different parts of the UI, for each plugin or plugin tab (usually in the alert-container). If some window does not have alert-container, the notification is not showed. This patch creates a notificatoin-container 'on-the-fly' in the windows that Wok is displaying and shows the notification. Notification is check by its message content, instead of the code ID, allowing multiple similar notifications but with different subjects (like different VM names). Notifications are showed again if message was closed but backend returns the same notification massage. Before, messages were nevermore display. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/css/src/wok.scss | 4 ++++ ui/css/wok.css | 4 ++++ ui/js/src/wok.main.js | 1 - ui/js/src/wok.utils.js | 13 ++++++++----- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss index c4a81d4..0672cdb 100755 --- a/ui/css/src/wok.scss +++ b/ui/css/src/wok.scss @@ -142,6 +142,10 @@ body { } } +#notification-container .alert { + margin: 10px; +} + // Login @import "modules/login"; // Topbar and navigation diff --git a/ui/css/wok.css b/ui/css/wok.css index 96b9e6e..6da0aa8 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -133,6 +133,10 @@ body { cursor: not-allowed !important; } +#notification-container .alert { + margin: 10px; +} + .login .content .container { width: 100% !important; padding-left: 0 !important; diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 55b8d0d..1d49c9e 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -19,7 +19,6 @@ */ wok.NOTIFICATION_INTERVAL = 2000 -wok.postedNotifications = [] wok.tabMode = {}; wok.config = undefined; diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 236bf0a..54f8cf0 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -214,12 +214,15 @@ wok.notificationsLoop = function notificationsLoop() { function(notifications){ if(notifications && notifications.length > 0) { $.each(notifications, function(i, notif) { - if (wok.postedNotifications.indexOf(notif.message) == -1) { - wok.message.notify(notif, '#message-container-area'); - wok.postedNotifications.push(notif.message); + // Check if notification is being displayed + if (!$("#notification-container").length) { + $('.navbar.toolbar').next().prepend('<div id="notification-container"></div>'); } - }) - }; + if (($("#notification-container").find("div:contains('" + notif.message + "')").length) == 0) { + wok.message.notify(notif, '#notification-container'); + } + }); + } setTimeout(notificationsLoop, wok.NOTIFICATION_INTERVAL); }, function(data){ -- 2.1.0

3 2

[PATCH V3] [Wok 0/2] Remove support for TLS v1.0 and add SSL timeout
by Lucio Correia 21 Jun '16

21 Jun '16

Changes in V3: * fixed tests Lucio Correia (2): Remove support for TLS v1.0 and add SSL timeout Update tests src/nginx/wok.conf.in | 3 ++- src/wok/proxy.py | 1 + tests/utils.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) -- 1.9.1

2 3

[PATCH] [Kimchi] Add UI netboot support for adding templates
by Socorro Stoppler 20 Jun '16

20 Jun '16

This patch adds UI support for netboot template. Due to this, the radio buttons have been reintroduced in add template to choose between current choice (image, iso - local and remote which has been combined into one panel) and netboot template. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 73 ++++++++++++++++++++++++++++++++--- ui/pages/template-add.html.tmpl | 27 +++++++++---- 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 948f710..ed020d3 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,56 @@ 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..e5c7aa5 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -30,6 +30,13 @@ <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"> @@ -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

2 1

[PATCH][Kimchi] Recognize different interfaces type when cloning vm
by Ramon Medeiros 20 Jun '16

20 Jun '16

When cloning a VM, it's needed to add a new mac address. model/vms.py was selection <interface type=network /> only. Using correct xpath framework, now all <interface> tag with type as attribute and <mac address> as a subelement, is selected. After all, they will received new mac address. This way, it's not needed to check if the interfaces has it own mac address. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/model/vms.py b/model/vms.py index f069c4e..9753a10 100644 --- a/model/vms.py +++ b/model/vms.py @@ -83,12 +83,10 @@ VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', 'name', 'users'] +XPATH_DOMAIN_CHANGE_MAC = "./devices/interface[@type='%s']/mac[@address='%s']" 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_MEMORY = '/domain/memory' XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' @@ -97,6 +95,7 @@ XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' XPATH_CPU = './cpu' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' +XPATH_MAC = "./devices/interface[@type]/mac/[@address]" XPATH_TOPOLOGY = './cpu/topology' XPATH_VCPU = './vcpu' XPATH_MAX_MEMORY = './maxMemory' @@ -417,19 +416,25 @@ class VMModel(object): The XML descriptor <xml> with the new MAC addresses instead of the old ones. """ - old_macs = xpath_get_text(xml, XPATH_DOMAIN_MAC) - new_macs = [] + # get dict with macs and interfaces + old_macs_int = {} + for node in ET.fromstring(xml).findall(XPATH_MAC): + old_macs_int[node.get("address")] = node.getparent().get("type") - for mac in old_macs: + # update mac address + new_macs = [] + for mac_addr in old_macs_int: while True: new_mac = model.vmifaces.VMIfacesModel.random_mac() # make sure the new MAC doesn't conflict with the original VM # and with the new values on the new VM. - if new_mac not in (old_macs + new_macs): + if new_mac not in (old_macs_int.keys() + new_macs): new_macs.append(new_mac) break - xml = xml_item_update(xml, XPATH_DOMAIN_MAC_BY_ADDRESS % mac, + dev_type = old_macs_int[mac_addr] + xml = xml_item_update(xml, XPATH_DOMAIN_CHANGE_MAC % (dev_type, + mac_addr), new_mac, 'address') return xml -- 2.5.5

2 2

Re: [Kimchi-devel] [PATCH V2] [Kimchi 0/2] Fix VM name conflicts with snapshot reverts
by Aline Manera 20 Jun '16

20 Jun '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Kimchi] Use qxl driver only for x86
by Lucio Correia 20 Jun '16

20 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- osinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osinfo.py b/osinfo.py index 4b89aac..a3c2b0e 100644 --- a/osinfo.py +++ b/osinfo.py @@ -74,7 +74,7 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', tablet_bus='usb')}} -custom_specs = {'fedora': {'22': dict(video_model='qxl')}} +custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', @@ -233,7 +233,7 @@ def lookup(distro, version): specs = custom_specs.get(distro, {}) for v, config in specs.iteritems(): if LooseVersion(version) >= LooseVersion(v): - params.update(config) + params.update(config.get(arch, {})) if distro in icon_available_distros: params['icon'] = 'plugins/kimchi/images/icon-%s.png' % distro -- 1.9.1

3 2

[PATCH][Kimchi] Fix typo in API.md
by Rodrigo Trujillo 20 Jun '16

20 Jun '16

--- docs/API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/API.md b/docs/API.md index 7072ab2..84ef7c9 100644 --- a/docs/API.md +++ b/docs/API.md @@ -908,7 +908,7 @@ List of available groups. Other available values are "fc_host", "net", "pci", "scsi", "storage", "system", "usb" and "usb_device". * _passthrough: Filter devices eligible to be assigned to guest - directly. Possible values are "ture" and "false". + directly. Possible values are "true" and "false". * _passthrough_affected_by: Filter the affected devices in the same group of a certain directly assigned device. The value should be the name of a device. -- 2.1.0

4 3

[PATCH V4] [Kimchi 0/3] Fix VM name conflicts with snapshot reverts
by Lucio Correia 20 Jun '16

20 Jun '16

Changes in V4: * Fixed test_rest Lucio Correia (3): Always update snapshot XML with new name and UUID Use ASCII name in XML Update tests to reflect new behavior model/vms.py | 14 ++++++++++++-- tests/test_model.py | 41 ++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 23 deletions(-) -- 1.9.1

3 8

[PATCH V2] [Wok] Remove support for TLS v1.0 and add SSL timeout
by Lucio Correia 20 Jun '16

20 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 3 ++- src/wok/proxy.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) Changes in V2: * read timeout value from config diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index 8dd5d7c..cb05e4d 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -62,10 +62,11 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + 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; diff --git a/src/wok/proxy.py b/src/wok/proxy.py index 9d39dbd..a74e88a 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -102,6 +102,7 @@ def _create_proxy_config(options): websockets_port=options.websockets_port, cert_pem=cert, cert_key=key, max_body_size=eval(options.max_body_size), + session_timeout=options.session_timeout, dhparams_pem=dhparams_pem) # Write file to be used for nginx. -- 1.9.1

3 2

[PATCH v2][Kimchi] Issue #962: Suggestion to check spec guidelines
by Ramon Medeiros 17 Jun '16

17 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Verify if rpmlint is installed (this will prevent break on debian based systems) Makefile.am | 5 ++++- check_spec_errors.sh | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 1b46773..0018287 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,10 @@ check-local: && echo "ERROR: Whitespaces found" || echo "Ok"; \ echo "IBM copyright year verification ..." ; \ /bin/bash ../../../../check-IBM-license-header.sh ; \ - fi + fi; + @if [ -f $(RPMLINT) ]; then \ + ./check_spec_errors.sh; \ + fi; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..5e43d8b --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,36 @@ +#!/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-1301 USA + +echo "Checking spec guidelines" + +# create links +cp contrib/kimchi.spec.fedora contrib/kimchi_fedora.spec +cp contrib/kimchi.spec.suse contrib/kimchi_suse.spec + +# run checking +rpmlint contrib/kimchi_fedora.spec +rpmlint contrib/kimchi_suse.spec + +# remove links +rm contrib/kimchi_fedora.spec +rm contrib/kimchi_suse.spec + + diff --git a/configure.ac b/configure.ac index 870ac0c..cafff0c 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AM_INIT_AUTOMAKE([-Wno-portability]) AM_PATH_PYTHON([2.6]) AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8]) AC_PATH_PROG([GIT], [git], [/usr/bin/git]) +AC_PATH_PROG([RPMLINT], [rpmlint], [/usr/bin/rpmlint]) AC_PYTHON_MODULE([unittest]) AC_SUBST([HAVE_PYMOD_UNITTEST]) AC_SUBST([PYTHON_VERSION]) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ca24994..65ad987 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -47,7 +47,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests python-mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a8763b3..16ffb5e 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -45,4 +45,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock rpmlint -- 2.5.5

1 0

[PATCH v2][Wok] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 17 Jun '16

17 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- v2: Verify if rpmlint is installed (this will prevent break on debian based systems) Makefile.am | 4 ++++ check_spec_errors.sh | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 325d0c9..6d3588a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,10 @@ check-local: echo "Check IBM license header and copyright date ..." ; \ /bin/bash check-IBM-license-header.sh ; \ fi + @if [ -f $(RPMLINT) ]; then \ + ./check_spec_errors.sh; \ + fi; + # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..e5f47f4 --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,36 @@ +#!/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-1301 USA + +echo "Checking spec guidelines" + +# create links +cp contrib/wok.spec.fedora contrib/wok_fedora.spec +cp contrib/wok.spec.suse contrib/wok_suse.spec + +# run checking +rpmlint contrib/wok_fedora.spec +rpmlint contrib/wok_suse.spec + +# remove links +rm contrib/wok_fedora.spec +rm contrib/wok_suse.spec + + diff --git a/configure.ac b/configure.ac index 002774d..4d34e88 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,7 @@ AM_INIT_AUTOMAKE([-Wno-portability]) AM_PATH_PYTHON([2.6]) AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8]) AC_PATH_PROG([GIT], [git], [/usr/bin/git]) +AC_PATH_PROG([RPMLINT], [rpmlint], [/usr/bin/rpmlint]) AC_PYTHON_MODULE([unittest]) AC_SUBST([HAVE_PYMOD_UNITTEST]) AC_SUBST([PYTHON_VERSION]) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index e665cdb..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests + $ sudo yum install pyflakes python-pep8 python-requests rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 4fe3876..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -29,4 +29,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests rpmlint -- 2.5.5

1 0

[PATCH] [Kimchi] Add loading icon for guests tab
by Socorro Stoppler 17 Jun '16

17 Jun '16

Add 'loading' icon when in Guests tab as it may take a while to get the list of guests to appear Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2f5e757..fea8054 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'); //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"); @@ -418,10 +418,12 @@ kimchi.listVmsAuto = function() { }); }); } + $('.wok-mask').fadeOut(300, function() {}); } else { $('.grid-control').addClass('hidden'); $('#guestListField').hide(); $('#noGuests').show(); + $('.wok-mask').fadeOut(300, function() {}); } } -- 2.5.0

3 2

[PATCH] [Kimchi] Save view for Guests tab
by Socorro Stoppler 17 Jun '16

17 Jun '16

This patch addresses the issue of the last view of the Guests tab 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 Guests tab, whatever view it was last on should be what is shown when going back to the Guests tab. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2f5e757..fe6d48d 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -801,15 +801,64 @@ kimchi.guestSetRequestHeader = function(xhr) { }; kimchi.toggleGuestsGallery = function() { - $(".wok-guest-list, .wok-guest-gallery").toggleClass("wok-guest-list wok-guest-gallery"); - $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); - var text = $('#guest-gallery-table-button span.text').text(); - $('#guest-gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + $(".wok-guest-list, .wok-guest-gallery").toggleClass("wok-guest-list wok-guest-gallery"); + $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); + var text = $('#guest-gallery-table-button span.text').text(); + $('#guest-gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + var buttonText = $('#guest-gallery-table-button span.text').text(); + if (buttonText.indexOf("Gallery") !== -1) { + // Currently in list view + kimchi.setGuestView("guestView", "list"); + } else { + // Currently in gallery + kimchi.setGuestView("guestView", "gallery"); + } +}; + +kimchi.setGuestView = function(name, value) { + window.localStorage.setItem(name, value); +}; + +kimchi.readGuestView = function(name) { + var viewName = window.localStorage.getItem(name); + if (viewName !== "") { + return viewName; + } else { + return null; + } +}; + +kimchi.showGuestGallery = function() { + $(".wok-guest-list").addClass("wok-guest-gallery"); + $(".wok-list").addClass("wok-gallery"); + $(".wok-guest-gallery").removeClass("wok-guest-list"); + $(".wok-gallery").removeClass("wok-list"); + $('#guest-gallery-table-button span.text').text(i18n['KCHTMPL6004M']); +}; + +kimchi.showGuestList = function() { + $(".wok-guest-list").removeClass("wok-guest-gallery"); + $(".wok-list").removeClass("wok-gallery"); + $(".wok-guest-gallery").addClass("wok-guest-list"); + $(".wok-gallery").addClass("wok-list"); + $('#guest-gallery-table-button span.text').text(i18n['KCHTMPL6005M']); }; kimchi.guest_main = function() { $('body').addClass('wok-list'); - + var viewFound = kimchi.readGuestView("guestView"); + if (viewFound) { + if(viewFound === "gallery") { + // should be showing gallery + kimchi.showGuestGallery(); + } else { + // Should be showing list + kimchi.showGuestList(); + } + } else { + // Default to showing list + kimchi.showGuestList(); + } if (wok.tabMode['guests'] === 'admin') { $('.tools').attr('style', 'display'); $("#vm-add").on("click", function(event) { -- 2.5.0

2 1

[PATCH][Kimchi] Improve UI error codes checking
by Ramon Medeiros 17 Jun '16

17 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- check_ui_code_errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 59d631f..58dd231 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'KCH[0-9A-Z]*'| sort)" -uiErrors="$(grep -Ro 'KCH[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" +uiErrors="$(grep -ERo 'KCH[0-9A-Z]+' ui/js/ | cut -d: -f2 | sort| uniq)" # all errors on i18n are present in js/html files: success if [ "$errors" == "$uiErrors" ]; then -- 2.5.5

2 1

[PATCH] [Wok] Remove support for TLS v1.0 and add SSL timeout
by Lucio Correia 17 Jun '16

17 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index 8dd5d7c..f56f5c0 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -62,10 +62,11 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + 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 10m; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 1.9.1

3 2

[PATCH] [Wok] Reduce from 5 to 2 seconds between notification requests
by Lucio Correia 16 Jun '16

16 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 2146b3d..55b8d0d 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -18,7 +18,7 @@ * limitations under the License. */ -wok.NOTIFICATION_INTERVAL = 5000 +wok.NOTIFICATION_INTERVAL = 2000 wok.postedNotifications = [] wok.tabMode = {}; -- 1.9.1

3 2

[PATCH] [Wok] Added lodash.js library to Wok
by sguimaraes943＠gmail.com 16 Jun '16

16 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Lodash makes JavaScript easier by taking the hassle out of working with arrays, numbers, objects, strings, etc. This library is necessary in order to redesign Ginger Sensor Monitors. With this library we can also improve other panels that have dynamically generated content that we have to iterate through arrays of objects. If the patch doesn't apply because it is a minified library, please let me know. Samuel Guimarães (1): Added lodash.js library to Wok configure.ac | 1 + ui/libs/Makefile.am | 2 +- ui/libs/lodash/LICENSE | 24 +++++++++ ui/libs/lodash/Makefile.am | 21 ++++++++ ui/libs/lodash/lodash.js | 127 +++++++++++++++++++++++++++++++++++++++++++++ ui/pages/login.html.tmpl | 1 + ui/pages/wok-ui.html.tmpl | 1 + 7 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 ui/libs/lodash/LICENSE create mode 100644 ui/libs/lodash/Makefile.am create mode 100644 ui/libs/lodash/lodash.js -- 1.9.3

4 4

[PATCH][Wok] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 16 Jun '16

16 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 1 + check_spec_errors.sh | 34 ++++++++++++++++++++++++++++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 325d0c9..579f707 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ check-local: echo "Check IBM license header and copyright date ..." ; \ /bin/bash check-IBM-license-header.sh ; \ fi + /bin/bash check_spec_errors.sh; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..fa67ced --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2015-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 + +# create links +cp contrib/wok.spec.fedora contrib/wok_fedora.spec +cp contrib/wok.spec.suse contrib/wok_suse.spec + +# run checking +rpmlint contrib/wok_fedora.spec +rpmlint contrib/wok_suse.spec + +# remove links +rm contrib/wok_fedora.spec +rm contrib/wok_suse.spec + + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index e665cdb..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests + $ sudo yum install pyflakes python-pep8 python-requests rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 4fe3876..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -29,4 +29,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests rpmlint -- 2.5.5

3 4

[PATCH v2][Wok] Improve UI error codes checking
by Ramon Medeiros 16 Jun '16

16 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Use "+" instead of "*". This expression only match WOKXXXXXX, and no more WOK, what was causing trouble before check_ui_code_errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 4d9a8bd..6b7ea7e 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)" -uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" +uiErrors="$(grep -ERo 'WOK[0-9A-Z]+' ui/js/ | cut -d: -f2 | sort| uniq)" # all errors on i18n are present in js/html files: success if [ "$errors" == "$uiErrors" ]; then -- 2.5.5

3 3

[PATCH v2][Wok 0/2] Issue #118: logrotate fails
by Ramon Medeiros 16 Jun '16

16 Jun '16

Changes: v2: Add option to change log size on wok.conf Ramon Medeiros (2): Issue #118: logrotate fails Allow wok.conf determine log file size Makefile.am | 2 -- contrib/Makefile.am | 1 - contrib/wok.spec.fedora.in | 1 - contrib/wok.spec.suse.in | 1 - contrib/wokd.logrotate.in | 9 --------- src/wok.conf.in | 3 +++ src/wok/config.py.in | 1 + src/wok/server.py | 20 ++++++++++++++------ 8 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 contrib/wokd.logrotate.in -- 2.5.5

2 3

[PATCH][Kimchi] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 16 Jun '16

16 Jun '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 1 + check_spec_errors.sh | 34 ++++++++++++++++++++++++++++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 1b46773..85a44bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ check-local: echo "IBM copyright year verification ..." ; \ /bin/bash ../../../../check-IBM-license-header.sh ; \ fi + ./check_spec_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..b25da58 --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2015-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 + +# create links +cp contrib/kimchi.spec.fedora contrib/kimchi_fedora.spec +cp contrib/kimchi.spec.suse contrib/kimchi_suse.spec + +# run checking +rpmlint contrib/kimchi_fedora.spec +rpmlint contrib/kimchi_suse.spec + +# remove links +rm contrib/kimchi_fedora.spec +rm contrib/kimchi_suse.spec + + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ca24994..65ad987 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -47,7 +47,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests python-mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a8763b3..16ffb5e 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -45,4 +45,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock rpmlint -- 2.5.5

2 2

[PATCH] [Wok] Refresh functionality to user activity log
by peterpnns＠gmail.com 16 Jun '16

16 Jun '16

From: peterpennings <peterpnns(a)gmail.com> This patch turns possible to refresh the list of user activity log. peterpennings (1): Refresh functionality to user activity log ui/js/wok.user-log.js | 23 ++++++++--------------- ui/pages/tabs/settings.html.tmpl | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) -- 2.5.0

3 3

[PATCH] [Kimchi] Fix storage volume clone test case
by Aline Manera 15 Jun '16

15 Jun '16

Commit c9ea5072b changed the target_uri of a cloning storage volume to distinguish it from a storage volume creation by appeding '/clone' to the end of the target_uri. But the test case was not properly updated. So do that to avoid issues while running 'make check'. Without this patch a test case is failing: [alinefm@alinefm-TP440 tests]$ sudo ./run_tests.sh test_mock_storagevolume.MockStorageVolumeTests.test_storagevolume ***** Running unit test: test_mock_storagevolume.MockStorageVolumeTests.test_storagevolume... FAILED ====================================================================== FAIL: test_storagevolume (test_mock_storagevolume.MockStorageVolumeTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_mock_storagevolume.py", line 99, in test_storagevolume _do_volume_test(self, model, host, ssl_port, pool_name) File "test_model_storagevolume.py", line 141, in _do_volume_test self.assertEquals(200, resp.status) AssertionError: 200 != 404 ---------------------------------------------------------------------- Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- tests/test_model_storagevolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index 56dda8f..35cb51d 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -126,7 +126,7 @@ def _do_volume_test(self, model, host, ssl_port, pool_name): resp = self.request(vol_uri + '/clone', '{}', 'POST') self.assertEquals(202, resp.status) task = json.loads(resp.read()) - cloned_vol_name = task['target_uri'].split('/')[-1] + cloned_vol_name = task['target_uri'].split('/')[-2] rollback.prependDefer(model.storagevolume_delete, pool_name, cloned_vol_name) wait_task(_task_lookup, task['id']) -- 2.5.5

2 2

[PATCH][Kimchi] Change PPC memory slots to 256
by Rodrigo Trujillo 15 Jun '16

15 Jun '16

PowerPC architecture now supports up to 256 memory devices for memory hotplug operations. --- model/vms.py | 7 ++++--- osinfo.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/model/vms.py b/model/vms.py index 58ff28d..795a251 100644 --- a/model/vms.py +++ b/model/vms.py @@ -58,7 +58,7 @@ from wok.plugins.kimchi.model.utils import get_ascii_nonascii_name, get_vm_name from wok.plugins.kimchi.model.utils import get_metadata_node from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node -from wok.plugins.kimchi.osinfo import defaults +from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot from wok.plugins.kimchi.utils import get_next_clone_name from wok.plugins.kimchi.utils import template_name_from_uri @@ -994,8 +994,9 @@ class VMModel(object): {'param': "Memory", 'mem': str(new_mem), 'alignment': str(PPC_MEM_ALIGN)}) - # PPC suports only 32 memory slots - if len(xpath_get_text(xml, './devices/memory')) == 32: + # Check number of slots supported + if len(xpath_get_text(xml, './devices/memory')) == \ + MEM_DEV_SLOTS[os.uname()[4]]: raise InvalidOperation('KCHVM0045E') if memory == 0: diff --git a/osinfo.py b/osinfo.py index d3909ad..4b89aac 100644 --- a/osinfo.py +++ b/osinfo.py @@ -35,8 +35,8 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), # Memory devices slot limits by architecture -MEM_DEV_SLOTS = {'ppc64': 32, - 'ppc64le': 32, +MEM_DEV_SLOTS = {'ppc64': 256, + 'ppc64le': 256, 'x86_64': 256, 'i686': 256, 'i386': 256} @@ -184,7 +184,7 @@ def _get_tmpl_defaults(): defaults['graphics'] = default_config.pop('graphics') # Setting default memory device slots - defaults['mem_dev_slots'] = MEM_DEV_SLOTS.get(os.uname()[4], 32) + defaults['mem_dev_slots'] = MEM_DEV_SLOTS.get(os.uname()[4], 256) return defaults -- 2.1.0

4 3

[PATCH V3] [Kimchi 0/3] Fix VM name conflicts with snapshot reverts
by Lucio Correia 14 Jun '16

14 Jun '16

Changes in V3: * Use ASCII name in XML * Fix tests Lucio Correia (3): Always update snapshot XML with new name and UUID Use ASCII name in XML Update tests to reflect new behavior mockmodel.py | 7 +++++++ model/vms.py | 14 ++++++++++++-- tests/test_model.py | 41 ++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 23 deletions(-) -- 1.9.1

1 4

[PATCH V2] [Wok 0/3] User Request Log improvements
by Lucio Correia 14 Jun '16

14 Jun '16

Changes in V2: * updated logs.md * added test cases IMPORTANT: test will fail if old log entries are present in the system. Lucio Correia (3): Include user IP address in request log messages Log time in ISO format Add test cases for user logs docs/API/logs.md | 1 + src/wok/control/base.py | 10 ++++++---- src/wok/reqlogger.py | 32 ++++++++++++++++++++++++-------- src/wok/root.py | 6 ++++-- tests/test_api.py | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 14 deletions(-) -- 1.9.1

2 4

Security concerns with user credential
by Suresh Babu Angadi 14 Jun '16

14 Jun '16

Hi All, Any thoughts on issues https://github.com/kimchi-project/wok/issues/134 and https://github.com/kimchi-project/ginger/issues/356? -- Regards, Suresh Babu Angadi

1 0

[PATCH] [Wok] Fix for filter break for numbers formatted for locale fr-FR
by pkulkark＠linux.vnet.ibm.com 14 Jun '16

14 Jun '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch fixes the filter breaking issue on numbers formatted as per fr-FR locale, by replacing the non-breaking spaces introduced by the formatting, with breaking spaces. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..76477fd 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -263,7 +263,11 @@ wok.localeConverters = { }, "number-locale-converter":{ to: function(number){ - return wok.numberLocaleConverter(number, wok.lang.get_locale()); + if (number == null) { + return 'Unknown'; + } + format_value = wok.numberLocaleConverter(number, wok.lang.get_locale()); + return format_value.toString().replace(/\s/g,' '); //replace non-breaking space with breaking space } } } -- 2.1.0

4 3

Re: [Kimchi-devel] [PATCH] [Wok 2/2] Log time in ISO format
by Aline Manera 14 Jun '16

14 Jun '16

The same I commented on patch 1. Update the API.md as this patch also changed the API and add/change the test cases to confirm it keeps working. On 06/03/2016 06:40 PM, Lucio Correia wrote: > Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> > --- > src/wok/reqlogger.py | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py > index 2ec62b8..6f32c44 100644 > --- a/src/wok/reqlogger.py > +++ b/src/wok/reqlogger.py > @@ -23,9 +23,9 @@ import json > import logging > import logging.handlers > import os.path > +import time > > from cherrypy.process.plugins import BackgroundTask > -from datetime import datetime > from tempfile import NamedTemporaryFile > > from wok.config import config, get_log_download_path > @@ -37,11 +37,12 @@ from wok.utils import ascii_dict, remove_old_files > FILTER_FIELDS = ['app', 'date', 'download', 'ip', 'req', 'user', 'time'] > LOG_DOWNLOAD_URI = "/data/logs/%s" > LOG_DOWNLOAD_TIMEOUT = 6 > -LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(ip)-15s %(user)s: " \ > - "%(message)s\n" > +LOG_FORMAT = "[%(date)s %(time)s %(zone)s] %(req)-6s %(app)-11s %(ip)-15s " \ > + "%(user)s: %(message)s\n" > RECORD_TEMPLATE_DICT = { > 'date': '', > 'time': '', > + 'zone': '', > 'req': '', > 'app': '', > 'ip': '', > @@ -49,6 +50,9 @@ RECORD_TEMPLATE_DICT = { > 'message': '', > } > SECONDS_PER_HOUR = 360 > +TS_DATE_FORMAT = "%Y-%m-%d" > +TS_TIME_FORMAT = "%H:%M:%S" > +TS_ZONE_FORMAT = "%Z" > > # Log handler setup > REQUEST_LOG_FILE = "wok-req.log" > @@ -180,10 +184,11 @@ class RequestRecord(object): > self.message = message > self.kwargs = kwargs > > - # register timestamp > - timestamp = datetime.today() > - self.kwargs['date'] = timestamp.strftime('%Y-%m-%d') > - self.kwargs['time'] = timestamp.strftime('%H:%M:%S') > + # register timestamp in local time > + timestamp = time.localtime() > + self.kwargs['date'] = time.strftime(TS_DATE_FORMAT, timestamp) > + self.kwargs['time'] = time.strftime(TS_TIME_FORMAT, timestamp) > + self.kwargs['zone'] = time.strftime(TS_ZONE_FORMAT, timestamp) > > def __str__(self): > info = json.JSONEncoder().encode(self.kwargs)

2 2

Re: [Kimchi-devel] [PATCH] [Wok] Fix for filter break for numbers formatted for locale fr-FR
by Pooja Kulkarni 13 Jun '16

13 Jun '16

Hi Aline, Can this patch be merged? On 05/30/2016 05:37 PM, Archana Singh wrote: > Reviewed-By: Archana Singh <archus(a)linux.vent.ibm.com> > > On 5/26/2016 1:49 PM, pkulkark(a)linux.vnet.ibm.com wrote: >> From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >> >> This patch fixes the filter breaking >> issue on numbers formatted as per >> fr-FR locale, by replacing the >> non-breaking spaces introduced by >> the formatting, with breaking spaces. >> >> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >> --- >> ui/js/src/wok.utils.js | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js >> index 1fb3c9b..76477fd 100644 >> --- a/ui/js/src/wok.utils.js >> +++ b/ui/js/src/wok.utils.js >> @@ -263,7 +263,11 @@ wok.localeConverters = { >> }, >> "number-locale-converter":{ >> to: function(number){ >> - return wok.numberLocaleConverter(number, >> wok.lang.get_locale()); >> + if (number == null) { >> + return 'Unknown'; >> + } >> + format_value = wok.numberLocaleConverter(number, >> wok.lang.get_locale()); >> + return format_value.toString().replace(/\s/g,' '); >> //replace non-breaking space with breaking space >> } >> } >> } >

1 0

[PATCH][Wok] Issue #118: logrotate fails
by Ramon Medeiros 13 Jun '16

13 Jun '16

Create file only when server is started Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 -- contrib/Makefile.am | 1 - contrib/wok.spec.fedora.in | 1 - contrib/wok.spec.suse.in | 1 - contrib/wokd.logrotate.in | 9 --------- src/wok/server.py | 16 +++++++++++----- 6 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 contrib/wokd.logrotate.in diff --git a/Makefile.am b/Makefile.am index 325d0c9..ac07e97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,7 +155,6 @@ install-data-local: $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf mkdir -p $(DESTDIR)/etc/logrotate.d/ - $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in touch $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @@ -172,7 +171,6 @@ uninstall-local: $(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok $(RM) -rf $(DESTDIR)/etc/wok $(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf - $(RM) $(DESTDIR)/etc/logrotate.d/wokd.in $(RM) $(DESTDIR)/etc/logrotate.d/wokd VERSION: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index a82ba30..32fcfde 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,7 +29,6 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ - wokd.logrotate.in \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 7715e7f..fdf3484 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -117,7 +117,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ -%{_sysconfdir}/logrotate.d/wokd.in %{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 3d39483..70c295b 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -95,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf -%{_sysconfdir}/logrotate.d/wokd.in %{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in deleted file mode 100644 index 8771d09..0000000 --- a/contrib/wokd.logrotate.in +++ /dev/null @@ -1,9 +0,0 @@ -${log_dir}/*log { - daily - nomail - maxsize 10M - rotate 10 - nomissingok - compress -} - diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..6909b16 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -45,6 +45,16 @@ LOGGING_LEVEL = {"debug": logging.DEBUG, "warning": logging.WARNING, "error": logging.ERROR, "critical": logging.CRITICAL} +LOGROTATE_TEMPLATE = """ +${log_dir}/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} +""" def set_no_cache(): @@ -141,11 +151,7 @@ class Server(object): if paths.installed: # redefine logrotate configuration according to wok.conf - logrotate_file = os.path.join(paths.logrotate_dir, "wokd.in") - with open(logrotate_file) as template: - data = template.read() - - data = Template(data) + data = Template(LOGROTATE_TEMPLATE) data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir")) -- 2.5.5

2 3

[PATCH][Wok] Improve UI error codes checking
by Ramon Medeiros 10 Jun '16

10 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- check_ui_code_errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 4d9a8bd..32353b5 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)" -uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" +uiErrors="$(grep -ERo 'WOK[A-Z]{3,6}[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" # all errors on i18n are present in js/html files: success if [ "$errors" == "$uiErrors" ]; then -- 2.5.5

1 1

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

09 Jun '16

Changes: v2: Do not manipulate xml on model Improve parameters checking at API.json Increase test cases *** BLURB HERE *** 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

1 6

[RFC] Wok widgets as custom HTML elements or UI library
by Samuel Henrique De Oliveira Guimaraes 09 Jun '16

09 Jun '16

Hi team, After the open discussion session on our last scrum meeting regarding Wok as an UI framework / library, I decided to list some alternatives and technologies that we could use on the next releases or Wok 3.*. The idea is to provide a solution that allowed developers to create panels, tabs or even full plugins with minimal or no knowledge on HTML and CSS or even DOM manipulation with jQuery. Instead of using default HTML tags, the developer could write something like this for Kimchi network tab for example: <wok-panel collapse="false" title="Networks"> <wok-datatable filter="network.name, network.interfaces, network.address, network.type" model="kimchi.networks" sort="true" sort-by="network.name" actions="network.actions"> </wok-panel> <wok-window model="network.add"> ... // Network modal window contents ... </wok-window> <wok-window model="network.edit"> ... // Network modal window contents ... </wok-window> This might seem too ahead of time but in fact it looks like any current MVV JavaScript framework. So here are the current alternatives with pros and cons: 1 - Custom elements API: https://developer.mozilla.org/en-US/docs/Web/Web_Components/Custom_Elements Current support: http://caniuse.com/#search=custom-elements Status: Draft Effort: minimal In my opinion based on current structure this would be the least difficult alternative to adapt current code into a library but browser support is an obstacle. 2 - Google Polymer https://www.polymer-project.org/1.0/docs/devguide/feature-overview Current support: https://www.polymer-project.org/1.0/docs/browsers Status: Stable Effort: medium To work like the example above it would require some time to develop and I think it would create something bigger than an UI library, check an example source code and you will see what I mean. For some native components such as form controls it would redundant. It could be developed at the same time we maintain the current code. 3 - AngularJS https://angularjs.org/ Current support: https://docs.angularjs.org/guide/ie Status: 1.5.x Stable, 2.0 in development Effort: medium to high This would definitively work like the example above and make Wok and all its plugins work like a seamless single page application (no more problems with global variables / tasks when switching tabs from different plugins) but the effort would be medium to high. Legacy code would be incompatible, we would have to drop or move almost everything that we have done with jQuery and rewrite ALL tabs, widgets and API calls and all libraries that we currently use would have to be updated to an AngularJS-like compatible version (or some could go away as Angular provides native mechanisms that we could use). The advantage here is that there's a library that uses Bootstrap SCSS so our UI assets wouldn't discarded and the users wouldn't notice anything. The negative factor is that we would have to rewrite our code to meet "AngularJS way": creating services or factories for the REST calls, directives for the UI and the logic would go to the controllers. It wouldn't make the developers lives any easier, in fact it would require a narrow and specific skillset. For example: to make Wok load plugins, we would have to write a mechanism to lazy load our plugins dynamically based on the files installed in the plugins folder. We could also benefit from some NodeJS plugins for unit, performance and UI tests, even mock objects when developing new UI when we don't have the exact system environment, not having to worry about messing with host or VM settings. 3 - Facebook React https://facebook.github.io/react/ Current support: https://facebook.github.io/react/docs/working-with-the-browser.html Status: Stable Effort: maximum We would exchange HTML to JSX and JavaScript. I think based on our project structure it brings the worst points from Google Polymer and AngularJS analysis. Regards, Samuel

2 2

[RFC] Move some error messages and notifications to Notifications API
by Samuel Henrique De Oliveira Guimaraes 09 Jun '16

09 Jun '16

I'm investigating a problem when uploading volumes to Storage Pools and switching tabs and I was thinking that some messages should be available no matter which tab the user is currently on. For instance, If I'm cloning or migrating a guest, uploading a volume or copying a volume from a remote host etc. and switch tabs, I should know if the task failed without having to switch back to the tab I started this action. Currently we have to do this because only when the browser goes through a function that lists the ongoing tasks inside these tabs that it will receive the error messages. However, if I have a modal window opened, it wouldn't make sense to show a message that has a different context from this opened window. I think that a good solution for this problem would be Notification API for browsers that already support it: https://developer.mozilla.org/en-US/docs/Web/API/notification Support is relatively good: http://caniuse.com/#search=notifications Thanks, Samuel

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 1/8] Creates pluginmanager.py module
by Aline Manera 09 Jun '16

09 Jun '16

One more comment below: On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/pluginsmanager.py | 238 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 238 insertions(+) > create mode 100644 src/wok/pluginsmanager.py > > diff --git a/src/wok/pluginsmanager.py b/src/wok/pluginsmanager.py > new file mode 100644 > index 0000000..d799f11 > --- /dev/null > +++ b/src/wok/pluginsmanager.py > @@ -0,0 +1,238 @@ > +# > +# 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 > +# > + > + > +import cherrypy > +import os > +import xml.etree.ElementTree as ET > +from cherrypy.lib.reprconf import Parser > +from configobj import ConfigObj > + > + > +from basemodel import Singleton > +from wok.config import paths, PluginConfig, PluginPaths > +from wok.exception import OperationFailed > +from wok.utils import import_class, wok_log > + > + > +class Plugins(): > + __metaclass__ = Singleton > + > + def __init__(self, options=None): > + # { '<PLUGIN_NAME>': { > + # config: <PLUGIN_CHERRYPY_CONFIG>, > + # enabled: <TRUE/FALSE>, > + # uri: <PLUGIN_URI_FROM_FILE_CONFIG>, > + # app: <PLUGIN_MAIN_MODULE> > + # conf_file: <PLUGIN_CONFIGURATION_FILE> > + self._plugins_dict = {} > + self.options = options > + self._init_all_plugins() > + > + def _load_plugin_app(self, name): > + """ > + Loads the plugin main module > + """ > + plugin_class = ('plugins.%s.%s' % (name, name[0].upper() + name[1:])) > + try: > + plugin_app = import_class(plugin_class)(self.options) > + except ImportError, e: > + wok_log.error("Failed to import plugin %s, error: %s" % > + (plugin_class, e.message)) > + self._plugins_dict[name]['enabled'] = False > + self._plugins_dict[name]['app'] = None > + return > + self._plugins_dict[name]['app'] = plugin_app > + > + def _load_plugin_app_config(self, name): > + """ > + Sets the plugin's cherrypy configuration. That is a merge between Wok > + standard configuration plus plugin's self configuration > + """ > + app_conf = {} > + app_conf.update(PluginConfig(name)) > + plugin_app = self._plugins_dict[name]['app'] > + if plugin_app is None: > + return > + > + # dynamically extend plugin config with custom data, if provided > + get_custom_conf = getattr(plugin_app, "get_custom_conf", None) > + if get_custom_conf is not None: > + app_conf.update(get_custom_conf()) > + > + # dynamically add tools.wokauth.on = True to extra plugin APIs > + try: > + sub_nodes = import_class('plugins.%s.control.sub_nodes' % > + name) > + urlSubNodes = {} > + for ident, node in sub_nodes.items(): > + if node.url_auth: > + ident = "/%s" % ident > + urlSubNodes[ident] = {'tools.wokauth.on': True} > + app_conf.update(urlSubNodes) > + except ImportError, e: > + wok_log.error("Failed to import subnodes for plugin %s, error: %s" > + % (name, e.message)) > + self._plugins_dict[name]['config'] = app_conf > + > + def _load_plugin_config_file(self, name): > + """ > + Loads the information from Wok section in <plugin>.conf file. Currently > + two tags/options are required to Wok and section looks like: > + [wok] > + enable = True > + uri = '/plugins/mypluginpath' > + """ > + plugin_conf_file = PluginPaths(name).conf_file > + config = {} > + if not os.path.exists(plugin_conf_file): > + wok_log.error("Plugin configuration file %s doesn't exist." % > + plugin_conf_file) > + else: > + try: > + config = Parser().dict_from_file(plugin_conf_file) > + except ValueError as e: > + msg = "Failed to load plugin conf from %s: %s" > + wok_log.error(msg % (plugin_conf_file, e.message)) > + > + plugin = self._plugins_dict[name] > + plugin['conf_file'] = plugin_conf_file > + plugin['enabled'] = config.get('wok', {}).get('enable', False) > + plugin['uri'] = config.get('wok', {}).get('uri', 'Unknow') > + > + def _init_all_plugins(self): > + """ > + Initializes internal plugin dictionary, searching all directories in > + <install_path>/wok/plugins, each directory should store a plugin > + content. Then loads its configuration file in order to set as enabled > + or disabled. > + """ > + plugin_dir = paths.plugins_dir > + try: > + dir_contents = os.listdir(plugin_dir) > + except OSError as e: > + wok_log.error("Failed to fetch plugins from '%s': %s" % > + (plugin_dir, e.message)) > + return > + for name in dir_contents: > + if os.path.isdir(os.path.join(plugin_dir, name)): > + # TODO: > + # Add command line option to disable plugin by its name > + # > + self._plugins_dict[name] = {} > + self._plugins_dict[name]['config'] = {} > + self._plugins_dict[name]['app'] = None > + self._load_plugin_config_file(name) > + > + # Disable all plugins but 'sample' in test mode > + if (self.options is not None) and self.options.test: > + self._plugins_dict[name]['enabled'] = (name == 'sample') > + > + if not self._plugins_dict[name]['enabled']: > + wok_log.info("Initializing plugin: %s [DISABLED]" % name) > + else: > + wok_log.info("Initializing plugin: %s [ENABLED]" % name) > + > + def _set_cherrypy_app(self, name): > + """ > + Load plugin module and cherrypy configuration, then set it as cherrypy > + app. > + """ > + self._load_plugin_app(name) > + self._load_plugin_app_config(name) > + if self._plugins_dict[name]['enabled']: > + cherrypy.tree.mount( > + self._plugins_dict[name]['app'], > + self._plugins_dict[name]['uri'], > + self._plugins_dict[name]['config']) > + wok_log.info("Plugin '%s' loaded" % > + self._plugins_dict[name]['app']) > + > + def load_plugins(self): > + """ > + Set enabled plugins into Cherrypy > + """ > + for plugin in self.get_enabled_plugins(): > + self._set_cherrypy_app(plugin) > + > + def get_all_plugins_info(self): > + return self._plugins_dict > + > + def get_plugin_info(self, name): > + return self._plugins_dict.get(name, {}) > + > + def get_all_plugins_names(self): > + ret = self._plugins_dict.keys() > + ret.sort() > + return ret > + > + def get_enabled_plugins(self): > + ret = [plugin for plugin in self._plugins_dict.keys() if > + self._plugins_dict[plugin]['enabled']] > + ret.sort() > + return ret > + > + def _enable_plugin_conf_file(self, f_conf, enable=True): > + try: > + # 'unrepr' makes ConfigObj read and write characters like ("'?) > + conf = ConfigObj(infile=f_conf, unrepr=True) > + conf['wok']['enable'] = enable > + with open(f_conf, 'wb') as f: > + conf.write(f) > + except Exception as e: > + wok_log.error('Error updating plugin conf file. ' + e.message) > + raise > + > + def _change_plugin_state(self, name, enable=True): > + plugin = self._plugins_dict[name] > + if plugin['enabled'] == enable: > + return > + try: > + self._enable_plugin_conf_file(plugin['conf_file'], enable) > + except: > + raise OperationFailed('WOKPLUG0002E', {'plugin': name}) > + plugin['enabled'] = enable > + You should keep the plugin configuration file to make sure a plugin is enabled or not. Using a cache (self._plugins_dict) may contain invalid data. Let's say the user changed the plugin configuration file manually or uninstall/install a plugin. We should also deal with accurate data. > + def enable_plugin(self, plugin): > + wok_log.info("PluginsManager: Enabling plugin '%s'" % plugin) > + self._change_plugin_state(plugin, True) > + > + def disable_plugin(self, plugin): > + wok_log.info("PluginsManager: Disabling plugin '%s'" % plugin) > + self._change_plugin_state(plugin, False) > + > + > +def get_all_tabs(): > + files = [] > + > + for plugin in Plugins().get_enabled_plugins(): > + files.append(os.path.join(PluginPaths(plugin).ui_dir, > + 'config/tab-ext.xml')) > + > + tabs = [] > + for f in files: > + try: > + root = ET.parse(f) > + except (IOError): > + wok_log.debug("Unable to load %s", f) > + continue > + tabs.extend([t.text.lower() for t in root.getiterator('title')]) > + > + return tabs

1 1

Re: [Kimchi-devel] [PATCH v2][Wok 2/8] Changes server behavior to use pluginsmanager
by Aline Manera 09 Jun '16

09 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/auth.py | 15 ++++++++------- > src/wok/root.py | 8 ++++---- > src/wok/server.py | 57 ++++++------------------------------------------------- > src/wok/utils.py | 52 -------------------------------------------------- > 4 files changed, 18 insertions(+), 114 deletions(-) > > diff --git a/src/wok/auth.py b/src/wok/auth.py > index 0355e86..f8be4b5 100644 > --- a/src/wok/auth.py > +++ b/src/wok/auth.py > @@ -35,15 +35,15 @@ import urllib2 > from wok import template > from wok.config import config > from wok.exception import InvalidOperation, OperationFailed > -from wok.utils import get_all_tabs, run_command > +from wok.pluginsmanager import get_all_tabs > +from wok.utils import run_command > + > > USER_NAME = 'username' > USER_GROUPS = 'groups' > USER_ROLES = 'roles' > REFRESH = 'robot-refresh' > -tabs = get_all_tabs() > - Keep it there and update to point to the new function to avoid multiple file processing for each server request. > def redirect_login(): > url = "/login.html" > @@ -85,7 +85,7 @@ class PAMUser(User): > # after adding support to change user roles that info should be read > # from a specific objstore and fallback to default only if any entry is > # found > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'user') > > def get_groups(self): > out, err, rc = run_command(['id', '-Gn', self.user[USER_NAME]]) > @@ -99,7 +99,7 @@ class PAMUser(User): > # after adding support to change user roles that info should be > # read from a specific objstore and fallback to default only if > # any entry is found > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'admin') > > return self.user[USER_ROLES] > > @@ -195,7 +195,7 @@ class LDAPUser(User): > self.user[USER_GROUPS] = list() > # FIXME: user roles will be changed according roles assignment after > # objstore is integrated > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'user') > > @staticmethod > def authenticate(username, password): > @@ -236,7 +236,8 @@ class LDAPUser(User): > "authentication", "ldap_admin_id").strip('"').split(',') > for admin_id in admin_ids: > if self.user[USER_NAME] == admin_id.strip(): > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), > + That way, on each server request the tab file will be parsed. Move it a global variable as it was before. > 'admin') > return self.user[USER_ROLES] > > def get_user(self): > diff --git a/src/wok/root.py b/src/wok/root.py > index 29ea657..cb8b376 100644 > --- a/src/wok/root.py > +++ b/src/wok/root.py > @@ -123,10 +123,10 @@ class Root(Resource): > > data['scripts'] = [] > for plugin, app in cherrypy.tree.apps.iteritems(): > - if app.root.extends is not None: > - scripts = app.root.extends.get(script_name, {}) > - if page in scripts.keys(): > - data['scripts'].append(scripts[page]) > + if app.root.extends is not None: > + scripts = app.root.extends.get(script_name, {}) > + if page in scripts.keys(): > + data['scripts'].append(scripts[page]) > > if page.endswith('.html'): > context = template.render('/tabs/' + page, data) > diff --git a/src/wok/server.py b/src/wok/server.py > index 902d4bf..3cb257f 100644 > --- a/src/wok/server.py > +++ b/src/wok/server.py > @@ -30,14 +30,14 @@ from string import Template > from wok import auth > from wok import config > from wok.config import config as configParser > -from wok.config import paths, PluginConfig, WokConfig > +from wok.config import paths, WokConfig > from wok.control import sub_nodes > from wok.model import model > +from wok.pluginsmanager import Plugins > from wok.proxy import start_proxy, terminate_proxy > from wok.reqlogger import RequestLogger > from wok.root import WokRoot > from wok.safewatchedfilehandler import SafeWatchedFileHandler > -from wok.utils import get_enabled_plugins, import_class > > > LOGGING_LEVEL = {"debug": logging.DEBUG, > @@ -171,61 +171,16 @@ class Server(object): > > self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env), > config=self.configObj) > - self._load_plugins(options) > + > + # Initiate and handles plugins > + plugins = Plugins(options) > + plugins.load_plugins() > > # Terminate proxy when cherrypy server is terminated > cherrypy.engine.subscribe('exit', terminate_proxy) > > cherrypy.lib.sessions.init() > > - def _load_plugins(self, options): > - for plugin_name, plugin_config in get_enabled_plugins(): > - try: > - plugin_class = ('plugins.%s.%s' % > - (plugin_name, > - plugin_name[0].upper() + plugin_name[1:])) > - script_name = plugin_config['wok']['uri'] > - del plugin_config['wok'] > - > - plugin_config.update(PluginConfig(plugin_name)) > - except KeyError: > - continue > - > - try: > - plugin_app = import_class(plugin_class)(options) > - except ImportError, e: > - cherrypy.log.error_log.error( > - "Failed to import plugin %s, " > - "error: %s" % (plugin_class, e.message) > - ) > - continue > - > - # dynamically extend plugin config with custom data, if provided > - get_custom_conf = getattr(plugin_app, "get_custom_conf", None) > - if get_custom_conf is not None: > - plugin_config.update(get_custom_conf()) > - > - # dynamically add tools.wokauth.on = True to extra plugin APIs > - try: > - sub_nodes = import_class('plugins.%s.control.sub_nodes' % > - plugin_name) > - > - urlSubNodes = {} > - for ident, node in sub_nodes.items(): > - if node.url_auth: > - ident = "/%s" % ident > - urlSubNodes[ident] = {'tools.wokauth.on': True} > - > - plugin_config.update(urlSubNodes) > - > - except ImportError, e: > - cherrypy.log.error_log.error( > - "Failed to import subnodes for plugin %s, " > - "error: %s" % (plugin_class, e.message) > - ) > - > - cherrypy.tree.mount(plugin_app, script_name, plugin_config) > - > def start(self): > # Subscribe to SignalHandler plugin > if hasattr(cherrypy.engine, 'signal_handler'): > diff --git a/src/wok/utils.py b/src/wok/utils.py > index 4b3b0ac..10f2850 100644 > --- a/src/wok/utils.py > +++ b/src/wok/utils.py > @@ -32,16 +32,13 @@ import sqlite3 > import subprocess > import sys > import traceback > -import xml.etree.ElementTree as ET > import locale > > -from cherrypy.lib.reprconf import Parser > from datetime import datetime, timedelta > from multiprocessing import Process, Queue > from threading import Timer > > from wok.asynctask import AsyncTask > -from wok.config import paths, PluginPaths > from wok.exception import InvalidParameter, TimeoutExpired > > > @@ -76,55 +73,6 @@ def is_digit(value): > return False > > > -def _load_plugin_conf(name): > - plugin_conf = PluginPaths(name).conf_file > - if not os.path.exists(plugin_conf): > - cherrypy.log.error_log.error("Plugin configuration file %s" > - " doesn't exist." % plugin_conf) > - return > - try: > - return Parser().dict_from_file(plugin_conf) > - except ValueError as e: > - cherrypy.log.error_log.error("Failed to load plugin " > - "conf from %s: %s" % > - (plugin_conf, e.message)) > - > - > -def get_enabled_plugins(): > - plugin_dir = paths.plugins_dir > - try: > - dir_contents = os.listdir(plugin_dir) > - except OSError: > - return > - for name in dir_contents: > - if os.path.isdir(os.path.join(plugin_dir, name)): > - plugin_config = _load_plugin_conf(name) > - try: > - if plugin_config['wok']['enable']: > - yield (name, plugin_config) > - except (TypeError, KeyError): > - continue > - > - > -def get_all_tabs(): > - files = [] > - > - for plugin, _ in get_enabled_plugins(): > - files.append(os.path.join(PluginPaths(plugin).ui_dir, > - 'config/tab-ext.xml')) > - > - tabs = [] > - for f in files: > - try: > - root = ET.parse(f) > - except (IOError): > - wok_log.debug("Unable to load %s", f) > - continue > - tabs.extend([t.text.lower() for t in root.getiterator('title')]) > - > - return tabs > - > - > def get_plugin_from_request(): > """ > Returns name of plugin being requested. If no plugin, returns 'wok'.

2 5

Re: [Kimchi-devel] [PATCH v2][Wok 1/8] Creates pluginmanager.py module
by Aline Manera 09 Jun '16

09 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/pluginsmanager.py | 238 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 238 insertions(+) > create mode 100644 src/wok/pluginsmanager.py > > diff --git a/src/wok/pluginsmanager.py b/src/wok/pluginsmanager.py > new file mode 100644 > index 0000000..d799f11 > --- /dev/null > +++ b/src/wok/pluginsmanager.py > @@ -0,0 +1,238 @@ > +# > +# 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 > +# > + > + > +import cherrypy > +import os > +import xml.etree.ElementTree as ET > +from cherrypy.lib.reprconf import Parser > +from configobj import ConfigObj > + > + > +from basemodel import Singleton > +from wok.config import paths, PluginConfig, PluginPaths > +from wok.exception import OperationFailed > +from wok.utils import import_class, wok_log > + > + > +class Plugins(): > + __metaclass__ = Singleton > + > + def __init__(self, options=None): > + # { '<PLUGIN_NAME>': { > + # config: <PLUGIN_CHERRYPY_CONFIG>, > + # enabled: <TRUE/FALSE>, > + # uri: <PLUGIN_URI_FROM_FILE_CONFIG>, > + # app: <PLUGIN_MAIN_MODULE> > + # conf_file: <PLUGIN_CONFIGURATION_FILE> > + self._plugins_dict = {} > + self.options = options > + self._init_all_plugins() > + > + def _load_plugin_app(self, name): > + """ > + Loads the plugin main module > + """ > + plugin_class = ('plugins.%s.%s' % (name, name[0].upper() + name[1:])) > + try: > + plugin_app = import_class(plugin_class)(self.options) > + except ImportError, e: > + wok_log.error("Failed to import plugin %s, error: %s" % > + (plugin_class, e.message)) > + self._plugins_dict[name]['enabled'] = False > + self._plugins_dict[name]['app'] = None > + return > + self._plugins_dict[name]['app'] = plugin_app > + > + def _load_plugin_app_config(self, name): > + """ > + Sets the plugin's cherrypy configuration. That is a merge between Wok > + standard configuration plus plugin's self configuration > + """ > + app_conf = {} > + app_conf.update(PluginConfig(name)) > + plugin_app = self._plugins_dict[name]['app'] > + if plugin_app is None: > + return > + > + # dynamically extend plugin config with custom data, if provided > + get_custom_conf = getattr(plugin_app, "get_custom_conf", None) > + if get_custom_conf is not None: > + app_conf.update(get_custom_conf()) > + > + # dynamically add tools.wokauth.on = True to extra plugin APIs > + try: > + sub_nodes = import_class('plugins.%s.control.sub_nodes' % > + name) > + urlSubNodes = {} > + for ident, node in sub_nodes.items(): > + if node.url_auth: > + ident = "/%s" % ident > + urlSubNodes[ident] = {'tools.wokauth.on': True} > + app_conf.update(urlSubNodes) > + except ImportError, e: > + wok_log.error("Failed to import subnodes for plugin %s, error: %s" > + % (name, e.message)) > + self._plugins_dict[name]['config'] = app_conf > + > + def _load_plugin_config_file(self, name): > + """ > + Loads the information from Wok section in <plugin>.conf file. Currently > + two tags/options are required to Wok and section looks like: > + [wok] > + enable = True > + uri = '/plugins/mypluginpath' > + """ > + plugin_conf_file = PluginPaths(name).conf_file > + config = {} > + if not os.path.exists(plugin_conf_file): > + wok_log.error("Plugin configuration file %s doesn't exist." % > + plugin_conf_file) > + else: > + try: > + config = Parser().dict_from_file(plugin_conf_file) > + except ValueError as e: > + msg = "Failed to load plugin conf from %s: %s" > + wok_log.error(msg % (plugin_conf_file, e.message)) > + > + plugin = self._plugins_dict[name] > + plugin['conf_file'] = plugin_conf_file > + plugin['enabled'] = config.get('wok', {}).get('enable', False) > + plugin['uri'] = config.get('wok', {}).get('uri', 'Unknow') > + This block should be on 'else' statement (as part of the 'try' block') or add a 'return' in the 'if' statement as the config file was not found. Otherwise, it will raise an exception as 'config' may be not defined if it does not entered on 'else' block. The same will happen if it goes to the 'except' block. So move it to 'try' block. Tip: if you add 'return' in the 'if' statement you don't need the 'else' anymore and eliminate one indentation level. > + def _init_all_plugins(self): > + """ > + Initializes internal plugin dictionary, searching all directories in > + <install_path>/wok/plugins, each directory should store a plugin > + content. Then loads its configuration file in order to set as enabled > + or disabled. > + """ > + plugin_dir = paths.plugins_dir > + try: > + dir_contents = os.listdir(plugin_dir) > + except OSError as e: > + wok_log.error("Failed to fetch plugins from '%s': %s" % > + (plugin_dir, e.message)) > + return > + for name in dir_contents: > + if os.path.isdir(os.path.join(plugin_dir, name)): > + # TODO: > + # Add command line option to disable plugin by its name > + # > + self._plugins_dict[name] = {} > + self._plugins_dict[name]['config'] = {} > + self._plugins_dict[name]['app'] = None > + self._load_plugin_config_file(name) > + > + # Disable all plugins but 'sample' in test mode > + if (self.options is not None) and self.options.test: > + self._plugins_dict[name]['enabled'] = (name == 'sample') > + Why? I could be able to see all plugins running on test mode. For example, Kimchi provides an MockModel to allow user tests Kimchi without making any change in the host system. > + if not self._plugins_dict[name]['enabled']: > + wok_log.info("Initializing plugin: %s [DISABLED]" % name) > + else: > + wok_log.info("Initializing plugin: %s [ENABLED]" % name) > + > + def _set_cherrypy_app(self, name): > + """ > + Load plugin module and cherrypy configuration, then set it as cherrypy > + app. > + """ > + self._load_plugin_app(name) > + self._load_plugin_app_config(name) > + if self._plugins_dict[name]['enabled']: > + cherrypy.tree.mount( > + self._plugins_dict[name]['app'], > + self._plugins_dict[name]['uri'], > + self._plugins_dict[name]['config']) > + wok_log.info("Plugin '%s' loaded" % > + self._plugins_dict[name]['app']) > + > + def load_plugins(self): > + """ > + Set enabled plugins into Cherrypy > + """ > + for plugin in self.get_enabled_plugins(): > + self._set_cherrypy_app(plugin) > + > + def get_all_plugins_info(self): > + return self._plugins_dict > + > + def get_plugin_info(self, name): > + return self._plugins_dict.get(name, {}) > + > + def get_all_plugins_names(self): > + ret = self._plugins_dict.keys() > + ret.sort() > + return ret > + > + def get_enabled_plugins(self): > + ret = [plugin for plugin in self._plugins_dict.keys() if > + self._plugins_dict[plugin]['enabled']] > + ret.sort() > + return ret > + > + def _enable_plugin_conf_file(self, f_conf, enable=True): > + try: > + # 'unrepr' makes ConfigObj read and write characters like ("'?) > + conf = ConfigObj(infile=f_conf, unrepr=True) > + conf['wok']['enable'] = enable > + with open(f_conf, 'wb') as f: > + conf.write(f) > + except Exception as e: > + wok_log.error('Error updating plugin conf file. ' + e.message) > + raise > + > + def _change_plugin_state(self, name, enable=True): > + plugin = self._plugins_dict[name] > + if plugin['enabled'] == enable: > + return > + try: > + self._enable_plugin_conf_file(plugin['conf_file'], enable) > + except: > + raise OperationFailed('WOKPLUG0002E', {'plugin': name}) > + plugin['enabled'] = enable > + > + def enable_plugin(self, plugin): > + wok_log.info("PluginsManager: Enabling plugin '%s'" % plugin) > + self._change_plugin_state(plugin, True) > + > + def disable_plugin(self, plugin): > + wok_log.info("PluginsManager: Disabling plugin '%s'" % plugin) > + self._change_plugin_state(plugin, False) > + > + > +def get_all_tabs(): > + files = [] > + > + for plugin in Plugins().get_enabled_plugins(): > + files.append(os.path.join(PluginPaths(plugin).ui_dir, > + 'config/tab-ext.xml')) > + > + tabs = [] > + for f in files: > + try: > + root = ET.parse(f) > + except (IOError): > + wok_log.debug("Unable to load %s", f) > + continue > + tabs.extend([t.text.lower() for t in root.getiterator('title')]) > + > + return tabs

2 6

Re: [Kimchi-devel] [PATCH v2][Wok 8/8] Add Plugins Manager test cases
by Aline Manera 09 Jun '16

09 Jun '16

Unless the idea to only have sample plugin enabled on test mode, this patch looks good for me. On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Test cases for new API > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > tests/test_plugin.py | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 99 insertions(+), 4 deletions(-) > > diff --git a/tests/test_plugin.py b/tests/test_plugin.py > index d785cfa..01a3be3 100644 > --- a/tests/test_plugin.py > +++ b/tests/test_plugin.py > @@ -20,11 +20,13 @@ > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > import json > +import os > import unittest > from functools import partial > > -#from wok.pluginsmanager import get_enabled_plugins > +from wok.config import paths > from wok.pluginsmanager import Plugins > +from wok.utils import wok_log > > import utils > > @@ -50,9 +52,9 @@ def tearDownModule(): > test_server.stop() > > > -(a)unittest.skipUnless( > - 'sample' in Plugins().get_enabled_plugins(), > - 'sample plugin is not enabled, skip this test!') > +# > +# In test mode, the plugin Sample should always be enabled > +# > class PluginTests(unittest.TestCase): > > def setUp(self): > @@ -121,3 +123,96 @@ class PluginTests(unittest.TestCase): > req = json.dumps({'name': 'nowidth', 'length': 40}) > resp = self.request('/plugins/sample/rectangles', req, 'POST') > self.assertEquals(400, resp.status) > + > + > +def _plugins_number(): > + """ Find number of plugins in <wokpath>/wok/plugins""" > + plugin_dir = paths.plugins_dir > + try: > + return len([d for d in os.listdir(plugin_dir) > + if os.path.isdir(os.path.join(plugin_dir, d))]) > + except OSError as e: > + wok_log.error("Failed reading plugins directory '%s': %s" % > + (plugin_dir, e.message)) > + return 0 > + > + > +class PluginsManagerTests(unittest.TestCase): > + """ > + This class test functionalities of Plugins Manager and plugins API, using > + the Sample plugin, which should be enabled by default during tests > + """ > + > + def setUp(self): > + self.request = partial(utils.request, host, ssl_port) > + self.info = Plugins().get_plugin_info('sample') > + with open(self.info['conf_file']) as f: > + self.enable_sample_plugin = ('enable = True' in f.read()) > + > + def test_api(self): > + # Only SAMPLE should be enabled > + out = [{'name': 'sample', 'enabled': True}] > + > + # List of plugins > + resp = self.request('/pluginsmanager', {}, 'GET') > + plugins = json.loads(resp.read()) > + self.assertEquals(_plugins_number(), len(plugins)) > + self.assertIn(out[0], plugins) > + > + # Wrong plugin name > + resp = self.request('/pluginsmanager/samplewrong', {}, 'GET') > + self.assertEquals(404, resp.status) > + self.assertIn('WOKPLUG0001E', json.loads(resp.read())['reason']) > + > + # Lookup plugin name > + resp = self.request('/pluginsmanager/sample', {}, 'GET') > + self.assertEquals(200, resp.status) > + self.assertDictEqual(out[0], json.loads(resp.read())) > + > + # Enabling wrong plugin > + resp = self.request('/pluginsmanager/samplewrong/enable', {}, 'POST') > + self.assertEquals(404, resp.status) > + self.assertIn('WOKPLUG0001E', json.loads(resp.read())['reason']) > + > + # Enabling Sample (already enabled, no problem) > + resp = self.request('/pluginsmanager/sample/enable', {}, 'POST') > + self.assertEquals(200, resp.status) > + self.assertDictEqual(out[0], json.loads(resp.read())) > + > + # Disabling Sample > + resp = self.request('/pluginsmanager/sample/disable', {}, 'POST') > + self.assertEquals(200, resp.status) > + out[0]['enabled'] = False > + self.assertDictEqual(out[0], json.loads(resp.read())) > + > + # Disabling Sample (already disabled, no problem) > + resp = self.request('/pluginsmanager/sample/disable', {}, 'POST') > + self.assertEquals(200, resp.status) > + self.assertDictEqual(out[0], json.loads(resp.read())) > + > + # Check config file > + with open(self.info['conf_file']) as f: > + self.assertIn('enable = False', f.read()) > + > + # Backing configuration file to initial state > + if self.enable_sample_plugin: > + Plugins()._enable_plugin_conf_file(self.info['conf_file']) > + > + def test_not_allowed_methods(self): > + # Only GET allowed in Collection > + resp = self.request('/pluginsmanager', {}, 'POST') > + self.assertEquals(405, resp.status) > + resp = self.request('/pluginsmanager', {}, 'PUT') > + self.assertEquals(405, resp.status) > + resp = self.request('/pluginsmanager', {}, 'DELETE') > + self.assertEquals(405, resp.status) > + > + # Only GET/POST allowed in resource > + resp = self.request('/pluginsmanager/sample', {}, 'PUT') > + self.assertEquals(405, resp.status) > + resp = self.request('/pluginsmanager/sample', {}, 'DELETE') > + self.assertEquals(405, resp.status) > + resp = self.request('/pluginsmanager/sample/enable', {}, 'PUT') > + self.assertEquals(405, resp.status) > + resp = self.request('/pluginsmanager/sample/disable', {}, 'DELETE') > + self.assertEquals(405, resp.status)

2 4

Re: [Kimchi-devel] [PATCH v2][Wok 7/8] Fix test utils imports and add auth tests
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch add auth test to GET and POST requests in API of Plugins > Manager. It also fixes imports in tests/utils.py > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > tests/test_plugin.py | 5 +++-- > tests/test_server.py | 10 +++++++++- > tests/utils.py | 7 ++++--- > 3 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/tests/test_plugin.py b/tests/test_plugin.py > index 7c5e8e8..d785cfa 100644 > --- a/tests/test_plugin.py > +++ b/tests/test_plugin.py > @@ -23,7 +23,8 @@ import json > import unittest > from functools import partial > > -from wok.utils import get_enabled_plugins > +#from wok.pluginsmanager import get_enabled_plugins > +from wok.pluginsmanager import Plugins > > import utils > > @@ -50,7 +51,7 @@ def tearDownModule(): > > > @unittest.skipUnless( > - 'sample' in [plugin for plugin, _config in get_enabled_plugins()], > + 'sample' in Plugins().get_enabled_plugins(), > 'sample plugin is not enabled, skip this test!') > class PluginTests(unittest.TestCase): > > diff --git a/tests/test_server.py b/tests/test_server.py > index 1f5a236..6e4749e 100644 > --- a/tests/test_server.py > +++ b/tests/test_server.py > @@ -188,12 +188,20 @@ class ServerTests(unittest.TestCase): > > def test_auth_protected(self): > hdrs = {'AUTHORIZATION': ''} > - uris = ['/tasks'] > + uris = ['/tasks', > + '/pluginsmanager', > + '/pluginsmanager/sample'] > > for uri in uris: > resp = self.request(uri, None, 'GET', hdrs) > self.assertEquals(401, resp.status) > > + uris = ['/pluginsmanager/sample/disable'] > + > + for uri in uris: > + resp = self.request(uri, {}, 'POST', hdrs) > + self.assertEquals(401, resp.status) > + > def test_auth_bad_creds(self): > # Test HTTPBA > hdrs = {'AUTHORIZATION': "Basic " + base64.b64encode("nouser:badpass")} > diff --git a/tests/utils.py b/tests/utils.py > index d158ba1..ed709e1 100644 > --- a/tests/utils.py > +++ b/tests/utils.py > @@ -38,8 +38,9 @@ from lxml import etree > > import wok.server > from wok.config import config, PluginPaths > -from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs Keep importing 'tabs' to do not parse the file multiple times. > +from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES > from wok.exception import NotFoundError, OperationFailed > +from wok.pluginsmanager import get_all_tabs > from wok.utils import wok_log > > > @@ -192,14 +193,14 @@ class FakeUser(User): > self.user = {} > self.user[USER_NAME] = username > self.user[USER_GROUPS] = None > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'user') > > def get_groups(self): > return sorted([group.gr_name for group in grp.getgrall()])[0:3] > > def get_roles(self): > if self.sudo: > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'admin') > return self.user[USER_ROLES] > > def get_user(self):

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 6/8] Fix Sample plugin
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch adapts Sample plugin to work with new latest Wok plugin > changes and to work with Plugins Manager. > --- > src/wok/plugins/sample/__init__.py | 54 ++++++++++++++++++++-- > src/wok/plugins/sample/control/__init__.py | 26 +++++++++++ > src/wok/plugins/sample/sample.conf.in | 22 --------- > src/wok/plugins/sample/ui/config/tab-ext.xml | 9 ++-- > .../plugins/sample/ui/pages/sample-tab1.html.tmpl | 3 ++ > .../plugins/sample/ui/pages/sample-tab2.html.tmpl | 3 ++ > 6 files changed, 86 insertions(+), 31 deletions(-) > create mode 100644 src/wok/plugins/sample/control/__init__.py > > diff --git a/src/wok/plugins/sample/__init__.py b/src/wok/plugins/sample/__init__.py > index ff96b15..c65dd0d 100644 > --- a/src/wok/plugins/sample/__init__.py > +++ b/src/wok/plugins/sample/__init__.py > @@ -23,21 +23,22 @@ import json > import os > from cherrypy import expose > > - > -from wok.config import PluginPaths > +from wok.config import CACHEEXPIRES, PluginConfig, PluginPaths > from wok.control.base import Collection, Resource > from wok.root import WokRoot > > > -from plugins.sample.i18n import messages > -from plugins.sample.model import Model > +from wok.plugins.sample.i18n import messages > +from wok.plugins.sample.model import Model > > > model = Model() > > > -class Drawings(WokRoot): > +class Sample(WokRoot): > def __init__(self, wok_options): > + dev_env = wok_options.environment != 'production' > + super(Sample, self).__init__(model, dev_env) > Resource.__init__(self, model) As you are calling WokRoot.__init__, I don't think this Resource.__init__ is necessary anymore. > self.description = Description(model) > self.rectangles = Rectangles(model) > @@ -52,6 +53,49 @@ class Drawings(WokRoot): > def index(self): > return 'This is a sample plugin for Wok' > > + def get_custom_conf(self): > + return SampleConfig() > + > + > +class SampleConfig(PluginConfig): > + def __init__(self): > + super(SampleConfig, self).__init__('sample') > + > + sample_path = PluginPaths('sample') > + > + custom_config = { > + '/help': { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + 'pages/help'), > + 'tools.nocache.on': True > + }, > + '/images': { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + 'images'), > + 'tools.wokauth.on': False, > + 'tools.nocache.on': False > + }, I don't think sample plugin has any image to expose on server. So we don't need this there. > + '/description': {'tools.wokauth.on': True}, > + '/rectangles': {'tools.wokauth.on': True}, > + '/circles': {'tools.wokauth.on': True} > + } > + > + for dirname in ('css', 'js', 'images'): Same for js and css config. > + custom_config['/' + dirname] = { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + dirname), > + 'tools.wokauth.on': False, > + 'tools.nocache.on': False} > + if dirname != 'images': > + custom_config['/' + dirname].update({ > + 'tools.expires.on': True, > + 'tools.expires.secs': CACHEEXPIRES}) > + > + self.update(custom_config) > + > > class Description(Resource): > def __init__(self, model): > diff --git a/src/wok/plugins/sample/control/__init__.py b/src/wok/plugins/sample/control/__init__.py > new file mode 100644 > index 0000000..c87776e > --- /dev/null > +++ b/src/wok/plugins/sample/control/__init__.py > @@ -0,0 +1,26 @@ > +# > +# 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 > + > +import os > + > + > +from wok.control.utils import load_url_sub_node > + > + > +sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__) > diff --git a/src/wok/plugins/sample/sample.conf.in b/src/wok/plugins/sample/sample.conf.in > index 9da33e1..1e1b8a4 100644 > --- a/src/wok/plugins/sample/sample.conf.in > +++ b/src/wok/plugins/sample/sample.conf.in > @@ -1,27 +1,5 @@ > [wok] > enable = @ENABLE_SAMPLE@ > -plugin_class = "Drawings" > uri = "/plugins/sample" > > -[/] > -tools.nocache.on = True > -tools.trailing_slash.on = False > -tools.sessions.on = True > -tools.sessions.name = 'wok' > -tools.sessions.httponly = True > -tools.sessions.locking = 'explicit' > -tools.sessions.storage_type = 'ram' > > -[/description] > -tools.wokauth.on = True > - > -[/rectangles] > -tools.wokauth.on = True > - > -[/circles] > -tools.wokauth.on = True > - > -[/help] > -tools.staticdir.on = True > -tools.nocache.on = True > -tools.staticdir.dir = wok.config.PluginPaths('sample').ui_dir + '/pages/help' > diff --git a/src/wok/plugins/sample/ui/config/tab-ext.xml b/src/wok/plugins/sample/ui/config/tab-ext.xml > index aff0d14..bcd20fe 100644 > --- a/src/wok/plugins/sample/ui/config/tab-ext.xml > +++ b/src/wok/plugins/sample/ui/config/tab-ext.xml > @@ -1,17 +1,18 @@ > <?xml version="1.0" encoding="utf-8"?> > <tabs-ext> > + <functionality>Sample</functionality> > <tab> > <access role="admin" mode="admin"/> > <access role="user" mode="none"/> > - > - <title>SampleTab 1</title> > + <title>SampleTab1</title> > <path>plugins/sample/sample-tab1.html</path> > + <order>10</order> > </tab> > <tab> > <access role="admin" mode="admin"/> > <access role="user" mode="none"/> > - > - <title>SampleTab 2</title> > + <title>SampleTab2</title> > <path>plugins/sample/sample-tab2.html</path> > + <order>20</order> > </tab> > </tabs-ext> > diff --git a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > index 2777848..8e4b52b 100644 > --- a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > +++ b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > @@ -22,6 +22,9 @@ > <html> > <script type="text/javascript" src="plugins/sample/js/util.js"></script> > <body> > + <div> > + Sample PAGE 1 > + </div> > <div id="samplebody"/> > </body> > <script> > diff --git a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > index 2777848..8f92b80 100644 > --- a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > +++ b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > @@ -22,6 +22,9 @@ > <html> > <script type="text/javascript" src="plugins/sample/js/util.js"></script> > <body> > + <div> > + Sample PAGE 2 > + </div> > <div id="samplebody"/> > </body> > <script>

2 1

Re: [Kimchi-devel] [PATCH v2][Wok 5/8] Load Wok Server after options checkings
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch moves Server.py import right before instanciate the class. > Then all following imports and initializations required by Server module > are done after command line options checkings. > This way avoid problems like init and load plugins then wokd stops due > to wrong command line option. Could you explain better the problem? I checked server.py and there is no function being called on this module. Seems it is an workaround to a deeper issue. > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wokd.in | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/wokd.in b/src/wokd.in > index 962581d..3cf90f8 100644 > --- a/src/wokd.in > +++ b/src/wokd.in > @@ -27,7 +27,6 @@ sys.path.insert(1, '@pythondir@') > > from optparse import OptionParser > > -import wok.server > import wok.config as config > > > @@ -100,6 +99,11 @@ def main(options): > setattr(options, 'max_body_size', > config.config.get('server', 'max_body_size')) > > + > + # Wok Server module must be imported after options checkings. Otherwise it > + # is possible that server start some functions and then fail due to wrong > + # parameters passed > + import wok.server > wok.server.main(options) > > if __name__ == '__main__':

2 1

[RFC] Change guest boot order on REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Propose: Kimchi allow to change boot order ("fd", "hd", "cdrom" or "network") hd device can specify which disk will be booted Rest API will receive answer from /plugins/kimchi/<VM NAME>/bootorder {[{"dev": "hd"}]} or a list: {[{"dev": "hd"}, {"dev": "cdrom"}]} Doubts: How we can edit the bootloader? Like the list above or a kind of fixed list? Libvirt provides bootmenu too, which allows users to pick a device in the beginning. Must have it? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 5

Re: [Kimchi-devel] [PATCH v2][Wok 3/8] Implements control/model of new plugin API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/control/plugins.py | 31 ++++++++++++++++++++++++++++--- > src/wok/i18n.py | 3 +++ > src/wok/model/plugins.py | 38 ++++++++++++++++++++++++++++++-------- > 3 files changed, 61 insertions(+), 11 deletions(-) > > diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py > index 57dfa1b..5c125eb 100644 > --- a/src/wok/control/plugins.py > +++ b/src/wok/control/plugins.py > @@ -19,11 +19,36 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -from wok.control.base import SimpleCollection > +from wok.control.base import Collection, Resource, SimpleCollection > from wok.control.utils import UrlSubNode > > > -@UrlSubNode("plugins") > -class Plugins(SimpleCollection): > +@UrlSubNode("plugins", False) > +class PluginsSimple(SimpleCollection): > + """ > + Returns only enabled plugins in order to built initial Wok UI > + """ > + def __init__(self, model): > + super(PluginsSimple, self).__init__(model) > + pass > + > + > +@UrlSubNode("pluginsmanager", True) > +class Plugins(Collection): > def __init__(self, model): > super(Plugins, self).__init__(model) > + self.resource = Plugin > + self.admin_methods = ['GET'] > + > + > +class Plugin(Resource): > + def __init__(self, model, id): > + super(Plugin, self).__init__(model, id) > + self.uri_fmt = "/pluginsmanager/%s" > + self.enable = self.generate_action_handler('enable') > + self.disable = self.generate_action_handler('disable') > + self.admin_methods = ['GET', 'POST'] > + > + @property > + def data(self): > + return self.info > diff --git a/src/wok/i18n.py b/src/wok/i18n.py > index 4fc21f1..bda3949 100644 > --- a/src/wok/i18n.py > +++ b/src/wok/i18n.py > @@ -60,4 +60,7 @@ messages = { > "WOKRES0001L": _("Request made on resource"), > "WOKROOT0001L": _("User '%(username)s' logged in"), > "WOKROOT0002L": _("User '%(username)s' logged out"), > + > + "WOKPLUG0001E": _("Plugin '%(plugin_name)s' not found."), > + "WOKPLUG0002E": _("Error updating configuration file of plugin '%(plugin)s'."), > } > diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py > index 4beff44..b0ac366 100644 > --- a/src/wok/model/plugins.py > +++ b/src/wok/model/plugins.py > @@ -3,8 +3,6 @@ > # > # Copyright IBM Corp, 2015-2016 > # > -# Code derived from Project Kimchi > -# Any reason to remove the above line? > # 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 > @@ -19,9 +17,17 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -import cherrypy > > -from wok.utils import get_enabled_plugins > +from wok.exception import NotFoundError > +from wok.pluginsmanager import Plugins > + > + > +class PluginsSimpleModel(object): > + def __init__(self, **kargs): > + pass > + > + def get_list(self): > + return Plugins().get_enabled_plugins() > > > class PluginsModel(object): > @@ -29,7 +35,23 @@ class PluginsModel(object): > pass > > def get_list(self): > - # Will only return plugins that were loaded correctly by WOK and are > - # properly configured in cherrypy > - return [plugin for (plugin, config) in get_enabled_plugins() > - if config.get('wok').get('uri') in cherrypy.tree.apps.keys()] > + return Plugins().get_all_plugins_names() > + > + > +class PluginModel(object): > + def __init__(self, **kargs): > + pass > + > + def lookup(self, plugin): > + info = Plugins().get_plugin_info(plugin) > + if not info: > + raise NotFoundError('WOKPLUG0001E', {'plugin_name': plugin}) > + > + return {'name': plugin, > + 'enabled': info['enabled']} > + > + def enable(self, plugin_name): > + Plugins().enable_plugin(plugin_name) > + > + def disable(self, plugin_name): > + Plugins().disable_plugin(plugin_name)

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 4/8] Change plugins API documentation by pluginsmanager API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch creates the documentation for pluginsmanager API > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > docs/API/plugins.md | 13 ---------- > docs/API/pluginsmanager.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 13 deletions(-) > delete mode 100644 docs/API/plugins.md > create mode 100644 docs/API/pluginsmanager.md > > diff --git a/docs/API/plugins.md b/docs/API/plugins.md > deleted file mode 100644 > index aaa37b5..0000000 > --- a/docs/API/plugins.md > +++ /dev/null > @@ -1,13 +0,0 @@ > -## REST API Specification for Plugins > - > -### Collection: Plugins > - > -**URI:** /plugins > - > -**Methods:** > - > -* **GET**: Retrieve a summarized list names of all UI Plugins > - > -#### Examples > -GET /plugins > -[pluginA, pluginB, pluginC] You should keep this file there for the /plugins API. > diff --git a/docs/API/pluginsmanager.md b/docs/API/pluginsmanager.md > new file mode 100644 > index 0000000..b79c8ad > --- /dev/null > +++ b/docs/API/pluginsmanager.md > @@ -0,0 +1,61 @@ > +## REST API Specification for Plugins Manager > + > +### Collection: Plugins > + > +**URI:** /pluginsmanager > + > +**Methods:** > + > +* **GET**: Retrieve a list of all Plugins configured in Wok, showing name and state. > + > +#### Examples > +GET /pluginsmanager > +[ > + { > + "enabled":true, > + "name":"gingerbase" > + }, > + { > + "enabled":true, > + "name":"kimchi" > + }, > + { > + "enabled":false, > + "name":"sample" > + } > +] > + Maybe it would be good to have the 'uri' listed among of those plugin info. > +### Resource: Plugin > + > +**URI:** /pluginsmanager/*:name* > + > +A plugin represents a software that will make use of infrastructure provided > +by Wok. It should be installed in a directory with its <name> in Wok directory > +'plugins' and contains an <name>.conf file. > +Example: "/usr/lib/python2.7/site-packages/wok/plugins/kimchi" > + > +**Methods:** > + > +* **GET**: Retrieve the full description of the plugin. > + * name: The plugin name > + * enabled: State of the plugin. If not enabled, Wok will not load it > +* **POST**: *See Task Actions* > + > +**Actions (POST):** > + > +* enable: enable a plugin. Also changes plugin's configuration file > + > +* disable: disable a plugin. Also changes plugin's configuration file > + > +#### Examples > +GET /pluginsmanager/sample > +{ > + "enabled":false, > + "name":"sample" > +} > + > +POST /pluginsmanager/sample/enable > +{ > + "enabled":true, > + "name":"sample" > +} Add an example for 'disable' action

2 1

[PATCH] [Wok 0/6] Log failed user requests
by Lucio Correia 08 Jun '16

08 Jun '16

This patch requires "[Kimchi] Do not break the logging of failed requests". Otherwise, some tests will be broken. Lucio Correia (6): Revert "Use past verbs" Parse request before authorization check Use status code 200 for PUT requests on resource Log failed login/logout attempts Log failed user requests Add status code to request log message src/wok/control/base.py | 164 ++++++++++++++++++++++++++++++------------------ src/wok/i18n.py | 4 +- src/wok/reqlogger.py | 10 +-- src/wok/root.py | 44 +++++++++---- 4 files changed, 140 insertions(+), 82 deletions(-) -- 1.9.1

2 9

[PATCH][Kimchi 3/5] Update REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- API.json | 12 ++++++++++++ i18n.py | 2 ++ 2 files changed, 14 insertions(+) diff --git a/API.json b/API.json index 8d4f725..d0e6831 100644 --- a/API.json +++ b/API.json @@ -294,6 +294,18 @@ "minLength": 1, "error": "KCHVM0011E" }, + "boot": { + "description": "Boot order and bootmenu configuration", + "type": "object", + "error": "KCHVM0052E", + "properties": { + "order": { + "description": "Boot order", + "type": "array", + "error": "KCHVM0053E" + } + } + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/i18n.py b/i18n.py index 2d8390f..ec060ae 100644 --- a/i18n.py +++ b/i18n.py @@ -103,6 +103,8 @@ messages = { "KCHVM0049E": _("Cannot power off %(name)s. Virtual machine is shut off."), "KCHVM0050E": _("Cannot shutdown %(name)s. Virtual machine is shut off."), "KCHVM0051E": _("Cannot reset %(name)s. Virtual machine is already shut off."), + "KCHVM0052E": _("Boot configuration must have order list"), + "KCHVM0053E": _("Boot order must be a list of the devices"), "KCHVM0055E": _("Migrate to localhost %(host)s is not allowed."), "KCHVM0056E": _("To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host."), -- 2.5.5

2 4

[PATCH][Kimchi 1/5] Create method to change bootorder of a guest
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index b0b4eb2..854cd04 100644 --- a/model/vms.py +++ b/model/vms.py @@ -81,7 +81,7 @@ VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', - 'name', 'users'] + 'name', 'users', 'boot'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -736,6 +736,34 @@ class VMModel(object): else: remove_metadata_node(dom, 'name') + def _update_bootorder(self, xml, params): + # get element tree from xml + et = ET.fromstring(xml) + + # get machine type + os = et.find("os") + mtype = os.find("type") + + # create new element tree with new bootorder + new_os = E.os() + new_os.append(mtype) + + # iterate over new bootorder and build tag + for device in params["order"]: + + # skip devices not in list + if device not in ["hd", "cdrom", "network", "fd"]: + continue + + # add bootdevice + new_os.append(E.boot(dev=device)) + + # update <os> + et.remove(os) + et.append(new_os) + + return ET.tostring(et) + def _static_vm_update(self, vm_name, dom, params): old_xml = new_xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) params = copy.deepcopy(params) @@ -782,6 +810,10 @@ class VMModel(object): if ('memory' in params and params['memory'] != {}): new_xml = self._update_memory_config(new_xml, params, dom) + # update bootorder + if "boot" in params: + new_xml = self._update_bootorder(new_xml, params["boot"]) + snapshots_info = [] conn = self.conn.get() try: -- 2.5.5

3 5

[PATCH][Kimchi 2/5] Update documentation about bootorder on vm update
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- docs/API.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/API.md b/docs/API.md index 7072ab2..41635ee 100644 --- a/docs/API.md +++ b/docs/API.md @@ -174,6 +174,8 @@ server. * sockets - The maximum number of sockets to use. * cores - The number of cores per socket. * threads - The number of threads per core. + * boot: Update boot order and bootmenu + * order: list of devices to boot * **POST**: *See Virtual Machine Actions* -- 2.5.5

3 2

[PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by pkulkark＠linux.vnet.ibm.com 08 Jun '16

08 Jun '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalises the size units such as KiB, MiB, GiB, etc that are added in wok.formatMeasurement method, and also updates the .pot and *.po files. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- po/de_DE.po | 32 +++++++++++++++++++++++++++++++- po/en_US.po | 32 +++++++++++++++++++++++++++++++- po/es_ES.po | 32 +++++++++++++++++++++++++++++++- po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- po/it_IT.po | 32 +++++++++++++++++++++++++++++++- po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- po/wok.pot | 32 +++++++++++++++++++++++++++++++- po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- ui/js/src/wok.utils.js | 7 ++++++- ui/pages/i18n.json.tmpl | 13 ++++++++++++- 14 files changed, 390 insertions(+), 14 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 0fb869d..c2b9a0a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " diff --git a/po/en_US.po b/po/en_US.po index 73d7056..b31785b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 8acb513..d77c60e 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " diff --git a/po/fr_FR.po b/po/fr_FR.po index 9cc473a..065113b 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -204,6 +204,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " diff --git a/po/it_IT.po b/po/it_IT.po index ef3729d..d871172 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " diff --git a/po/ja_JP.po b/po/ja_JP.po index dc8926f..cde5d87 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -199,6 +199,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" diff --git a/po/ko_KR.po b/po/ko_KR.po index 84b4750..2ef50fb 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." diff --git a/po/pt_BR.po b/po/pt_BR.po index a4ae451..75a6c9b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -217,6 +217,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." diff --git a/po/ru_RU.po b/po/ru_RU.po index 0e81ba4..392be6d 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -197,6 +197,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." diff --git a/po/wok.pot b/po/wok.pot index 01b8a28..231cd33 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0a66eec..5d81cc5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -212,6 +212,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" diff --git a/po/zh_TW.po b/po/zh_TW.po index fd83384..ccd1d48 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..8eb6f08 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, digits, base) { var fixed = settings['fixed']; var unitMapping = unitBaseMapping[base]; + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', + 'Ti': 'WOKFMT2004M', 'Pi': 'WOKFMT2005M', 'k': 'WOKFMT2006M', + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', 'T': 'WOKFMT2009M', + 'P': 'WOKFMT2010M'} for(var i = unitMapping.length - 1; i >= 0; i--) { var mapping = unitMapping[i]; - var suffix = mapping['us']; + var s_key = mapping['us']; + var suffix = i18n[unitmap[s_key]]; var startingValue = mapping['v']; if(number < startingValue) { continue; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ca7ae4c..94e90ac 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,5 +49,16 @@ "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries")", "WOKSETT0010M": "$_("No results found!")", "WOKSETT0011M": "$_("Loading...")", - "WOKSETT0012M": "$_("Actions")" + "WOKSETT0012M": "$_("Actions")", + + "WOKFMT2001M": "$_("Ki")", + "WOKFMT2002M": "$_("Mi")", + "WOKFMT2003M": "$_("Gi")", + "WOKFMT2004M": "$_("Ti")", + "WOKFMT2005M": "$_("Pi")", + "WOKFMT2006M": "$_("k")", + "WOKFMT2007M": "$_("M")", + "WOKFMT2008M": "$_("G")", + "WOKFMT2009M": "$_("T")", + "WOKFMT2010M": "$_("P")" } -- 2.1.0

2 2

Re: [Kimchi-devel] [PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by Aline Manera 08 Jun '16

08 Jun '16

OK. Thanks for the inputs, Archana and Pooja. On 06/01/2016 03:54 AM, Archana Singh wrote: > > > On 6/1/2016 7:07 AM, Aline Manera wrote: >> >> >> On 05/31/2016 10:34 PM, Aline Manera wrote: >>> >>> >>> On 05/31/2016 06:00 AM, Pooja Kulkarni wrote: >>>> Hi Aline, >>>> >>>> I do not have a good example for this, but I did come across >>>> something while searching around. >>>> French use Ko (kilo-octet) instead of Kb as a unit of size. So this >>>> leads me to believe there could be other such scenarios while >>>> dealing with different locales. >>>> >>> >>> Hi Pooja, >>> >>> I don't think Ko is the same of KB. From a quick search over the >>> internet I found Ko = 8KB. So it is wrong to 'translate' that as the >>> backend will send the data always in KB. >>> >> >> Maybe we need more references on that to decide on what to do. > Found some more references: wiki > https://fr.wikipedia.org/wiki/M%C3%A9ga it says: > "le mébioctet Mio (en anglais MiB, pour mébibyte) qui représente 1 024 > (210) kibioctets, soit 1 048 576 (220) octets" . > which when translated in English it is "Mio mébioctet (English MiB for > mebibyte ), which represents 1024 (210) kibibytes or 1 048 576 (220) > bytes". > > And also I have tried translation of English "Byte" to french which is > "octet". >> >>>> Thanks, >>>> Pooja >>>> >>>> On 05/30/2016 08:52 PM, Aline Manera wrote: >>>>> >>>>> Hi Pooja, >>>>> >>>>> Isn't KiB, MiB, GiB, ect international units for computing ? >>>>> Do you have any example on which language they are 'translated' to >>>>> a different unit name? >>>>> >>>>> Thanks, >>>>> Aline Manera >>>>> >>>>> On 05/25/2016 06:55 AM, pkulkark(a)linux.vnet.ibm.com wrote: >>>>>> From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> >>>>>> This patch externalises the size >>>>>> units such as KiB, MiB, GiB, etc >>>>>> that are added in wok.formatMeasurement >>>>>> method, and also updates the .pot >>>>>> and *.po files. >>>>>> >>>>>> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> --- >>>>>> po/de_DE.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/en_US.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/es_ES.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/it_IT.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/wok.pot | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- >>>>>> ui/js/src/wok.utils.js | 7 ++++++- >>>>>> ui/pages/i18n.json.tmpl | 13 ++++++++++++- >>>>>> 14 files changed, 390 insertions(+), 14 deletions(-) >>>>>> >>>>>> diff --git a/po/de_DE.po b/po/de_DE.po >>>>>> index 0fb869d..c2b9a0a 100644 >>>>>> --- a/po/de_DE.po >>>>>> +++ b/po/de_DE.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Der Benutzername oder das Kennwort, den bzw. das Sie >>>>>> eingegeben haben, ist " >>>>>> diff --git a/po/en_US.po b/po/en_US.po >>>>>> index 73d7056..b31785b 100644 >>>>>> --- a/po/en_US.po >>>>>> +++ b/po/en_US.po >>>>>> @@ -6,7 +6,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/es_ES.po b/po/es_ES.po >>>>>> index 8acb513..d77c60e 100644 >>>>>> --- a/po/es_ES.po >>>>>> +++ b/po/es_ES.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "El nombre de usuario o contraseña que ha especificado es >>>>>> incorrecto. Por " >>>>>> diff --git a/po/fr_FR.po b/po/fr_FR.po >>>>>> index 9cc473a..065113b 100644 >>>>>> --- a/po/fr_FR.po >>>>>> +++ b/po/fr_FR.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2014-08-27 21:30+0000\n" >>>>>> "Last-Translator: BobSynfig\n" >>>>>> "Language-Team: French >>>>>> (http://www.transifex.com/projects/p/kimchi/language/" >>>>>> @@ -204,6 +204,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Le nom d'utilisateur ou le mot de passe que vous avez entré >>>>>> est incorrect. " >>>>>> diff --git a/po/it_IT.po b/po/it_IT.po >>>>>> index ef3729d..d871172 100644 >>>>>> --- a/po/it_IT.po >>>>>> +++ b/po/it_IT.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Il nome utente o la password immessi non sono corretti. >>>>>> Ripetere " >>>>>> diff --git a/po/ja_JP.po b/po/ja_JP.po >>>>>> index dc8926f..cde5d87 100644 >>>>>> --- a/po/ja_JP.po >>>>>> +++ b/po/ja_JP.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -199,6 +199,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "入力したユーザー名またはパスワードが誤っています。やり直し >>>>>> てください。" >>>>>> >>>>>> diff --git a/po/ko_KR.po b/po/ko_KR.po >>>>>> index 84b4750..2ef50fb 100644 >>>>>> --- a/po/ko_KR.po >>>>>> +++ b/po/ko_KR.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하 >>>>>> 십시오." >>>>>> diff --git a/po/pt_BR.po b/po/pt_BR.po >>>>>> index a4ae451..75a6c9b 100644 >>>>>> --- a/po/pt_BR.po >>>>>> +++ b/po/pt_BR.po >>>>>> @@ -20,7 +20,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 1.0\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2015-03-23 12:57+0000\n" >>>>>> "Last-Translator: Crístian Deives dos Santos Viana >>>>>> <cristiandeives@gmail." >>>>>> "com>\n" >>>>>> @@ -217,6 +217,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "O usuário ou senha inseridos estão incorretos. Por favor, >>>>>> tente novamente." >>>>>> diff --git a/po/ru_RU.po b/po/ru_RU.po >>>>>> index 0e81ba4..392be6d 100644 >>>>>> --- a/po/ru_RU.po >>>>>> +++ b/po/ru_RU.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2014-08-28 17:32+0000\n" >>>>>> "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" >>>>>> "Language-Team: Russian >>>>>> (http://www.transifex.com/projects/p/kimchi/language/" >>>>>> @@ -197,6 +197,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "Указано неверное имя пользователя или пароль. Введите >>>>>> еще раз." >>>>>> >>>>>> diff --git a/po/wok.pot b/po/wok.pot >>>>>> index 01b8a28..231cd33 100755 >>>>>> --- a/po/wok.pot >>>>>> +++ b/po/wok.pot >>>>>> @@ -8,7 +8,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: PACKAGE VERSION\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" >>>>>> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" >>>>>> "Language-Team: LANGUAGE <LL(a)li.org>\n" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/zh_CN.po b/po/zh_CN.po >>>>>> index 0a66eec..5d81cc5 100644 >>>>>> --- a/po/zh_CN.po >>>>>> +++ b/po/zh_CN.po >>>>>> @@ -20,7 +20,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-06-27 10:48+0000\n" >>>>>> "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" >>>>>> @@ -212,6 +212,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "用户名或密码错误，请重新输入。" >>>>>> >>>>>> diff --git a/po/zh_TW.po b/po/zh_TW.po >>>>>> index fd83384..ccd1d48 100644 >>>>>> --- a/po/zh_TW.po >>>>>> +++ b/po/zh_TW.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "您輸入的使用者名稱或密碼不正確。請重試。" >>>>>> >>>>>> diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js >>>>>> index 1fb3c9b..8eb6f08 100644 >>>>>> --- a/ui/js/src/wok.utils.js >>>>>> +++ b/ui/js/src/wok.utils.js >>>>>> @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, >>>>>> digits, base) { >>>>>> var fixed = settings['fixed']; >>>>>> >>>>>> var unitMapping = unitBaseMapping[base]; >>>>>> + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': >>>>>> 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', >>>>>> + 'Ti': 'WOKFMT2004M', 'Pi': >>>>>> 'WOKFMT2005M', 'k': 'WOKFMT2006M', >>>>>> + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', >>>>>> 'T': 'WOKFMT2009M', >>>>>> + 'P': 'WOKFMT2010M'} >>>>>> for(var i = unitMapping.length - 1; i >= 0; i--) { >>>>>> var mapping = unitMapping[i]; >>>>>> - var suffix = mapping['us']; >>>>>> + var s_key = mapping['us']; >>>>>> + var suffix = i18n[unitmap[s_key]]; >>>>>> var startingValue = mapping['v']; >>>>>> if(number < startingValue) { >>>>>> continue; >>>>>> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl >>>>>> index ca7ae4c..94e90ac 100644 >>>>>> --- a/ui/pages/i18n.json.tmpl >>>>>> +++ b/ui/pages/i18n.json.tmpl >>>>>> @@ -49,5 +49,16 @@ >>>>>> "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} >>>>>> of {{ctx.total}} entries")", >>>>>> "WOKSETT0010M": "$_("No results found!")", >>>>>> "WOKSETT0011M": "$_("Loading...")", >>>>>> - "WOKSETT0012M": "$_("Actions")" >>>>>> + "WOKSETT0012M": "$_("Actions")", >>>>>> + >>>>>> + "WOKFMT2001M": "$_("Ki")", >>>>>> + "WOKFMT2002M": "$_("Mi")", >>>>>> + "WOKFMT2003M": "$_("Gi")", >>>>>> + "WOKFMT2004M": "$_("Ti")", >>>>>> + "WOKFMT2005M": "$_("Pi")", >>>>>> + "WOKFMT2006M": "$_("k")", >>>>>> + "WOKFMT2007M": "$_("M")", >>>>>> + "WOKFMT2008M": "$_("G")", >>>>>> + "WOKFMT2009M": "$_("T")", >>>>>> + "WOKFMT2010M": "$_("P")" >>>>>> } >>>>> >>>> >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >

1 0

[PATCH][Gingerbase] Do not use default value when declare a function
by Ramon Medeiros 08 Jun '16

08 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- disks.py | 4 +++- model/packagesupdate.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/disks.py b/disks.py index 2883431..a1ba7c2 100644 --- a/disks.py +++ b/disks.py @@ -47,7 +47,9 @@ def _get_dev_node_path(maj_min): return "/dev/%s" % data["DEVNAME"] -def _get_lsblk_devs(keys, devs=[]): +def _get_lsblk_devs(keys, devs=None): + if devs is None: + devs = [] out, err, returncode = run_command( ["lsblk", "-Pbo"] + [','.join(keys)] + devs ) diff --git a/model/packagesupdate.py b/model/packagesupdate.py index 073667c..42011f7 100644 --- a/model/packagesupdate.py +++ b/model/packagesupdate.py @@ -56,11 +56,13 @@ class PackageUpdateModel(object): return self.host_swupdate.getUpdate(name) - def _resolve_dependencies(self, package=None, dep_list=[]): + def _resolve_dependencies(self, package=None, dep_list=None): """ Resolve the dependencies for a given package from the dictionary of eligible packages to be upgraded. """ + if dep_list is None: + dep_list = [] if package is None: return [] dep_list.append(package) -- 2.5.5

4 4

[PATCH] [Kimchi] Pass only those fields that have been modified in Edit Guest; Match maxmem to mem when guest is not running or paused
by Socorro Stoppler 08 Jun '16

08 Jun '16

v2: Made adjustments on how things were being done based on feedback. Also included the fix for github issue#: 941 - max memory should increase when mem is increased. v1: This patch fixes bugzilla#: 141686 -after memory hot plug seeing error 'KCHCPUHP0005E' This patch addresses the issue of what is being passed down to the backend when guest is modified. The issue was passing parameters that were not modified caused the backend to throw an error in the mem hotplug scenario. It now only passes down those parameters that have been modified regarding memory and cpu fields. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 159 ++++++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 2 +- 2 files changed, 108 insertions(+), 53 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4cee8fe..fc67d82 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -668,10 +668,8 @@ kimchi.guest_edit_main = function() { guest['max-processor'] = guest.cpu_info['maxvcpus']; guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); - $('#guest-edit-memory-textbox').val(parseInt(guest.memory.current)); $('#guest-edit-max-memory-textbox').val(parseInt(guest.memory.maxmemory)); - kimchi.thisVMState = guest['state']; refreshCDROMs(); $('#guest-edit-attach-cdrom-button').on('click', function(event) { @@ -706,6 +704,12 @@ kimchi.guest_edit_main = function() { $('#guest-show-max-processor i.fa').toggleClass('fa-plus-circle fa-minus-circle'); }); + if ((kimchi.thisVMState !== "running") && (kimchi.thisVMState !== "paused")) { + $("#guest-edit-memory-textbox").bind('keyup blur', function(e) { + $('#guest-edit-max-memory-textbox').val($(this).val()); + }); + } + var onAttached = function(params) { refreshCDROMs(); }; @@ -736,59 +740,110 @@ kimchi.guest_edit_main = function() { kimchi.retrieveVM(kimchi.selectedGuest, initContent); var generalSubmit = function(event) { - $(saveButton).prop('disabled', true); - var data = $('#form-guest-edit-general').serializeObject(); - if (data['memory'] !== undefined) { - data['memory'] = Number(data['memory']); - } - if (data['max-memory'] !== undefined) { - data['max-memory'] = Number(data['max-memory']); - } - - // Test memory values before submit. Avoid requests we know are going to fail - if (parseInt($('#guest-edit-memory-textbox').val()) > parseInt($('#guest-edit-max-memory-textbox').val())) { - wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; - } - - // Test CPU values before submit. Avoid requests we know are going to fail - if (parseInt($('#guest-edit-cores-textbox').val()) > parseInt($('#guest-edit-max-processor-textbox').val())) { - wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; - } - - if (data['vcpus'] !== undefined) { - var cpu = Number(data['vcpus']); - var maxCpu = Number(data['max-processor']); - if (data['max-processor'] !== undefined && data['max-processor'] !== "") { - if (maxCpu >= cpu || maxCpu < cpu ) { // if maxCpu < cpu, this will throw an error from backend - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpu - }; + kimchi.retrieveVM(kimchi.selectedGuest, function(org) { + $(saveButton).prop('disabled', true); + var data = $('#form-guest-edit-general').serializeObject(); + data['memory'] = {current: Number(data['memory-ui']), maxmemory: Number(data['max-memory'])}; + data['cpu_info'] = {maxvcpus: Number(data['max-processor']), vcpus: Number(data['vcpus']), topology: org['cpu_info']['topology']}; + var changedFields = {}; + for (var key in data) { + valueFromUI = data[key]; + if (valueFromUI instanceof Object) { + // Compare if Objects of original and data are identical + // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem + // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required + if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { + if (key === 'cpu_info') { + continue; + } + if (key === 'memory') { + // Replace valueFromUI of max mem with one from original as otherwise the value is undefined + data['memory']['maxmemory'] = org.memory.maxmemory; + } + } + // NOTE: Be aware of using this comparison as the order of the properties matter + if (JSON.stringify(valueFromUI) !== JSON.stringify(org[key])) { + changedFields[key] = valueFromUI; + } + } else { + if (org[key] !== undefined) { + if (data[key] != org[key]) { + changedFields[key] = valueFromUI; + } + } } - } else { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: cpu - }; } - delete data['vcpus']; - delete data['max-processor']; - } - - memory = {'current': data['memory'], 'maxmemory': data['max-memory']}; + var origMem = Number(org.memory.current); + var origMaxMem = Number(org.memory.maxmemory); + var origCpu = Number(org.cpu_info.vcpus); + var origMaxCpu = Number(org.cpu_info.maxvcpus); + var currentMem = data['memory-ui']; + var currentMaxMem = data['max-memory']; + var currentCpu = data['vcpus']; + var currentMaxCpu = data['max-processor']; + + if ('memory' in changedFields) { + if (currentMaxMem !== undefined) { + currentMaxMem = Number(currentMaxMem); + if (currentMaxMem === origMaxMem) { + delete changedFields.memory.maxmemory; + } + } else { + delete changedFields.memory.maxmemory; + } + if (currentMem !== undefined) { + currentMem = Number(currentMem); + if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { + // Compare to original max mem since current max mem is undefined in UI due to being disabled + if (currentMem > origMaxMem) { + wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + } + if (currentMem === origMem) { + delete changedFields.memory.current; + } + } else { + delete changedFields.memory.current; + } + } + if ('cpu_info' in changedFields) { + if (currentMaxCpu !== undefined) { + currentMaxCpu = Number(currentMaxCpu); + if (currentMaxCpu === origMaxCpu) { + delete changedFields.cpu_info.maxvcpus; + } + } else { + delete changedFields.cpu_info.maxvcpus; + } + if (currentCpu !== undefined) { + currentCpu = Number(currentCpu); + if (currentMaxCpu !== undefined && currentCpu > currentMaxCpu) { + wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + if (currentCpu === origCpu) { + delete changedFields.cpu_info.vcpus; + } + if (currentMaxCpu === origMaxCpu) { + delete changedFields.cpu_info.maxvcpus; + } + } else { + delete changedFields.cpu_info.vcpus; + } + // Delete this as it is not applicable regardless + delete changedFields.cpu_info.topology; + } + kimchi.updateVM(kimchi.selectedGuest, changedFields, function() { + kimchi.listVmsAuto(); + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + $(saveButton).prop('disabled', false); + }); - data.memory = memory; - delete data['max-memory']; - kimchi.updateVM(kimchi.selectedGuest, data, function() { - kimchi.listVmsAuto(); - wok.window.close(); - }, function(err) { - wok.message.error(err.responseJSON.reason, '#alert-modal-container'); - $(saveButton).prop('disabled', false); }); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 5b7155a..f18d42c 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -58,7 +58,7 @@ <div class="form-group"> <label for="guest-edit-memory-textbox">$_("Memory (MB)")</label> <div id="guest-memory"> - <input id="guest-edit-memory-textbox" class="form-control" name="memory" type="number" min="1024" step="1024" /> + <input id="guest-edit-memory-textbox" class="form-control" name="memory-ui" type="number" min="1024" step="1024" /> <button id="guest-show-max-memory" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="text">$_("More")</span></button> </div> </div> -- 2.5.0

2 2

[PATCH] [Kimchi] [PATCH] [Kimchi] Fixed Storage Volume upload error message when switching tabs
by sguimaraes943＠gmail.com 08 Jun '16

08 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes a bug that would occur if the user starts uploading a volume and switches to a different tab or select a different Storage Pool and starts a new upload while the previous task is still in progress. It would return an error message as "KCHPOOL0002E: Storage pool undefined does not exist" and stop the upload progress but the upload task would keep returning "running" until Wok server is finished. This was happening because the global variabel kimchi.selectedSP was sent as an argument to the functions kimchi.createVolumeWithCapacity() and kimchi.uploadVolumeToSP(). The solution was creating a copy of the current kimchi.selectedSP value in each kimchi.sp_add_volume_main() function call. Samuel Guimarães (1): Fixed Storage Volume upload error message when switching tabs ui/js/src/kimchi.storagepool_add_volume_main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 1.9.3

2 2

[PATCH][Kimchi] Do not use default value when declare a function
by Ramon Medeiros 08 Jun '16

08 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- mockmodel.py | 5 ++++- model/networks.py | 5 ++++- model/templates.py | 5 ++++- model/vmsnapshots.py | 4 +++- network.py | 5 ++++- xmlutils/bootorder.py | 5 ++++- xmlutils/cpu.py | 4 +++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index 6c70472..9f9de52 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -714,7 +714,10 @@ class MockDevices(object): class MockVMSnapshot(object): - def __init__(self, name, params={}): + def __init__(self, name, params=None): + if params is None: + params = {} + self.name = name self.current = True diff --git a/model/networks.py b/model/networks.py index 3b2a9e2..4b722d3 100644 --- a/model/networks.py +++ b/model/networks.py @@ -123,7 +123,10 @@ class NetworksModel(object): names = conn.listNetworks() + conn.listDefinedNetworks() return sorted(map(lambda x: x.decode('utf-8'), names)) - def _get_available_address(self, addr_pools=[]): + def _get_available_address(self, addr_pools=None): + if addr_pools is None: + addr_pools = [] + invalid_addrs = [] for net_name in self.get_list(): network = NetworkModel.get_network(self.conn.get(), net_name) diff --git a/model/templates.py b/model/templates.py index 25bc017..a299c85 100644 --- a/model/templates.py +++ b/model/templates.py @@ -177,7 +177,10 @@ class TemplateModel(object): self.templates = TemplatesModel(**kargs) @staticmethod - def get_template(name, objstore, conn, overrides={}): + def get_template(name, objstore, conn, overrides=None): + if overrides is None: + overrides = {} + with objstore as session: params = session.get('template', name) if overrides and 'storagepool' in overrides: diff --git a/model/vmsnapshots.py b/model/vmsnapshots.py index fd17d2f..6f2483c 100644 --- a/model/vmsnapshots.py +++ b/model/vmsnapshots.py @@ -40,7 +40,7 @@ class VMSnapshotsModel(object): self.vmstorages = VMStoragesModel(**kargs) self.vmstorage = VMStorageModel(**kargs) - def create(self, vm_name, params={}): + def create(self, vm_name, params=None): """Create a snapshot with the current domain state. The VM must be stopped and contain only disks with format 'qcow2'; @@ -55,6 +55,8 @@ class VMSnapshotsModel(object): Return: A Task running the operation. """ + if params is None: + params = {} vir_dom = VMModel.get_vm(vm_name, self.conn) if DOM_STATE_MAP[vir_dom.info()[0]] != u'shutoff': raise InvalidOperation('KCHSNAP0001E', {'vm': vm_name}) diff --git a/network.py b/network.py index dd7b50f..ec567ca 100644 --- a/network.py +++ b/network.py @@ -52,7 +52,10 @@ def get_dev_netaddrs(): # used_nets should include all the subnet allocated in libvirt network # will get host network by get_dev_netaddrs -def get_one_free_network(used_nets, nets_pool=PrivateNets): +def get_one_free_network(used_nets, nets_pool=None): + if nets_pool is None: + nets_pool = PrivateNets + def _get_free_network(nets, used_nets): for net in nets.subnet(new_prefix=24): if not any(net.overlaps(used) for used in used_nets): diff --git a/xmlutils/bootorder.py b/xmlutils/bootorder.py index 28457e7..9e444bd 100644 --- a/xmlutils/bootorder.py +++ b/xmlutils/bootorder.py @@ -21,7 +21,7 @@ import lxml.etree as ET from lxml.builder import E -def get_bootorder_xml(boot_order=['hd', 'cdrom', 'network']): +def get_bootorder_xml(boot_order=None): """ Returns the XML for boot order. The default return includes the following: @@ -31,6 +31,9 @@ def get_bootorder_xml(boot_order=['hd', 'cdrom', 'network']): To a different boot order, specify the order by a list as argument. """ + if boot_order is None: + boot_order = ['hd', 'cdrom', 'network'] + boot_xml = '' for device in boot_order: boot = E.boot(dev=device) diff --git a/xmlutils/cpu.py b/xmlutils/cpu.py index 08a6afb..7548be2 100644 --- a/xmlutils/cpu.py +++ b/xmlutils/cpu.py @@ -45,7 +45,7 @@ def get_topology_xml(cpu_topo): return ET.tostring(xml) -def get_cpu_xml(cpus, memory, cpu_topo={}): +def get_cpu_xml(cpus, memory, cpu_topo=None): # Returns the libvirt CPU element based on given numa and topology # CPU element will always have numa element # <cpu> @@ -54,6 +54,8 @@ def get_cpu_xml(cpus, memory, cpu_topo={}): # </numa> # <topology sockets='1' cores='2' threads='1'/> # </cpu> + if cpu_topo is None: + cpu_topo = {} xml = E.cpu(ET.fromstring(get_numa_xml(cpus, memory))) if cpu_topo: xml.insert(0, ET.fromstring(get_topology_xml(cpu_topo))) -- 2.5.5

3 2

Re: [Kimchi-devel] Clean FEATURETEST_VM effectively.
by Aline Manera 08 Jun '16

08 Jun '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Substitute quotes by apostrophe in configuration file
by Aline Manera 08 Jun '16

08 Jun '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Wok 1/2] Include user IP address in request log messages
by Aline Manera 08 Jun '16

08 Jun '16

Hi Lucio, The patch looks good! But please, update API.md documentation and if possible, add/change test cases to confirm the API keeps working as expected. Thanks, Aline Manera On 06/03/2016 06:40 PM, Lucio Correia wrote: > * Allow advanced log searches by IP address > * Add RECORD_TEMPLATE_DICT to avoid versioning errors > with older log entries, which don't have IP address. > * Remove duplicated comment line > > Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> > --- > src/wok/control/base.py | 10 ++++++---- > src/wok/reqlogger.py | 17 ++++++++++++++--- > src/wok/root.py | 6 ++++-- > 3 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/src/wok/control/base.py b/src/wok/control/base.py > index 4b459ed..419179a 100644 > --- a/src/wok/control/base.py > +++ b/src/wok/control/base.py > @@ -146,7 +146,8 @@ class Resource(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > if destructive is False or \ > @@ -227,7 +228,8 @@ class Resource(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return result > @@ -374,7 +376,6 @@ class Collection(object): > except Exception as e: > # In case of errors when fetching a resource info, pass and > # log the error, so, other resources are returned > - # log the error, so, other resources are returned. > # Encoding error message as ident is also encoded value. > # This has to be done to avoid unicode error, > # as combination of encoded and unicode value results into > @@ -455,7 +456,8 @@ class Collection(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return result > diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py > index bbd1bd0..2ec62b8 100644 > --- a/src/wok/reqlogger.py > +++ b/src/wok/reqlogger.py > @@ -34,10 +34,20 @@ from wok.utils import ascii_dict, remove_old_files > > > # Log search setup > -FILTER_FIELDS = ['app', 'date', 'download', 'req', 'user', 'time'] > +FILTER_FIELDS = ['app', 'date', 'download', 'ip', 'req', 'user', 'time'] > LOG_DOWNLOAD_URI = "/data/logs/%s" > LOG_DOWNLOAD_TIMEOUT = 6 > -LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(user)s: %(message)s\n" > +LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(ip)-15s %(user)s: " \ > + "%(message)s\n" > +RECORD_TEMPLATE_DICT = { > + 'date': '', > + 'time': '', > + 'req': '', > + 'app': '', > + 'ip': '', > + 'user': '', > + 'message': '', > +} > SECONDS_PER_HOUR = 360 > > # Log handler setup > @@ -86,7 +96,8 @@ class RequestParser(object): > > with fd: > for record in sortedList: > - asciiRecord = ascii_dict(record) > + asciiRecord = RECORD_TEMPLATE_DICT > + asciiRecord.update(ascii_dict(record)) > fd.write(LOG_FORMAT % asciiRecord) > > fd.close() > diff --git a/src/wok/root.py b/src/wok/root.py > index 29ea657..902e203 100644 > --- a/src/wok/root.py > +++ b/src/wok/root.py > @@ -172,7 +172,8 @@ class WokRoot(Root): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(auth.USER_NAME, 'N/A') > + user=cherrypy.session.get(auth.USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return json.dumps(user_info) > @@ -187,7 +188,8 @@ class WokRoot(Root): > msg, > app=get_plugin_from_request(), > req=method, > - user=params['username'] > + user=params['username'], > + ip=cherrypy.request.remote.ip > ).log() > > auth.logout()

1 0

[PATCH][Wok] Do not use default value when declare a function
by Ramon Medeiros 08 Jun '16

08 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/exception.py | 4 +++- src/wok/message.py | 4 +++- src/wok/model/notifications.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/wok/exception.py b/src/wok/exception.py index 52f007e..90b6410 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -25,7 +25,9 @@ from wok.message import WokMessage class WokException(Exception): - def __init__(self, code='', args={}): + def __init__(self, code='', args=None): + if args is None: + args = {} self.code = code msg = WokMessage(code, args).get_text() cherrypy.log.error_log.error(msg) diff --git a/src/wok/message.py b/src/wok/message.py index a7162c7..4c35747 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -26,7 +26,9 @@ from wok.template import get_lang, validate_language class WokMessage(object): - def __init__(self, code='', args={}, plugin=None): + def __init__(self, code='', args=None, plugin=None): + if args is None: + args = {} # make all args unicode for key, value in args.iteritems(): if isinstance(value, unicode): diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index e83ac56..bdb7c78 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -27,7 +27,9 @@ from wok.utils import wok_log notificationsStore = {} -def add_notification(code, args={}, plugin_name=None): +def add_notification(code, args=None, plugin_name=None): + if args is None: + args = {} if not code: wok_log.error("Unable to add notification: invalid code '%(code)s'" % {'code': str(code)}) -- 2.5.5

3 2

[PATCH] [Kimchi] Clean FEATURETEST_VM effectively.
by pvital＠linux.vnet.ibm.com 07 Jun '16

07 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> FEATURETEST_VM is defined at Kimchi start up to check if few QEMU and Libvirt features are enabled in the host system. Some bugs reported the existence of this VM running in the system, even after the Kimchi Feature Tests have completed. This patch adds a cleaning step before start the Kimchi Feature Tests. In addition, modified the has_mem_hotplug_support() to not use RollbackContext and guarantee that FEATURETEST_VM will be undefined. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- model/config.py | 3 +++ model/featuretests.py | 33 +++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/model/config.py b/model/config.py index fc4b285..78cdaeb 100644 --- a/model/config.py +++ b/model/config.py @@ -57,6 +57,9 @@ class CapabilitiesModel(object): self.mem_hotplug_support = False self.libvirtd_running = False + # make sure there're no Kimchi leftovers from previous executions + self._clean_leftovers() + # run feature tests self._set_capabilities() diff --git a/model/featuretests.py b/model/featuretests.py index 2b680c3..fca152d 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -24,7 +24,6 @@ import platform import subprocess from lxml.builder import E -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, servermethod, wok_log @@ -220,22 +219,24 @@ class FeatureTests(object): # Libvirt < 1.2.14 does not support memory devices, so try to attach a # device. Then check if QEMU (>= 2.1) supports memory hotplug, starting # the guest These steps avoid errors with Libvirt 'test' driver for KVM - with RollbackContext() as rollback: + conn_type = conn.getType().lower() + domain_type = 'test' if conn_type == 'test' else 'kvm' + arch = 'i686' if conn_type == 'test' else platform.machine() + arch = 'ppc64' if arch == 'ppc64le' else arch + + dom = None + try: FeatureTests.disable_libvirt_error_logging() - rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) - conn_type = conn.getType().lower() - domain_type = 'test' if conn_type == 'test' else 'kvm' - arch = 'i686' if conn_type == 'test' else platform.machine() - arch = 'ppc64' if arch == 'ppc64le' else arch dom = conn.defineXML(MAXMEM_VM_XML % {'name': FEATURETEST_VM_NAME, 'domain': domain_type, 'arch': arch}) - rollback.prependDefer(dom.undefine) - try: - dom.attachDeviceFlags(DEV_MEM_XML, - libvirt.VIR_DOMAIN_MEM_CONFIG) - dom.create() - rollback.prependDefer(dom.destroy) - return True - except libvirt.libvirtError: - return False + dom.attachDeviceFlags(DEV_MEM_XML, libvirt.VIR_DOMAIN_MEM_CONFIG) + dom.create() + except libvirt.libvirtError: + return False + finally: + if (dom and dom.isActive() == 1): + dom.destroy() + dom is None or dom.undefine() + FeatureTests.enable_libvirt_error_logging() + return True -- 2.5.5

2 1

[PATCH][Wok] Warn user when server is not reachable at login page
by Ramon Medeiros 07 Jun '16

07 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/wok.login.js | 10 ++++++++-- ui/pages/login.html.tmpl | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 7423f81..0b09508 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -74,8 +74,14 @@ wok.login_main = function() { } wok.cookie.set('roles',JSON.stringify(data.roles)); window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); - }, function() { - $("#messUserPass").show(); + }, function(jqXHR, textStatus, errorThrown) { + if (jqXHR.responseText == "") { + $("#messUserPass").hide(); + $("#missServer").show(); + } else { + $("#missServer").hide(); + $("#messUserPass").show(); + } $("#messSession").hide(); $("#logging").hide(); $("#login").show(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 0357d64..d6daeb7 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -101,6 +101,7 @@ <div class="err-area"> <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> + <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.5.5

2 1

[PATCH][Kimchi 5/5] Add test to check bootorder
by Ramon Medeiros 07 Jun '16

07 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- tests/test_model.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_model.py b/tests/test_model.py index f4a145f..04c20df 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1125,6 +1125,11 @@ class ModelTests(unittest.TestCase): self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['users']) self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + # change bootorder + b_order = ["hd", "network", "cdrom"] + inst.vm_update(u'пeω-∨м', {"boot":{"order":b_order}}) + self.assertEquals(b_order, inst.vm_lookup(u'пeω-∨м')['boot']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) -- 2.5.5

2 1

Re: [Kimchi-devel] [PATCH][Kimchi 0/5] Make Kimchi able to change guest's boot order
by Ramon Medeiros 07 Jun '16

07 Jun '16

How to use: curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -k http://localhost:8010/plugins/kimchi/vms/fedora -X PUT -d '{"boot":{"order":["cdrom", "hd"]}}' Enter host password for user 'root': { "users":[], "screenshot":null, "persistent":true, "cpu_info":{ "maxvcpus":1, "vcpus":1, "topology":{} }, "groups":[], "graphics":{ "passwd":null, "passwdValidTo":null, "type":"vnc", "port":null, "listen":"127.0.0.1" }, "icon":"plugins/kimchi/images/icon-fedora.png", "stats":{ "cpu_utilization":0, "io_throughput":0, "io_throughput_peak":100, "net_throughput":0, "mem_utilization":0, "net_throughput_peak":100 }, "name":"fedora", "boot":[ "cdrom", "hd" ], "uuid":"98a82c16-c6ae-4253-b018-08ab3fde8f5e", "access":"full", "state":"shutoff", "memory":{ "current":1024, "maxmemory":1024 } } On 06/06/2016 06:13 PM, Ramon Medeiros wrote: > Ramon Medeiros (5): > 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 | 12 ++++++++++++ > docs/API.md | 2 ++ > i18n.py | 2 ++ > model/vms.py | 41 +++++++++++++++++++++++++++++++++++++++-- > tests/test_model.py | 5 +++++ > 5 files changed, 60 insertions(+), 2 deletions(-) > -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH][Kimchi 4/5] Add function to retrieve bootorder on vm lookup
by Ramon Medeiros 06 Jun '16

06 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 854cd04..ad788bc 100644 --- a/model/vms.py +++ b/model/vms.py @@ -94,6 +94,7 @@ XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' +XPATH_BOOT = 'os/boot/@dev' XPATH_CPU = './cpu' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' @@ -1250,6 +1251,9 @@ class VMModel(object): else: maxmemory = memory + # get boot order + boot = xpath_get_text(xml, XPATH_BOOT) + return {'name': name, 'state': state, 'stats': res, @@ -1267,7 +1271,8 @@ class VMModel(object): 'users': users, 'groups': groups, 'access': 'full', - 'persistent': True if dom.isPersistent() else False + 'persistent': True if dom.isPersistent() else False, + 'boot': boot } def _vm_get_disk_paths(self, dom): -- 2.5.5

1 0