December 2016 - Kimchi-devel - oVirt List Archives

trouble while executing make check
by Rohan Gupta 31 Jan '17

31 Jan '17

hello sir, hope this is the right place to ask queries, i tried to install kimchi on centos 7 and when i run make check-local, i ran into a error. # make check-local contrib/check_i18n.py ./i18n.py Checking for invalid i18n string... Checking for invalid i18n string successfully /bin/pep8 --version 1.4.6 /bin/pep8 --filename '*.py,*.py.in' --exclude="*config.py,*i18n.py,*tests/test_config.py" . ./model/vms.py:1376:24: E127 continuation line over-indented for visual indent make: *** [check-local] Error 1 will i get a possible solution for this. thank you Rohan Raj Gupta

2 1

[RFC] [Wok] #147 Block authentication request after too many failures
by Ramon Medeiros 18 Jan '17

18 Jan '17

Propose: make adjustments at login page to make difficult brute force attack. Today, an intruder can make login tries without any action from Wok. Possible measures: Record source port and ip. After 3 tries, block user for 30 seconds and increase the time by each more try. Using source port and ip will avoid errors for connections from NAT networks. Example: 1) ip 192.168.1.1 tries to login as root 3 times and fail 2) A timeout of 30 seconds will be set 3) After that, for 5 minutes, each try will add 30 seconds + x times the trial (60 seconds, 90 seconds. ..) 4) After 5 minutes of the last try, the counter will be reset. -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 4

[PATCH] [Wok] Always install firewalld conf for all distributions
by Lucio Correia 05 Jan '17

05 Jan '17

Even if firewalld is not installed, Wok should install specific wokd.xml for it, for the case firewalld is installed afterwards. This patch does that by removing checks for existing firewalld directory and removing all build and runtime dependencies on firewalld, since it's not required to run Wok. Also, by always installing config for firealld, it fixes issues #27 and #185 another way. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 14 +++++++------- contrib/wok.spec.fedora.in | 4 +--- contrib/wok.spec.suse.in | 2 +- docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 72ffb50..7b34dca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,9 @@ install-deb: install $(DESTDIR)/etc/init/wokd.conf; \ fi $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/ + $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services + cp -R $(top_srcdir)/src/firewalld.xml \ + $(DESTDIR)/usr/lib/firewalld/services/wokd.xml deb: contrib/make-deb.sh @@ -143,10 +146,8 @@ install-data-local: $(INSTALL_DATA) contrib/wokd.sysvinit $(DESTDIR)/etc/init.d/wokd; \ chmod +x $(DESTDIR)/etc/init.d/wokd; \ fi; \ - if test -d /usr/lib/firewalld/services/; then \ - mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ - $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \ - fi; \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; mkdir -p $(DESTDIR)/$(localstatedir)/lib/wok/ mkdir -p $(DESTDIR)/$(localstatedir)/log/wok/ touch $(DESTDIR)/$(localstatedir)/log/wok/wok-access.log @@ -165,9 +166,8 @@ uninstall-local: $(RM) $(DESTDIR)/etc/init.d/wokd; \ $(RM) $(DESTDIR)/etc/init/wok.conf; \ fi; \ - if test -d /usr/lib/firewalld/services/; then \ - $(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \ - fi; \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml + rmdir $(DESTDIR)/usr/lib/firewalld/services && rmdir $(DESTDIR)/usr/lib/firewalld || : $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/wok $(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok $(RM) -rf $(DESTDIR)/etc/wok diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 0119381..fcada13 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -21,7 +21,6 @@ Requires: fontawesome-fonts Requires: open-sans-fonts Requires: logrotate Requires: openssl -BuildRequires: firewalld BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -39,7 +38,6 @@ BuildRequires: python-unittest2 %if 0%{?with_systemd} Requires: systemd -Requires: firewalld Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -115,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/wok/plugins/*.py* %{python_sitelib}/wok/ %{_prefix}/share/locale/*/LC_MESSAGES/wok.mo +%{_prefix}/lib/firewalld/services/wokd.xml %{_datadir}/wok/ui/ %{_datadir}/wok %{_sysconfdir}/wok/wok.conf @@ -128,7 +127,6 @@ rm -rf $RPM_BUILD_ROOT %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ %{_unitdir}/wokd.service -%{_prefix}/lib/firewalld/services/wokd.xml %endif %if 0%{?rhel} == 6 /etc/init/wokd.conf diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 8bed37a..ea2e708 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -22,7 +22,6 @@ Requires: fontawesome-fonts Requires: google-opensans-fonts Requires: logrotate Requires: openssl -BuildRequires: firewalld BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -110,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ %{_mandir}/man8/wokd.8.gz +%{_prefix}/lib/firewalld/services/wokd.xml %if 0%{?with_systemd} %{_unitdir}/wokd.service diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index fa99f30..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -20,7 +20,7 @@ Build Dependencies -------------------- $ sudo yum install gcc make autoconf automake gettext-devel git rpm-build \ - libxslt firewalld + libxslt Runtime Dependencies -------------------- diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index ad4ed92..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo zypper install gcc make autoconf automake gettext-tools git \ - rpm-build libxslt-tools firewalld + rpm-build libxslt-tools Runtime Dependencies -------------------- -- 2.7.4

