- Kimchi-devel - oVirt List Archives

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

16 Jun '16

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

3 3

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

15 Jun '16

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

2 2

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

15 Jun '16

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

4 3

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

14 Jun '16

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

1 4

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

14 Jun '16

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

2 4

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

14 Jun '16

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

1 0

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

14 Jun '16

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

4 3

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

14 Jun '16

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

2 2

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

13 Jun '16

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

1 0

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

13 Jun '16

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

2 3