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