2 1

[PATCH] [Wok] Fix typo in settings.css
by Lucio Correia 05 Jan '17

05 Jan '17

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/css/settings.css | 2 +- ui/css/src/modules/_wok-accordion.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/css/settings.css b/ui/css/settings.css index 641b805..ec3c086 100644 --- a/ui/css/settings.css +++ b/ui/css/settings.css @@ -37,7 +37,7 @@ clear: both; } -#wok-root-container .accordion:first-chld { +#wok-root-container .accordion:first-child { margin-top: 24px; } diff --git a/ui/css/src/modules/_wok-accordion.scss b/ui/css/src/modules/_wok-accordion.scss index 1d86ddd..ee91709 100644 --- a/ui/css/src/modules/_wok-accordion.scss +++ b/ui/css/src/modules/_wok-accordion.scss @@ -22,7 +22,7 @@ border-bottom: 1px solid $table-border-color; overflow: visible; clear: both; - &:first-chld { + &:first-child { margin-top: 24px; } > h3 { @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} -- 2.7.4

2 1

[PATCH] [Wok] Remove execution permission from css files
by Lucio Correia 05 Jan '17

05 Jan '17

Debian build system has detected unnecessary execution permission bits in some files. Fix them. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss | 0 ui/css/src/wok.scss | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss mode change 100755 => 100644 ui/css/src/wok.scss diff --git a/ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss b/ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss old mode 100755 new mode 100644 diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss old mode 100755 new mode 100644 -- 2.7.4

2 1

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

05 Jan '17

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

2 2

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

05 Jan '17

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

3 2

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

26 Dec '16

Applied. Thanks. Regards, Aline Manera

1 0

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

21 Dec '16

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

3 6

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

21 Dec '16

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

2 1

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

21 Dec '16

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

2 1

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

21 Dec '16

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

2 2

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

21 Dec '16

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

3 2

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

21 Dec '16

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

2 2

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

21 Dec '16

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

2 1

Wok 2.3.1 and Kimchi 2.3.1 are now released!
by Aline Manera 16 Dec '16

16 Dec '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.3.1* and *Kimchi 2.3.1*! Kimchi 2.3.1 depends on *Wok 2.3.1* and *Ginger Base 2.2.2*! So make sure to have both of them properly installed in your system. We have worked hard to ensure that Wok and Kimchi run well on the most popular Linux distributions including: Fedora 25, Ubuntu 16.10, openSUSE LEAP 42.2, and CentOS 7. They use 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.3.1.tar.gz ✔ https://github.com/kimchi-project/kimchi/archive/2.3.1.tar.gz ✔ git clone -b stable-2.3.x --recursive https://github.com/kimchi-project/wok.git There are also some packages available for download at: ✔ http://kimchi-project.github.io/wok/downloads/ ✔ 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

