May 2016 - Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH][Kimchi] Remove notification message if Libvirt is back
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Load Kimchi when started by command line and libvirt is not running
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Remove notification message if Libvirt is back
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Kimchi] Always update snapshot XML with new name and UUID
by Lucio Correia 30 May '16

30 May '16

When a guest with snapshots is renamed, and afterwards guest is reverted to a snapshot created before the name change, the guest is also renamed back. This patch fixes this issue by updating snapshot XML when guest is renamed. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/vms.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 5c1b4e6..f5fbd16 100644 --- a/model/vms.py +++ b/model/vms.py @@ -97,6 +97,8 @@ XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' XPATH_CPU = './cpu' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' +XPATH_SNAP_VM_NAME = './domain/name' +XPATH_SNAP_VM_UUID = './domain/uuid' XPATH_TOPOLOGY = './cpu/topology' XPATH_VCPU = './vcpu' XPATH_MAX_MEMORY = './maxMemory' @@ -728,7 +730,15 @@ class VMModel(object): if info['current']: flags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT - dom.snapshotCreateXML(info['xml'], flags) + # Snapshot XML contains the VM xml from the time it was created. + # Thus VM name and uuid must be updated to current ones. Otherwise, + # when reverted, the vm name will be inconsistent. + xml = info['xml'] + xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) + xml = xml_item_update(xml, XPATH_SNAP_VM_UUID, dom.UUIDString(), + None) + + dom.snapshotCreateXML(xml, flags) def _update_metadata_name(self, dom, nonascii_name): if nonascii_name is not None: -- 1.9.1

1 0

Re: [Kimchi-devel] Issue #121: Unicode error in wok.utils.run_command if cmd & error has non-ascii characters
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Wok] Bug fix: Use WatchedFileHandler instead of RotatingFileHandler for user log files
by Aline Manera 30 May '16

30 May '16

The log files under /var/log/wok are managed by logrotate (check contrib/wokd.logrotate.in for more details). So use WatchedFileHandler instead of RotatingFileHandler to avoid issues while accessing the log file. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 1145dbd..272a753 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # +import glob import json import logging import logging.handlers @@ -40,8 +41,6 @@ LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(user)s: %(message)s\n" SECONDS_PER_HOUR = 360 # Log handler setup -MAX_FILE_SIZE = 3072000 -NUM_BACKUP_FILES = 1 REQUEST_LOG_FILE = "wok-req.log" WOK_REQUEST_LOGGER = "wok_request_logger" @@ -49,9 +48,7 @@ WOK_REQUEST_LOGGER = "wok_request_logger" class RequestLogger(object): def __init__(self): log = os.path.join(config.get("logging", "log_dir"), REQUEST_LOG_FILE) - h = logging.handlers.RotatingFileHandler(log, 'a', - maxBytes=MAX_FILE_SIZE, - backupCount=NUM_BACKUP_FILES) + h = logging.handlers.WatchedFileHandler(log, 'a') h.setFormatter(logging.Formatter('%(message)s')) self.handler = h self.logger = logging.getLogger(WOK_REQUEST_LOGGER) @@ -101,8 +98,7 @@ class RequestParser(object): def getRecords(self): records = self.getRecordsFromFile(self.baseFile) - for count in range(NUM_BACKUP_FILES): - filename = ".".join([self.baseFile, str(count + 1)]) + for filename in glob.glob(self.baseFile + "-*[!.gz]"): records.extend(self.getRecordsFromFile(filename)) # Return ordered by latest events first -- 2.5.5

2 2

Re: [Kimchi-devel] Expose delete notification function
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] Fix notification api message return
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[WOK] [RFC} Checking Bootstrap 4 compatibility + dropping jQuery Bootgrid
by Samuel Henrique De Oliveira Guimaraes 30 May '16

30 May '16

Hi team, Last year Twitter announced the new version of Bootstrap. Wok currently uses a customized version of Bootstrap 3 Sass / SCSS files and looking at the Alpha code it seems that porting Wok to the new version won't be difficult: http://v4-alpha.getbootstrap.com/migration/ -Browser Support: Ok! -SCSS environment: Ok! -Dropped glyphicons: Ok! We already use Font-Awesome - Non-responsive usage of Bootstrap is no longer supported: Ok! I recognize some classes from this document and I think that a minor drawback would be with the Media Queries that were already implemented throughout the application and some changes with the classes names. Ginger uses a lot of "panel-" classes that were replaced by "cards", the "btn-default" button was renamed to "btn-secondary" and etc. The major issue is with jQuery Bootgrid plugin. It seems that they're not planning to port to Bootstrap 4 until it gets stable. I think we should port our jQuery Bootgrid code to Datatables.net, since it has a vast documentation and it already supports Bootstrap 4: https://datatables.net/examples/styling/bootstrap4.html Any comments? Samuel