[PATCH v3] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 15 Dec '16

15 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..92e155d 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,7 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = "<span class='" + statusLabel.labelColor + "'><i class='" + statusLabel.labelIcon + "' aria-hidden='true'></i> " + log.status + "</span> "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

3 2

[PATCH v2 stable][Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 15 Dec '16

15 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 37190dc..49c9589 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,7 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = "<span class='" + statusLabel.labelColor + "'><i class='" + statusLabel.labelIcon + "' aria-hidden='true'></i> " + log.status + "</span> "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

2 1

[PATCH] [Kimchi] Use libvirtd service in Ubuntu
by Lucio Correia 15 Dec '16

15 Dec '16

Starting with Ubuntu 16.10, libvirtd is available, so use it to keep the same standard across all distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- contrib/kimchid.service.debian | 8 ++++++++ contrib/kimchid.service.ubuntu | 8 -------- utils.py | 8 +------- 4 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 contrib/kimchid.service.debian delete mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index 36607a1..3cbc689 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,7 +158,7 @@ install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wok.service.d; \ if test -f /etc/debian_version; then \ - $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ + $(INSTALL_DATA) contrib/kimchid.service.debian $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ else \ $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ fi; \ diff --git a/contrib/kimchid.service.debian b/contrib/kimchid.service.debian new file mode 100644 index 0000000..fc58f6a --- /dev/null +++ b/contrib/kimchid.service.debian @@ -0,0 +1,8 @@ +[Unit] +Requires=wok.service +Wants=libvirtd.service +After=libvirtd.service wok.service + +[Service] +Nice=0 +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu deleted file mode 100644 index e261942..0000000 --- a/contrib/kimchid.service.ubuntu +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Requires=wok.service -Wants=libvirt-bin.service -After=libvirt-bin.service wok.service - -[Service] -Nice=0 -PrivateTmp=no diff --git a/utils.py b/utils.py index 26d3cf6..1e2c951 100644 --- a/utils.py +++ b/utils.py @@ -20,7 +20,6 @@ import contextlib import json -import platform import re import sqlite3 import time @@ -264,11 +263,6 @@ def is_libvirtd_up(): """ Checks if libvirtd.service is up. """ - distro, _, _ = platform.linux_distribution() - if distro.lower() == 'ubuntu': - cmd = ['systemctl', 'is-active', 'libvirt-bin.service'] - else: - cmd = ['systemctl', 'is-active', 'libvirtd.service'] - + cmd = ['systemctl', 'is-active', 'libvirtd.service'] output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False -- 2.7.4

2 2

[PATCH] [Kimchi] Use libvirtd service in Ubuntu
by Lucio Correia 15 Dec '16

15 Dec '16

Starting with Ubuntu 16.10, libvirtd is available, so use it to keep the same standard across all distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- contrib/kimchid.service.debian | 8 ++++++++ contrib/kimchid.service.ubuntu | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 contrib/kimchid.service.debian delete mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index a4fa712..68cdac0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,7 +161,7 @@ install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \ if test -f /etc/debian_version; then \ - $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + $(INSTALL_DATA) contrib/kimchid.service.debian $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ else \ $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ fi; \ diff --git a/contrib/kimchid.service.debian b/contrib/kimchid.service.debian new file mode 100644 index 0000000..87a5866 --- /dev/null +++ b/contrib/kimchid.service.debian @@ -0,0 +1,8 @@ +[Unit] +Requires=wokd.service +Wants=libvirtd.service +After=libvirtd.service wokd.service + +[Service] +Nice=0 +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu deleted file mode 100644 index e52db66..0000000 --- a/contrib/kimchid.service.ubuntu +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Requires=wokd.service -Wants=libvirt-bin.service -After=libvirt-bin.service wokd.service - -[Service] -Nice=0 -PrivateTmp=no -- 2.7.4

2 1

[PATCH v2] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 15 Dec '16

15 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 4 +++- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..0184a48 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,9 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + # cherrypy_user = cherrypy.session.get(USER_NAME, 'N/A') + # user = cherrypy_user if cherrypy_user is not None else "N/A" + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = "<span class='" + statusLabel.labelColor + "'><i class='" + statusLabel.labelIcon + "' aria-hidden='true'></i> " + log.status + "</span> "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

1 0

[PATCH] [Kimchi] Bug fix #1057: Failed to import kimchi
by bianca＠linux.vnet.ibm.com 15 Dec '16

15 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed "registerAttachDevicesEvent" in model/libvirtevents.py file to include AttributeError as a exception to make sure kimchi will be running even if this exception is true. Also fixed indentation in vms.py file. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 2 +- model/vms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 2dd9904..716420c 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -101,7 +101,7 @@ class LibvirtEvents(object): cb, arg) - except libvirt.libvirtError as e: + except (AttributeError, libvirt.libvirtError), e: wok_log.error("register attach event failed: %s" % e.message) def registerDetachDevicesEvent(self, conn, cb, arg): diff --git a/model/vms.py b/model/vms.py index d703c89..d6f8020 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1108,7 +1108,7 @@ class VMModel(object): def update_cpu_live(self, dom, vcpus): flags = libvirt.VIR_DOMAIN_AFFECT_LIVE | \ - libvirt.VIR_DOMAIN_AFFECT_CONFIG + libvirt.VIR_DOMAIN_AFFECT_CONFIG try: dom.setVcpusFlags(vcpus, flags) except libvirt.libvirtError as e: -- 2.1.4

3 3

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

15 Dec '16

Parse vm memory from xml when it isn't available at dom.info Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Parse memory before count hotplug devices model/vms.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/vms.py b/model/vms.py index 3ea1122..f752271 100644 --- a/model/vms.py +++ b/model/vms.py @@ -105,6 +105,7 @@ XPATH_BOOT = 'os/boot/@dev' XPATH_BOOTMENU = 'os/bootmenu/@enable' XPATH_CPU = './cpu' XPATH_DESCRIPTION = './description' +XPATH_MEMORY = './memory' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' XPATH_SNAP_VM_NAME = './domain/name' @@ -1342,6 +1343,12 @@ class VMModel(object): # Case VM changed currentMemory outside Kimchi, sum mem devs memory = dom.maxMemory() >> 10 curr_mem = (info[2] >> 10) + + # On CentOS, dom.info does not retrieve memory. So, if machine does + # not have memory hotplug, parse memory from xml + if curr_mem == 0: + curr_mem = int(xpath_get_text(xml, XPATH_MEMORY)[0]) >> 10 + if memory != curr_mem: memory = curr_mem + (self._get_mem_dev_total_size(xml) >> 10) -- 2.7.4

2 1

[PATCH] [Kimchi] Bug fix #1057: Failed to import kimchi
by bianca＠linux.vnet.ibm.com 15 Dec '16

15 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed "registerAttachDevicesEvent" in model/libvirtevents.py file to include AttributeError as a exception to make sure kimchi will be running even if this exception is true. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 2dd9904..716420c 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -101,7 +101,7 @@ class LibvirtEvents(object): cb, arg) - except libvirt.libvirtError as e: + except (AttributeError, libvirt.libvirtError), e: wok_log.error("register attach event failed: %s" % e.message) def registerDetachDevicesEvent(self, conn, cb, arg): -- 2.1.4

3 2

[PATCH] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 3 ++- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..edddb6e 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,8 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + cherrypy_user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy_user if cherrypy_user is not None else "N/A" if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = "<span class='" + statusLabel.labelColor + "'><i class='" + statusLabel.labelIcon + "' aria-hidden='true'></i> " + log.status + "</span> "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

2 1