5 5

[PATCH][Wok] UI: Remove notification array and make notifications persistent
by Rodrigo Trujillo 30 May '16

30 May '16

There is an issue in frontend that does not allow notification messages to be showed more than once if the problem happens again. When user clicks on message close ("X") button, the notification message is only removed from backend, but not from the UI array. This patch changes functions to not use the array anymore, instead, it checks if the message is being displayed by its message code, then shows if necessary. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 1 - ui/js/src/wok.utils.js | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 2146b3d..cf5b6a2 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -19,7 +19,6 @@ */ wok.NOTIFICATION_INTERVAL = 5000 -wok.postedNotifications = [] wok.tabMode = {}; wok.config = undefined; diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..3759cbe 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -209,12 +209,12 @@ wok.notificationsLoop = function notificationsLoop() { function(notifications){ if(notifications && notifications.length > 0) { $.each(notifications, function(i, notif) { - if (wok.postedNotifications.indexOf(notif.message) == -1) { + // Check if notification is being displayed + if (($("#alert-container").contents().find("div:contains('" + notif.code + "')").length) == 0) { wok.message.notify(notif, '#message-container-area'); - wok.postedNotifications.push(notif.message); } - }) - }; + }); + } setTimeout(notificationsLoop, wok.NOTIFICATION_INTERVAL); }, function(data){ -- 2.1.0

2 2

Re: [Kimchi-devel] [PATCH] [Wok] Added extended locale list arranged it in alphabetic order.
by Aline Manera 30 May '16

30 May '16

On 05/23/2016 09:07 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > ui/pages/login.html.tmpl | 194 +++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 172 insertions(+), 22 deletions(-) > > diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl > index 52b81fd..81b4e7a 100644 > --- a/ui/pages/login.html.tmpl > +++ b/ui/pages/login.html.tmpl > @@ -138,28 +138,178 @@ > <div class="form-group"> > <label for="userLocale">$_("Locale")</label> > <select id="userLocale" class="selectpicker col-md-12 col-lg-12"> > - <option value="af-NA">Afrikaans (Namibia)</option> > - <option value="ar-DZ">Arabic (Algeria)</option> > - <option value="az-AZ">Azerbaijani (Azerbaijan)</option> > - <option value="en-US">English (US)</option> > - <option value="hy-AM">Armenian (Armenia)</option> > - <option value="hi-IN">Hindi (India)</option> > - <option value="nl-BE">Dutch (Belgium)</option> > - <option value="ms-MY">Malay (Malaysia)</option> > - <option value="no-NO">Norwegian (Norway)</option> > - <option value="sq-AL">Albanian (Albania)</option> > - <option value="sv-SE">Swedish (Sweden)</option> > - <option value="uz-UZ">Uzbek (Uzbekistan)</option> > - <option value="zh-CN">中文（简体）</option> > - <option value="pt-BR">Português (Brasil)</option> > - <option value="de-DE">Deutsch (Deutschland)</option> > - <option value="es-ES">Español (España)</option> > - <option value="fr-FR">Français (France)</option> > - <option value="it-IT">Italiano (Italia)</option> > - <option value="ja-JP">日本語 (日本)</option> > - <option value="ko-KR">한국어 (대한민국)</option> > - <option value="ru-RU">Русский (Россия)</option> > - <option value="zh-TW">中文（繁體）</option> > + <option value="af-ZA">Afrikaans (South Africa)</option> > + <option value="sq-AL">Albanian (Albania)</option> > + <option value="am-ET">Amharic (Ethiopia)</option> > + <option value="ar-DZ">Arabic (Algeria)</option> > + <option value="ar-BH">Arabic (Bahrain)</option> > + <option value="ar-EG">Arabic (Egypt)</option> > + <option value="ar-IQ">Arabic (Iraq)</option> > + <option value="ar-JO">Arabic (Jordan)</option> > + <option value="ar-KW">Arabic (Kuwait)</option> > + <option value="ar-LB">Arabic (Lebanon)</option> > + <option value="ar-LY">Arabic (Libya)</option> > + <option value="ar-MR">Arabic (Mauritania)</option> > + <option value="ar-MA">Arabic (Morocco)</option> > + <option value="ar-OM">Arabic (Oman)</option> > + <option value="ar-QA">Arabic (Qatar)</option> > + <option value="ar-SA">Arabic (Saudi Arabia)</option> > + <option value="ar-SY">Arabic (Syria)</option> > + <option value="ar-TN">Arabic (Tunisia)</option> > + <option value="ar-AE">Arabic (United Arab Emirates)</option> > + <option value="ar-YE">Arabic (Yemen)</option> > + <option value="hy-AM">Armenian (Armenia)</option> > + <option value="as-IN">Assamese (India)</option> > + <option value="az-AZ">Azerbaijani (Azerbaijan)</option> > + <option value="eu-ES">Basque (Spain)</option> > + <option value="be-BY">Belarusian (Belarus)</option> > + <option value="bn-BD">Bengali (Bangladesh)</option> > + <option value="bn-IN">Bengali (India)</option> > + <option value="bs-BA">Bosnian (Bosnia)</option> > + <option value="bg-BG">Bulgarian (Bulgaria)</option> > + <option value="my-MM">Burmese (Myanmar)</option> > + <option value="ca-ES">Catalan (Spain)</option> > + <option value="zh-CN">Chinese-simplified (China)</option> > + <option value="zh-SG">Chinese-simplified (Singapore)</option> > + <option value="zh-HK">Chinese-traditional (Hong Kong S.A.R. of China)</option> > + <option value="zh-MO">Chinese-traditional (Macao)</option> > + <option value="zh-TW">Chinese-traditional (Taiwan)</option> > + <option value="hr-HR">Croatian (Croatia)</option> > + <option value="cs-CZ">Czech (Czech Republic)</option> > + <option value="da-DK">Danish (Denmark)</option> > + <option value="nl-BE">Dutch (Belgium)</option> > + <option value="nl-NL">Dutch (The Netherlands)</option> > + <option value="en-AU">English (Australia)</option> > + <option value="en-BE">English (Belgium)</option> > + <option value="en-CM">English (Cameroon)</option> > + <option value="en-CA">English (Canada)</option> > + <option value="en-GH">English (Ghana)</option> > + <option value="en-HK">English (Hong Kong S.A.R. of China)</option> > + <option value="en-IN">English (India)</option> > + <option value="en-IE">English (Ireland)</option> > + <option value="en-KE">English (Kenya)</option> > + <option value="en-MU">English (Mauritius)</option> > + <option value="en-NZ">English (New Zealand)</option> > + <option value="en-NG">English (Nigeria)</option> > + <option value="en-PH">English (Philippines)</option> > + <option value="en-SG">English (Singapore)</option> > + <option value="en-ZA">English (South Africa)</option> > + <option value="en-TZ">English (Tanzania)</option> > + <option value="en-GB">English (United Kingdom)</option> > + <option value="en-US">English (United States)</option> > + <option value="en-ZM">English (Zambia)</option> > + <option value="et-EE">Estonian (Estonia)</option> > + <option value="tl-PH">Filipino (Philippines)</option> > + <option value="fi-FI">Finnish (Finland)</option> > + <option value="fr-DZ">French (Algeria)</option> > + <option value="fr-CM">French (Cameroon)</option> > + <option value="fr-CD">French (Democratic Republic of the Congo)</option> > + <option value="fr-BE">French (Belgium)</option> > + <option value="fr-CA">French (Canada)</option> > + <option value="fr-FR">French (France)</option> > + <option value="fr-CI">French (Ivory Coast [Côte d’Ivoire])</option> > + <option value="fr-LU">French (Luxembourg)</option> > + <option value="fr-MR">French (Mauritania)</option> > + <option value="fr-MU">French (Mauritius)</option> > + <option value="fr-MA">French (Morocco)</option> > + <option value="fr-SN">French (Senegal)</option> > + <option value="fr-CH">French (Switzerland)</option> > + <option value="fr-TN">French (Tunisia)</option> > + <option value="gl-ES">Galician (Spain)</option> > + <option value="lg-UG">Ganda (Uganda)</option> > + <option value="ka-GE">Georgian (Georgia)</option> > + <option value="de-AT">German (Austria)</option> > + <option value="de-DE">German (Germany)</option> > + <option value="de-LU">German (Luxembourg)</option> > + <option value="de-CH">German (Switzerland)</option> > + <option value="el-GR">Greek (Greece)</option> > + <option value="gu-IN">Gujarati (India)</option> > + <option value="ha-NG">Hausa (Nigeria)</option> > + <option value="he-IL">Hebrew (Israel)</option> > + <option value="hi-IN">Hindi (India)</option> > + <option value="hu-HU">Hungarian (Hungary)</option> > + <option value="is-IS">Icelandic (Iceland)</option> > + <option value="ig-NG">Igbo (Nigeria)</option> > + <option value="id-ID">Indonesian (Indonesia)</option> > + <option value="it-IT">Italian (Italy)</option> > + <option value="it-CH">Italian (Switzerland)</option> > + <option value="ja-JP">Japanese (Japan)</option> > + <option value="kn-IN">Kannada (India)</option> > + <option value="kk-KZ">Kazakh (Kazakhstan)</option> > + <option value="km-KH">Khmer (Cambodia)</option> > + <option value="rw-RW">Kinyarwanda (Rwanda)</option> > + <option value="kok-IN">Konkani (India)</option> > + <option value="ko-KR">Korean (India)</option> > + <option value="lo-LA">Lao (Korea, South)</option> > + <option value="lv-LV">Latvian (Latvia)</option> > + <option value="lt-LT">Lithuanian (Lithuania)</option> > + <option value="mk-MK">Macedonian (Macedonia)</option> > + <option value="ms-MY">Malay-Latin (Malaysia)</option> > + <option value="ml-IN">Malayalam (India)</option> > + <option value="mt-MT">Maltese (Malta)</option> > + <option value="mr-IN">Marathi (India)</option> > + <option value="mn-Cyrl-MN">Mongolian-Cyrillic (Mongolia)</option> > + <option value="ne-IN">Nepali (India)</option> > + <option value="ne-NP">Nepali (Nepal)</option> > + <option value="nb-NO">Norwegian Bokmål (Norway)</option> > + <option value="nn-NO">Norwegian Nynorsk (Norway)</option> > + <option value="or-IN">Oriya [aka, Odia] (India)</option> > + <option value="om-ET">Oromo (Ethiopia)</option> > + <option value="pl-PL">Polish (Poland)</option> > + <option value="pt-AO">Portuguese Bokmål (Angola)</option> > + <option value="pt-BR">Portuguese Nynorsk (Brazil)</option> > + <option value="pt-MO">Portuguese (Macao)</option> > + <option value="pt-MZ">Portuguese (Mozambique)</option> > + <option value="pt-PT">Portuguese (Portugal)</option> > + <option value="pa-IN">Punjabi (India)</option> > + <option value="ro-RO">Romanian (Romania)</option> There are 2 spaces between the Language and Location. I will fix it before applying upstream. > + <option value="ru-RU">Russian (Russia)</option> > + <option value="sr-RS">Serbian-Cyrillic (Serbia)</option> > + <option value="sr-ME">Serbian-Latin (Montenegro)</option> > + <option value="sr-Latn-RS">Serbian-Latin (Serbia)</option> > + <option value="si-LK">Sinhala (Sri Lanka)</option> > + <option value="sk-SK">Slovak (Slovakia)</option> > + <option value="sl-SI">Slovenian (Slovenia)</option> > + <option value="es-AR">Spanish (Argentina)</option> > + <option value="es-BO">Spanish (Bolivia)</option> > + <option value="es-CL">Spanish (Chile)</option> > + <option value="es-CO">Spanish (Colombia)</option> > + <option value="en-CR">Spanish (Costa Rica)</option> > + <option value="es-DO">Spanish (Dominican Republic)</option> > + <option value="es-EC">Spanish (Ecuador)</option> > + <option value="es-SV">Spanish (El Salvador)</option> > + <option value="es-GT">Spanish (Guatemala)</option> > + <option value="en-HN">Spanish (Honduras)</option> > + <option value="es-MX">Spanish (Mexico)</option> > + <option value="es-NI">Spanish (Nicaragua)</option> > + <option value="es-PA">Spanish (Panama)</option> > + <option value="es-PY">Spanish (Paraguay)</option> > + <option value="en-PE">Spanish (Peru)</option> > + <option value="es-PR">Spanish (Puerto Rico)</option> > + <option value="es-ES">Spanish (Spain)</option> > + <option value="es-US">Spanish (United States)</option> > + <option value="es-UY">Spanish (Uruguay)</option> > + <option value="es-VE">Spanish (Venezuela)</option> > + <option value="sw-KE">Swahili (Kenya)</option> > + <option value="sw-TZ">Swahili (Tanzania)</option> > + <option value="sv-SE">Swedish (Sweden)</option> > + <option value="ta-IN">Tamil (India)</option> > + <option value="te-IN">Telugu (Venezuela)</option> > + <option value="th-TH">Thai (Thailand)</option> > + <option value="tr-TR">Turkish (Turkey)</option> > + <option value="uk-UA">Ukrainian (Ukraine)</option> > + <option value="ur-IN">Urdu (India)</option> > + <option value="ur-PK">Urdu (Pakistan)</option> > + <option value="uz-Cyrl-UZ">Uzbek-Cyrillic (Uzbekistan)</option> > + <option value="uz-Latn-UZ">Uzbek-Latin (Uzbekistan)</option> > + <option value="vi-VN">Vietnamese (Vietnam)</option> > + <option value="cy-GB">Welsh (United Kingdom)</option> > + <option value="yo-NG">Yoruba (Nigeria)</option> > + <option value="ZU-ZA">Zulu (South Africa)</option> > + <option value="az-AZ">Azerbaijani-Latin (Azerbaijan)</option> > + <option value="sr-CS">Serbian-Cyrillic ()</option> > + <option value="sr-Cyrl-CS">Serbian-Cyrillic (Serbia and Montenegro)</option> > + <option value="sr-Latn-CS">Serbian-Latin (Serbia and Montenegro)</option> > </select> > </div> > </form>

1 1

Re: [Kimchi-devel] [PATCH] [Wok 0/2] Fix for Issues #101 and #115
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 1

Re: [Kimchi-devel] [PATCH] [Wok 0/2] Fix for Issues #101 and #115
by Aline Manera 30 May '16

30 May '16

Hi Archana, I will apply only the first patch as the second one needs s v2. On 05/23/2016 05:13 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > 1) Enabling UTF-8 characters support in command output. > 2) Fix for _get_resources wok_log.error result into unicode error. > > Archana Singh (2): > Issue #101: In runcommand, enabling UTF-8 characters support in > command output. > Issue #115: _get_resources wok_log.error result into unicode error > > src/wok/control/base.py | 8 ++++++-- > src/wok/utils.py | 4 ++-- > 2 files changed, 8 insertions(+), 4 deletions(-) >

1 0

[PATCH v2] [Kimchi 0/2] Implement multi-function pci hotplug
by Jose Ricardo Ziviani 30 May '16

30 May '16

v1 -> v2: Include the pci address in the guest xml even for function > 0. This patchset implements multi-function pci hotplug for Kimchi. The special point in it is the need to attach all functions at once (one xml containing all devices) sorted (in reverse, the function 0 is the last one). This logic also applies to hot unplug. How to test the backend: - hotplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs -X POST -d '{"name": "pci_0001_05_00_1"}' - hotunplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs/pci_0001_05_00_0 -X DELETE Note: it doesn't matter the function is chosen (pci_0001_05_00_0 or pci_0001_05_00_1 in this case), both functions will be attached/detached accordingly. Note2: attach/detach are async methods but UI is not reflecting it, it's necessary to close/reopen the Edit window to see the PCI list updated. Jose Ricardo Ziviani (2): Enable hot-plug multi-function pci on front-end Implement multi-function pci hotplug support model/vmhostdevs.py | 100 ++++++++++++++++++++++++++++++++---- ui/js/src/kimchi.guest_edit_main.js | 2 +- 2 files changed, 92 insertions(+), 10 deletions(-) -- 2.7.4

2 1

Re: [Kimchi-devel] [PATCH] [Wok 2/2] Issue #115: _get_resources wok_log.error result into unicode error
by Aline Manera 30 May '16

30 May '16

Hi Archana, Seems encode_value() is not defined: make[2]: Entering directory '/home/alinefm/wok' PYTHONPATH=src contrib/check_i18n.py src/wok/plugins/*/i18n.py src/wok/i18n.py Checking for invalid i18n string... Checking for invalid i18n string successfully *./src/wok/control/base.py:382: undefined name 'encode_value'* Makefile:930: recipe for target 'check-local' failed make[2]: *** [check-local] Error 1 make[2]: Leaving directory '/home/alinefm/wok' Makefile:797: recipe for target 'check-am' failed make[1]: *** [check-am] Error 2 make[1]: Leaving directory '/home/alinefm/wok' Makefile:509: recipe for target 'check-recursive' failed make: *** [check-recursive] Error 1 Could you fix it and resend? Thanks, Aline Manera On 05/23/2016 05:13 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > As ident is in encoded value but e.message is in unicode value, > combination of which result into unicode value having encoded ident value. > So when wok_log.error try to encode(encoded value) it result into error. > > This patch fix the unicode error by encoding e.message. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > src/wok/control/base.py | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/src/wok/control/base.py b/src/wok/control/base.py > index be5f618..d4fd4e4 100644 > --- a/src/wok/control/base.py > +++ b/src/wok/control/base.py > @@ -373,9 +373,13 @@ class Collection(object): > res.lookup() > except Exception as e: > # In case of errors when fetching a resource info, pass and > - # log the error, so, other resources are returned > + # log the error, so, other resources are returned. > + # Encoding error message as ident is also encoded value. > + # This has to be done to avoid unicode error, > + # as combination of encoded and unicode value results into > + # unicode error. > wok_log.error("Problem in lookup of resource '%s'. " > - "Detail: %s" % (ident, e.message)) > + "Detail: %s" % (ident, encode_value(e.message))) > continue > res_list.append(res) > return res_list

1 0

[PATCH][Wok] Fix notification api message return
by Rodrigo Trujillo 30 May '16

30 May '16

When Wok receives a notifications request, it is using "pop" to retrieve plugin name. This actions removes plugin entry from the dictionary, so in next request it is not able to know what plugin is, then message is not returned, just {"CODE": "CODE"}. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/model/notifications.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index 55bd178..e83ac56 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -72,8 +72,8 @@ class NotificationModel(object): # use WokMessage to translate the notification if notification: - timestamp = notification['timestamp'] - plugin = notification.pop('_plugin_name', None) + timestamp = notification.get('timestamp', None) + plugin = notification.get('_plugin_name', None) message = WokMessage(str(id), notification, plugin).get_text() return {"code": id, "message": message, "timestamp": timestamp} -- 2.1.0

2 1

[PATCH][Kimchi] Load Kimchi when started by command line and libvirt is not running
by Rodrigo Trujillo 30 May '16

30 May '16

Kimchi is able to detect and continue running if libvirt stops and back. However if libvirt is not up and host admin tries to start Wok, Kimchi is going to crash in feature tests and when loads models. This patch fixes this issues, then Wok does not break and is able to load and start Kimchi. When libivirt service is back, Kimchi is able to run feature tests and set the capabilities again, restoring all features. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/config.py | 17 ++++++++++++++--- model/networks.py | 5 +++-- model/storagepools.py | 5 +++-- model/storagevolumes.py | 7 ++++++- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/model/config.py b/model/config.py index 36fce74..fc4b285 100644 --- a/model/config.py +++ b/model/config.py @@ -89,6 +89,10 @@ class CapabilitiesModel(object): def _set_depend_capabilities(self): wok_log.info("\n*** Kimchi: Running dependable feature tests ***") conn = self.conn.get() + if conn is None: + wok_log.info("*** Kimchi: Dependable feature tests not completed " + "***\n") + return self.qemu_stream = FeatureTests.qemu_supports_iso_stream() msg = "QEMU stream support .......: %s" wok_log.info(msg % str(self.qemu_stream)) @@ -104,6 +108,12 @@ class CapabilitiesModel(object): def _set_capabilities(self): wok_log.info("\n*** Kimchi: Running feature tests ***") + self.libvirtd_running = is_libvirtd_up() + msg = "Service Libvirtd running ...: %s" + wok_log.info(msg % str(self.libvirtd_running)) + if self.libvirtd_running == False: + wok_log.info("*** Kimchi: Feature tests not completed ***\n") + return conn = self.conn.get() self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn) msg = "NFS Target Probe support ...: %s" @@ -120,9 +130,6 @@ class CapabilitiesModel(object): self.mem_hotplug_support = FeatureTests.has_mem_hotplug_support(conn) msg = "Memory Hotplug support .....: %s" wok_log.info(msg % str(self.mem_hotplug_support)) - self.libvirtd_running = is_libvirtd_up() - msg = "Service Libvirtd running ...: %s" - wok_log.info(msg % str(self.libvirtd_running)) wok_log.info("*** Kimchi: Feature tests completed ***\n") _set_capabilities.priority = 90 @@ -148,6 +155,10 @@ class CapabilitiesModel(object): 'nm_running': FeatureTests.is_nm_running(), 'mem_hotplug_support': False, 'libvirtd_running': False} + elif self.libvirtd_running == False: + # Libvirt returned, run tests again + self._set_capabilities() + self._set_depend_capabilities() return {'libvirt_stream_protocols': self.libvirt_stream_protocols, 'qemu_spice': self._qemu_support_spice(), diff --git a/model/networks.py b/model/networks.py index e04c8e4..3b2a9e2 100644 --- a/model/networks.py +++ b/model/networks.py @@ -49,8 +49,9 @@ KIMCHI_BRIDGE_PREFIX = 'kb' class NetworksModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - if self.conn.isQemuURI(): - self._check_default_networks() + if self.conn.get() is not None: + if self.conn.isQemuURI(): + self._check_default_networks() self.caps = CapabilitiesModel(**kargs) diff --git a/model/storagepools.py b/model/storagepools.py index be06988..3f6a734 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -65,8 +65,9 @@ class StoragePoolsModel(object): self.caps = CapabilitiesModel(**kargs) self.device = DeviceModel(**kargs) - if self.conn.isQemuURI(): - self._check_default_pools() + if self.conn.get() is not None: + if self.conn.isQemuURI(): + self._check_default_pools() def _check_default_pools(self): pools = {} diff --git a/model/storagevolumes.py b/model/storagevolumes.py index da42e85..70cad4f 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -275,7 +275,10 @@ class StorageVolumeModel(object): self.task = TaskModel(**kargs) self.storagevolumes = StorageVolumesModel(**kargs) self.storagepool = StoragePoolModel(**kargs) - self.libvirt_user = UserTests().probe_user() + if self.conn.get() is not None: + self.libvirt_user = UserTests().probe_user() + else: + self.libvirt_user = None @staticmethod def get_storagevolume(poolname, name, conn): @@ -332,6 +335,8 @@ class StorageVolumeModel(object): isvalid = False used_by = get_disk_used_by(self.objstore, self.conn, path) + if (self.libvirt_user is None): + self.libvirt_user = UserTests().probe_user() ret, _ = probe_file_permission_as_user(path, self.libvirt_user) res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], -- 2.1.0

2 1

[PATCH][Kimchi] Remove notification message if Libvirt is back
by Rodrigo Trujillo 30 May '16

30 May '16

If libvirt service stops and back again, the UI keeps showing the notification message until user clicks on 'X' (close) button. To avoid the wrong message, kimchi will remove the notification in backend as soon as it notice that Libvirt is up and running. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/libvirtconnection.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/model/libvirtconnection.py b/model/libvirtconnection.py index d11b8a6..d7c74bc 100644 --- a/model/libvirtconnection.py +++ b/model/libvirtconnection.py @@ -21,7 +21,8 @@ import libvirt import threading import time -from wok.model.notifications import add_notification +from wok.model.notifications import add_notification, del_notification +from wok.model.notifications import notificationsStore from wok.utils import wok_log from wok.plugins.kimchi.utils import is_libvirtd_up @@ -90,6 +91,12 @@ class LibvirtConnection(object): wok_log.error('Libvirt service is not active.') add_notification('KCHCONN0002E', plugin_name='/plugins/kimchi') return None + elif (notificationsStore.get('KCHCONN0002E') is not None): + try: + del_notification('KCHCONN0002E') + except: + # If notification was not found, just ignore + pass with LibvirtConnection._connectionLock: conn = self._connections.get(conn_id) -- 2.1.0

2 1

[PATCH][Wok] Issue #121: Unicode error in wok.utils.run_command if cmd & error has non-ascii characters
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> If command to be run has any non-ascii characters(encoded/unicode value), then the error message might also contain non-ascii characters(encoded/unicode value). If command has encoded value and error has unicode value then combining both into a string result unicode value which will have encoded value result into UnicodeError. For e.g command: u'modinfo -0 \xe1' error: modinfo: ERROR: Module \xc3\xa1 not found. (Note:- It has encoded value of u'\xe1') Combining both into string message: "error: %s returned from cmd: %s"%(error, ' '.join(cmd)) result into UnicodeDecodeError: UnicodeDecodeError('ascii', 'error: modinfo: ERROR: Module \xc3\xa1 not found.\n returned from cmd: ', 30, 31, 'ordinal not in range(128)') Fixed this by converting both to unicode format before combining into message. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index b37518f..918fd26 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -273,7 +273,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, returncode = proc.returncode if returncode != 0: msg = "rc: %s error: %s returned from cmd: %s" %\ - (returncode, error, ' '.join(cmd)) + (returncode, decode_value(error), + decode_value(' '.join(cmd))) if silent: wok_log.debug(msg) @@ -282,7 +283,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, wok_log.error(msg) elif error: wok_log.debug("error: %s returned from cmd: %s", - error, ' '.join(cmd)) + decode_value(error), decode_value(' '.join(cmd))) if timeout_flag[0]: msg = ("subprocess is killed by signal.SIGKILL for " -- 2.5.0

1 0

[PATCH V2][Wok 12/12] Added tests/fvt/config file into backlist.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- IBM-license-blacklist | 1 + 1 file changed, 1 insertion(+) diff --git a/IBM-license-blacklist b/IBM-license-blacklist index ce64618..41db1c8 100644 --- a/IBM-license-blacklist +++ b/IBM-license-blacklist @@ -99,3 +99,4 @@ ui/libs/typeahead/typeahead.bundle.min.js ui/robots.txt ui/libs/jquery-containsNC/LICENSE ui/libs/jquery-containsNC/jquery.containsNC.js +tests/fvt/config -- 2.5.0

1 0

[PATCH V2][Wok 11/12] FVT: Added Readme instruction for running fvt testcases.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added Readme instruction for running fvt testcases. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- docs/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/README.md b/docs/README.md index 8e14672..56e8144 100644 --- a/docs/README.md +++ b/docs/README.md @@ -74,6 +74,14 @@ Build and Install # Optional if running from the source tree $ sudo make install +FVT Testing +----------------- + + $ sudo pip install virtualenv + $ make check-fvt + +After all fvt tests are executed, a summary will be displayed containing any errors/failures which might have occurred. + Starting up Wok --------------- -- 2.5.0

1 0

[PATCH V2][Wok 10/12] FVT: Added check-fvt to run FVT testcases using make and venv dir to be cleaned.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

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

1 0

[PATCH V2][Wok 09/12] FVT: Added FVT Makefile path in AC_CONFIG_FILES list.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added fvt's Makefile path in AC_CONFIG_FILES list. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 002774d..1c64367 100644 --- a/configure.ac +++ b/configure.ac @@ -153,6 +153,7 @@ AC_CONFIG_FILES([ contrib/wok.spec.fedora contrib/wok.spec.suse tests/Makefile + tests/fvt/Makefile ],[ chmod +x po/gen-pot ]) -- 2.5.0

1 0

[PATCH V2][Wok 08/12] FVT: Added fvt as subdirs and check-fvt to run fvt testcases using make.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added fvt as subdirs and check-fvt to run fvt testcases using make. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9ead666..656cfae 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SUBDIRS = fvt + EXTRA_DIST = \ Makefile.am \ run_tests.sh.in \ @@ -46,5 +48,10 @@ check-local: $(MKDIR_P) $(top_srcdir)/data/screenshots ./run_tests.sh +check-fvt: + fvt/run_tests.sh + rm -fr venv + + BUILT_SOURCES = test_config.py CLEANFILES = run_tests.sh test_config.py -- 2.5.0

1 0

[PATCH V2][Wok 07/12] FVT: Makefile needed for build and run fvt.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Makefile for building and running fvt. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/fvt/Makefile.am | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 tests/fvt/Makefile.am diff --git a/tests/fvt/Makefile.am b/tests/fvt/Makefile.am new file mode 100644 index 0000000..c1d3934 --- /dev/null +++ b/tests/fvt/Makefile.am @@ -0,0 +1,43 @@ +# +# 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 + +EXTRA_DIST = \ + Makefile.am \ + run_tests.sh.in \ + $(wildcard *.py) \ + $(NULL) + +noinst_SCRIPTS = run_tests.sh + +do_substitution = \ + sed -e 's,[@]HAVE_PYMOD_UNITTEST[@],$(HAVE_PYMOD_UNITTEST),g' \ + -e 's,[@]PYTHON_VERSION[@],$(PYTHON_VERSION),g' + +run_tests.sh: run_tests.sh.in Makefile + $(do_substitution) < $(srcdir)/run_tests.sh.in > run_tests.sh + chmod +x run_tests.sh + +CLEANFILES = run_tests.sh + +check-fvt: + ./run_tests.sh + rm -fr venv + +clean-local: + rm -fr venv -- 2.5.0

1 0