August 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Issue #585: 'make clean' does not revert its changes from 'make rpm'
by bianca＠linux.vnet.ibm.com 12 Aug '16

12 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited Makefile.am to check if there is any file to be stashed or commited before run 'make rpm' to avoid losing any changes. Also included 'git clean -df & git reset --hard' command to remove untracked files from the working tree and to revert changes made by 'make rpm' command. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9bebb65..dcdf6bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,17 +135,30 @@ kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse /bin/false ; \ fi -rpm: dist kimchi.spec +check_files: + @if [ -d '.git' ]; then \ + if [ `git status --porcelain | wc -l` -gt 0 ]; then \ + echo "***** Aborting 'make rpm' command *****"; \ + echo "There are some changes not commited in your working \ +directory. To avoid losing them, please commit or stage before run 'make rpm' command."; \ + exit 1; \ + fi \ + fi + +rpm: check_files dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + @if [ -d '.git' ]; then \ + git clean -df & git reset --hard; \ + fi -fedora-rpm: contrib/kimchi.spec.fedora +fedora-rpm: check_files contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec $(MAKE) rpm -suse-rpm: contrib/kimchi.spec.suse +suse-rpm: check_files contrib/kimchi.spec.suse ln -sf contrib/kimchi.spec.suse kimchi.spec $(MAKE) rpm -- 2.7.4

2 1

[PATCH] [Kimchi] * DEPENDS on WOK 'eliminate code repetition' patchset * model changes
by dhbarboza82＠gmail.com 12 Aug '16

12 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch uses the new WoK function 'get_all_model_instances' to simplify the code in model.py. Daniel Henrique Barboza (1): model.py: use the new 'get_all_model_instances' utils function model/model.py | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) -- 2.5.5

3 3

[PATCH v2] [WoK 0/2] eliminate code repetition when fetching model instances
by dhbarboza82＠gmail.com 12 Aug '16

12 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - added support for loading model instances that receive no keyword arguments in the constructor. To avoid code duplication across WoK plug-ins, this patch encapsulates the core logic in all 'model.py' files in two utility functions in wok/utils.py to be used by all plug-ins. An example of usage is given in model.py from WoK. Daniel Henrique Barboza (2): wok/utils.py: adding utility 'get model instances' methods model.py: use the new 'get_all_model_instances' utils function src/wok/model/model.py | 22 ++---------------- src/wok/utils.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 20 deletions(-) -- 2.5.5

3 4

[PATCH] [WoK 0/2] eliminate code repetition when fetching model instances
by dhbarboza82＠gmail.com 12 Aug '16

12 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> To avoid code duplication across WoK plug-ins, this patch encapsulates the core logic in all 'model.py' files in two utility functions in wok/utils.py to be used by all plug-ins. An example of usage is given in model.py from WoK. Daniel Henrique Barboza (2): wok/utils.py: adding utility 'get model instances' methods model.py: use the new 'get_all_model_instances' utils function src/wok/model/model.py | 22 ++---------------- src/wok/utils.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 20 deletions(-) -- 2.5.5

2 3

[PATCH V2] [Kimchi] Added on_poweroff, on_reboot, on_crash tag to support s390x architecture.
by archus＠linux.vnet.ibm.com 11 Aug '16

11 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> By default on_crash is destory, and if vm crashed then '/var/run/libvirt/qemu/%s.pid is deleted on s390x which in turn throw exception. So having on_crash tag with restart solve the issue. Archana Singh (1): Added on_poweroff, on_reboot, on_crash tag to also support s390x architecture. kvmusertests.py | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4

2 4

[PATCH V2] [Kimchi] Added check for s390x architecture to not add graphics in params as not supported.
by archus＠linux.vnet.ibm.com 11 Aug '16

11 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added check for s390x architecture to not add graphics in params as not supported on s390x architecture. Archana Singh (1): Added check for s390x architecture to not add graphics in params as not supported. vmtemplate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4

2 3

[PATCH V2] [Kimchi] Added method for implementation of s390x boot detection
by archus＠linux.vnet.ibm.com 11 Aug '16

11 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added method for implementation of s390x boot detection. And set bootable as True, so that creation of template can be proceeded, and once we will have actual implementation of this method follow up patch will be sent. Archana Singh (1): Added method for implementation of s390x boot detection. isoinfo.py | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4

2 3

[PATCH V2] [Kimchi] Guestfs if not supported will return unknown distro and version
by archus＠linux.vnet.ibm.com 11 Aug '16

11 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> On s390x machine, guestfs is not supported, hence made the change in imageinfo.py to return unknown as distro and version on import error of guestfs. Archana Singh (1): Modified code, to return distro and version as unknown, if guestfs import failed. imageinfo.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.7.4

2 3

[PATCH][Kimchi] Issue #604: Windows XP: Kimchi should set the right NIC Type in Templates
by Ramon Medeiros 10 Aug '16

10 Aug '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- osinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osinfo.py b/osinfo.py index a3c2b0e..41853fc 100644 --- a/osinfo.py +++ b/osinfo.py @@ -74,7 +74,8 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', tablet_bus='usb')}} -custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}} +custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}, + 'windows': {'xp': {'x86': dict(nic_model='pcnet')}}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', -- 2.5.5

2 1

[PATCH] [Kimchi] Revert "Use verbs in the past"
by Lucio Correia 10 Aug '16

10 Aug '16

Use present verbs again now that failed requests are also logged. This reverts commit 493fb971a275ebbe9b19447a9d9aacd37537d47b. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 86 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/i18n.py b/i18n.py index dfc61e5..7625469 100644 --- a/i18n.py +++ b/i18n.py @@ -344,48 +344,48 @@ messages = { "KCHEVENT0004W": _("I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)."), # These messages (ending with L) are for user log purposes - "KCHNET0001L": _("Created virtual network '%(name)s' type '%(connection)s'"), - "KCHNET0002L": _("Removed virtual network '%(ident)s'"), - "KCHNET0003L": _("Updated virtual network '%(ident)s'"), - "KCHNET0004L": _("Activated virtual network '%(ident)s'"), - "KCHNET0005L": _("Deactivated virtual network '%(ident)s'"), - "KCHPOOL0001L": _("Created storage pool '%(name)s' type '%(type)s'"), - "KCHPOOL0002L": _("Removed storage pool '%(ident)s'"), - "KCHPOOL0003L": _("Updated storage pool '%(ident)s'"), - "KCHPOOL0004L": _("Activated storage pool '%(ident)s'"), - "KCHPOOL0005L": _("Deactivated storage pool '%(ident)s'"), - "KCHSNAP0001L": _("Created snapshot '%(name)s' at guest '%(vm)s'"), - "KCHSNAP0002L": _("Removed snapshot '%(ident)s' from guest '%(vm)s'"), - "KCHSNAP0003L": _("Reverted guest '%(vm)s' to snapshot '%(ident)s'"), - "KCHTMPL0001L": _("Created template '%(name)s'"), - "KCHTMPL0002L": _("Removed template '%(ident)s'"), - "KCHTMPL0003L": _("Updated template '%(ident)s'"), - "KCHTMPL0004L": _("Cloned template '%(ident)s'"), - "KCHVM0001L": _("Created guest '%(name)s' from template '%(template)s'"), - "KCHVM0002L": _("Removed guest '%(ident)s'"), - "KCHVM0003L": _("Edited guest '%(ident)s'"), - "KCHVM0004L": _("Started guest '%(ident)s'"), - "KCHVM0005L": _("Powered off guest '%(ident)s'"), + "KCHNET0001L": _("Create virtual network '%(name)s' type '%(connection)s'"), + "KCHNET0002L": _("Remove virtual network '%(ident)s'"), + "KCHNET0003L": _("Update virtual network '%(ident)s'"), + "KCHNET0004L": _("Activate virtual network '%(ident)s'"), + "KCHNET0005L": _("Deactivate virtual network '%(ident)s'"), + "KCHPOOL0001L": _("Create storage pool '%(name)s' type '%(type)s'"), + "KCHPOOL0002L": _("Remove storage pool '%(ident)s'"), + "KCHPOOL0003L": _("Update storage pool '%(ident)s'"), + "KCHPOOL0004L": _("Activate storage pool '%(ident)s'"), + "KCHPOOL0005L": _("Deactivate storage pool '%(ident)s'"), + "KCHSNAP0001L": _("Create snapshot '%(name)s' at guest '%(vm)s'"), + "KCHSNAP0002L": _("Remove snapshot '%(ident)s' from guest '%(vm)s'"), + "KCHSNAP0003L": _("Revert guest '%(vm)s' to snapshot '%(ident)s'"), + "KCHTMPL0001L": _("Create template '%(name)s'"), + "KCHTMPL0002L": _("Remove template '%(ident)s'"), + "KCHTMPL0003L": _("Update template '%(ident)s'"), + "KCHTMPL0004L": _("Clone template '%(ident)s'"), + "KCHVM0001L": _("Create guest '%(name)s' from template '%(template)s'"), + "KCHVM0002L": _("Remove guest '%(ident)s'"), + "KCHVM0003L": _("Edit guest '%(ident)s'"), + "KCHVM0004L": _("Start guest '%(ident)s'"), + "KCHVM0005L": _("Power off guest '%(ident)s'"), "KCHVM0006L": _("Shutdown guest '%(ident)s'"), - "KCHVM0007L": _("Restarted guest '%(ident)s'"), - "KCHVM0008L": _("Connected to guest '%(ident)s' through novnc/spice"), - "KCHVM0009L": _("Cloned guest '%(ident)s'"), - "KCHVM0010L": _("Migrated guest '%(ident)s' to '%(remote_host)s'"), - "KCHVM0011L": _("Suspended guest '%(ident)s'"), - "KCHVM0012L": _("Resumed guest '%(ident)s'"), - "KCHVM0013L": _("Connected to guest '%(ident)s' through serial"), - "KCHVMHDEV0001L": _("Attached host device '%(name)s' to guest '%(vmid)s'"), - "KCHVMHDEV0002L": _("Detached host device '%(ident)s' from guest '%(vmid)s'"), - "KCHVMIF0001L": _("Attached network interface '%(network)s' to guest '%(vm)s'"), - "KCHVMIF0002L": _("Detached network interface '%(ident)s' from guest '%(vm)s'"), - "KCHVMIF0003L": _("Updated network interface '%(ident)s' at guest '%(vm)s'"), - "KCHVMSTOR0001L": _("Attached %(type)s storage '%(path)s' to guest '%(vm)s'"), - "KCHVMSTOR0002L": _("Removed storage '%(ident)s' from guest '%(vm)s'"), - "KCHVMSTOR0003L": _("Updated storage '%(ident)s' at guest '%(vm)s'"), - "KCHVOL0001L": _("Created storage volume '%(name)s' at pool '%(pool)s'"), - "KCHVOL0002L": _("Removed storage volume '%(ident)s' from pool '%(pool)s'"), - "KCHVOL0003L": _("Updated storage volume '%(ident)s' at pool '%(pool)s'"), - "KCHVOL0004L": _("Wiped storage volume '%(ident)s' off pool '%(pool)s'"), - "KCHVOL0005L": _("Resized storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s"), - "KCHVOL0006L": _("Cloned storage volume '%(ident)s' at pool '%(pool)s'"), + "KCHVM0007L": _("Restart guest '%(ident)s'"), + "KCHVM0008L": _("Connect to guest '%(ident)s' through novnc/spice"), + "KCHVM0009L": _("Clone guest '%(ident)s'"), + "KCHVM0010L": _("Migrate guest '%(ident)s' to '%(remote_host)s'"), + "KCHVM0011L": _("Suspend guest '%(ident)s'"), + "KCHVM0012L": _("Resume guest '%(ident)s'"), + "KCHVM0013L": _("Connect to guest '%(ident)s' through serial"), + "KCHVMHDEV0001L": _("Attach host device '%(name)s' to guest '%(vmid)s'"), + "KCHVMHDEV0002L": _("Detach host device '%(ident)s' from guest '%(vmid)s'"), + "KCHVMIF0001L": _("Attach network interface '%(network)s' to guest '%(vm)s'"), + "KCHVMIF0002L": _("Detach network interface '%(ident)s' from guest '%(vm)s'"), + "KCHVMIF0003L": _("Update network interface '%(ident)s' at guest '%(vm)s'"), + "KCHVMSTOR0001L": _("Attach %(type)s storage '%(path)s' to guest '%(vm)s'"), + "KCHVMSTOR0002L": _("Remove storage '%(ident)s' from guest '%(vm)s'"), + "KCHVMSTOR0003L": _("Update storage '%(ident)s' at guest '%(vm)s'"), + "KCHVOL0001L": _("Create storage volume '%(name)s' at pool '%(pool)s'"), + "KCHVOL0002L": _("Remove storage volume '%(ident)s' from pool '%(pool)s'"), + "KCHVOL0003L": _("Update storage volume '%(ident)s' at pool '%(pool)s'"), + "KCHVOL0004L": _("Wipe storage volume '%(ident)s' off pool '%(pool)s'"), + "KCHVOL0005L": _("Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s"), + "KCHVOL0006L": _("Clone storage volume '%(ident)s' at pool '%(pool)s'"), } -- 1.9.1

2 1

[RFC} HTML lang attribute in ISO 639-1
by Samuel Henrique De Oliveira Guimaraes 10 Aug '16

10 Aug '16

Hi, I'm noticing that some elements are collapsing or having weird width values in certain languages. A solution for this would be changing the element width with SCSS/CSS based on the HTML lang attribute. For now I'm just going to use the lang values that Wok sets today but I suggest we stick with ISO 639-1 for accessibility reasons. If the browser can't detect the language it will "think" that the content is in English: http://www.w3schools.com/tags/ref_language_codes.asp Regards, Samuel

2 2

[PATCH] [Wok] Minor change in Wok Drop-Downs to fix text alignment with different icons and locales
by sguimaraes943＠gmail.com 10 Aug '16

10 Aug '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds a new CSS rule to allow Font Awesome icons in Wok drop-down menus. Samuel Guimarães (1): Minor change in Wok Drop-Downs to fix text alignment with different icons and locales ui/css/src/modules/_menu-flat.scss | 10 ++++++++-- ui/css/wok.css | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) -- 2.5.5

2 2

[PATCH] [Kimchi] Updated serial console to support s390x architecture.
by archus＠linux.vnet.ibm.com 10 Aug '16

10 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> On s390x architecture, serial console differ from x86. Added code to support s390x architecture. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- xmlutils/serial.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xmlutils/serial.py b/xmlutils/serial.py index 99b1e90..c823ee6 100644 --- a/xmlutils/serial.py +++ b/xmlutils/serial.py @@ -36,6 +36,11 @@ def get_serial_xml(params): <target type='serial' port='1'/> <address type='spapr-vio' reg='0x30001000'/> </console> + + For s390x + <console type='pty'> + <target type='sclp' port='0'/> + </console> """ # pcc serial console if params["arch"] in ["ppc", "ppc64"]: @@ -43,7 +48,11 @@ def get_serial_xml(params): console.append(E.target(type="serial", port='1')) console.append(E.address(type="spapr-vio", reg="0x30001000")) return ET.tostring(console, encoding='utf-8', pretty_print=True) - + # for s390x + elif params["arch"] in ["s390x"]: + console = E.console(type="pty") + console.append(E.target(type="sclp", port='0')) + return ET.tostring(console, encoding='utf-8', pretty_print=True) # for x else: serial = E.serial(type="pty") -- 2.7.4

3 3

[PATCH] [Kimchi 0/2] s390x architecture based changes
by archus＠linux.vnet.ibm.com 10 Aug '16

10 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) On s390x machine, guestfs is not supported, hence made the change in imageinfo.py to return unknown as distro and version on import error of guestfs. 2) On s390x machine, scan cannot use El Torito boot specification. Hence for now set bootable as True till we don't get the way to scan on s390x. Archana Singh (2): Modified code, to return distro and version as unknown, if guestfs import failed. s390x based architecture changes. imageinfo.py | 10 ++++++---- isoinfo.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) -- 2.7.4

3 6

[PATCH] [Kimchi 1/3] Added s390x architecture support in osinfo params.
by archus＠linux.vnet.ibm.com 09 Aug '16

09 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Added s390x in SUPPORTED_ARCHS. 2) Added memory devices slot limits for s390x. 3) Added template_spec for s390x. 4) Added arch check to add old template spec in params and no need to do modern_version_bases check as for s390x as template specs are same for all version. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- osinfo.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/osinfo.py b/osinfo.py index a3c2b0e..fcdb0fe 100644 --- a/osinfo.py +++ b/osinfo.py @@ -31,7 +31,8 @@ from wok.plugins.kimchi.config import kimchiPaths SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'power': ('ppc', 'ppc64'), - 'ppc64le': ('ppc64le')} + 'ppc64le': ('ppc64le'), + 's390x': ('s390x')} # Memory devices slot limits by architecture @@ -39,7 +40,8 @@ MEM_DEV_SLOTS = {'ppc64': 256, 'ppc64le': 256, 'x86_64': 256, 'i686': 256, - 'i386': 256} + 'i386': 256, + 's390x': 256} template_specs = {'x86': {'old': dict(disk_bus='ide', @@ -71,7 +73,11 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', - tablet_bus='usb')}} + tablet_bus='usb')}, + 's390x': {'old': dict(disk_bus='virtio', + nic_model='virtio', cdrom_bus='scsi'), + 'modern': dict(disk_bus='virtio', + nic_model='virtio', cdrom_bus='scsi')}} custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}} @@ -218,8 +224,10 @@ def lookup(distro, version): # set up arch to ppc64 instead of ppc64le due to libvirt compatibility if params["arch"] == "ppc64le": params["arch"] = "ppc64" - - if distro in modern_version_bases[arch]: + # On s390x, template spec does not change based on version. + if params["arch"] == "s390x": + params.update(template_specs[arch]['old']) + elif distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) -- 2.7.4

2 3

[PATCH] [Kimchi] Added s390x architecture support.
by archus＠linux.vnet.ibm.com 09 Aug '16

09 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Added s390x in SUPPORTED_ARCHS. 2) Added memory devices slot limits for s390x. 3) Added template_spec for s390x. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- osinfo.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/osinfo.py b/osinfo.py index a3c2b0e..f7cdb2e 100644 --- a/osinfo.py +++ b/osinfo.py @@ -31,7 +31,8 @@ from wok.plugins.kimchi.config import kimchiPaths SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'power': ('ppc', 'ppc64'), - 'ppc64le': ('ppc64le')} + 'ppc64le': ('ppc64le'), + 's390x': ('s390x')} # Memory devices slot limits by architecture @@ -39,7 +40,8 @@ MEM_DEV_SLOTS = {'ppc64': 256, 'ppc64le': 256, 'x86_64': 256, 'i686': 256, - 'i386': 256} + 'i386': 256, + 's390x': 256} template_specs = {'x86': {'old': dict(disk_bus='ide', @@ -71,7 +73,11 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', - tablet_bus='usb')}} + tablet_bus='usb')}, + 's390x': {'old': dict(disk_bus='virtio', + nic_model='virtio', cdrom_bus='scsi'), + 'modern': dict(disk_bus='virtio', + nic_model='virtio', cdrom_bus='scsi')}} custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}} -- 2.7.4

2 1

[PATCH V2] [Wok 0/4] Fix issue #142
by Lucio Correia 08 Aug '16

08 Aug '16

In order to run tests successfully, remove your data/logs/wok-req.log. I will send fix for issue #140 in a separate patchset. Lucio Correia (4): Add option to get untranslated message text Log message code and parameters instead of translated text Fix issue with converting message to unicode Update tests src/wok/control/base.py | 13 ++++++------- src/wok/message.py | 32 ++++++++++++++++++-------------- src/wok/reqlogger.py | 47 ++++++++++++++++++++++++++++++++++++++--------- src/wok/root.py | 12 ++++++------ tests/test_api.py | 2 +- 5 files changed, 69 insertions(+), 37 deletions(-) -- 1.9.1

2 6

[RFC] Issue #585: 'make clean' does not revert its changes from 'make rpm'
by Bianca Carvalho 08 Aug '16

08 Aug '16

Reproducing the issue locally, when I run 'make rpm' and 'git status' the following files are listed: modified: ChangeLog modified: po/de_DE.po modified: po/en_US.po modified: po/es_ES.po modified: po/fr_FR.po modified: po/it_IT.po modified: po/ja_JP.po modified: po/kimchi.pot modified: po/ko_KR.po modified: po/pt_BR.po modified: po/ru_RU.po modified: po/zh_CN.po modified: po/zh_TW.po To solve that problem, there are two possible solutions: 1- Files changed at runtime will have the following format: - For example: ChangeLog, I will keep a tracked one at ChangeLog.am, and the file generate by make command, ChangeLog, will not be tracked (and be added to .gitignore). 2- include following command to Makefile.am: git clean -df & git reset --hard, to remove untracked files from the working tree and to revert files changes. I would like to make sure which one (or any other solution) would be the best in this case and why not use any of them. Thanks, Bianca

2 1

[PATCH] [Wok 0/4] Fix issues #140 and #142
by Lucio Correia 04 Aug '16

04 Aug '16

In order to run tests successfully, remove your data/logs/wok-req.log. DEPENDS ON: [Wok] Isolate string utils in order to avoid cyclic import Lucio Correia (4): Add option to get untranslated message text Log message code and parameters instead of translated text Fix issue with converting message to unicode Update tests src/wok/control/base.py | 13 ++++++------- src/wok/message.py | 32 ++++++++++++++++++-------------- src/wok/reqlogger.py | 47 ++++++++++++++++++++++++++++++++++++++--------- src/wok/root.py | 12 ++++++------ tests/test_api.py | 2 +- 5 files changed, 69 insertions(+), 37 deletions(-) -- 1.9.1

2 5

[PATCH] [Wok] Isolate string utils in order to avoid cyclic import
by Lucio Correia 04 Aug '16

04 Aug '16

These functions are basic ones but were not able to be imported from message.py since other functions in utils were causing cyclic imports. Isolate it to avoid that problem. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 3 +- src/wok/reqlogger.py | 3 +- src/wok/stringutils.py | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/utils.py | 136 +----------------------------------------- 4 files changed, 159 insertions(+), 137 deletions(-) create mode 100644 src/wok/stringutils.py IMPORTANT: apply this along with ginger and gingerbase patches. diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 69541b1..6dfc977 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -33,7 +33,8 @@ from wok.control.utils import validate_params from wok.exception import InvalidOperation, UnauthorizedError, WokException from wok.message import WokMessage from wok.reqlogger import RequestRecord -from wok.utils import get_plugin_from_request, utf8_dict, wok_log, encode_value +from wok.stringutils import encode_value, utf8_dict +from wok.utils import get_plugin_from_request, wok_log # Default request log messages diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 8fadbcf..fd02382 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -30,7 +30,8 @@ from tempfile import NamedTemporaryFile from wok.config import config, get_log_download_path from wok.exception import InvalidParameter, OperationFailed -from wok.utils import ascii_dict, remove_old_files +from wok.stringutils import ascii_dict +from wok.utils import remove_old_files # Log search setup diff --git a/src/wok/stringutils.py b/src/wok/stringutils.py new file mode 100644 index 0000000..8f0160b --- /dev/null +++ b/src/wok/stringutils.py @@ -0,0 +1,154 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import copy +import locale + + +def ascii_dict(base, overlay=None): + result = copy.deepcopy(base) + result.update(overlay or {}) + + for key, value in result.iteritems(): + if isinstance(value, unicode): + result[key] = str(value.decode('utf-8')) + + return result + + +def utf8_dict(base, overlay=None): + result = copy.deepcopy(base) + result.update(overlay or {}) + + for key, value in result.iteritems(): + if isinstance(value, unicode): + result[key] = value.encode('utf-8') + + return result + + +def encode_value(val): + """ + Convert the value to string. + If its unicode, use encode otherwise str. + """ + if isinstance(val, unicode): + return val.encode('utf-8') + return str(val) + + +def decode_value(val): + """ + Converts value to unicode, + if its not an instance of unicode. + For doing so convert the val to string, + if its not instance of basestring. + """ + if not isinstance(val, basestring): + val = str(val) + if not isinstance(val, unicode): + val = val.decode('utf-8') + return val + + +def formatMeasurement(number, settings): + ''' + Refer to "Units of information" ( + http://en.wikipedia.org/wiki/Units_of_information + ) for more information about measurement units. + + @param number The number to be normalized. + @param settings + base Measurement base, accepts 2 or 10. defaults to 2. + unit The unit of the measurement, e.g., B, Bytes/s, bps, etc. + fixed The number of digits after the decimal point. + locale The locale for formating the number if not passed + format is done as per current locale. + @returns [object] + v The number part of the measurement. + s The suffix part of the measurement including multiple and unit. + e.g., kB/s means 1000B/s, KiB/s for 1024B/s. + ''' + unitBaseMapping = {2: [{"us": 'Ki', "v": 1024}, + {"us": 'Mi', "v": 1048576}, + {"us": 'Gi', "v": 1073741824}, + {"us": 'Ti', "v": 1099511627776}, + {"us": 'Pi', "v": 1125899906842624}], + 10: [{"us": 'k', "v": 1000}, + {"us": 'M', "v": 1000000}, + {"us": 'G', "v": 1000000000}, + {"us": 'T', "v": 1000000000000}, + {"us": 'P', "v": 1000000000000000}]} + + if(not number): + return number + settings = settings or {} + unit = settings['unit'] if 'unit' in settings else 'B' + base = settings['base'] if 'base' in settings else 2 + + new_locale = settings['locale'] if 'locale' in settings else '' + + if(base != 2 and base != 10): + return encode_value(number) + unit + + fixed = settings['fixed'] + + unitMapping = unitBaseMapping[base] + for mapping in reversed(unitMapping): + suffix = mapping['us'] + startingValue = mapping['v'] + if(number < startingValue): + continue + + formatted = float(number) / startingValue + formatted = formatNumber(formatted, fixed, new_locale) + return formatted + suffix + unit + + formatted_number = formatNumber(number, fixed, new_locale) + return formatted_number+unit + + +def formatNumber(number, fixed, format_locale): + ''' + Format the number based on format_locale passed. + ''' + + # get the current locale + current_locale = locale.getlocale() + new_locale = '' + # set passed locale and set new_locale to same value. + if format_locale: + new_locale = locale.setlocale(locale.LC_ALL, format_locale) + + # Based on type of number use the correct formatter + if isinstance(number, float): + if fixed: + formatted = locale.format('%' + '.%df' % fixed, number, True) + else: + formatted = locale.format('%f', number, True) + if isinstance(number, int): + formatted = locale.format('%d', number, True) + # After formatting is done as per locale, reset the locale if changed. + if (new_locale and not current_locale[0] and not current_locale[1]): + locale.setlocale(locale.LC_ALL, 'C') + elif (new_locale): + locale.setlocale(locale.LC_ALL, current_locale[0] + "." + + current_locale[1]) + + return formatted diff --git a/src/wok/utils.py b/src/wok/utils.py index c78a77a..d6bdf0a 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -21,7 +21,6 @@ # import cherrypy -import copy import glob import grp import os @@ -33,7 +32,6 @@ import subprocess import sys import traceback import xml.etree.ElementTree as ET -import locale from cherrypy.lib.reprconf import Parser from datetime import datetime, timedelta @@ -43,6 +41,7 @@ from threading import Timer from wok.asynctask import AsyncTask from wok.config import paths, PluginPaths from wok.exception import InvalidParameter, TimeoutExpired +from wok.stringutils import decode_value wok_log = cherrypy.log.error_log @@ -137,28 +136,6 @@ def get_plugin_from_request(): return 'wok' -def ascii_dict(base, overlay=None): - result = copy.deepcopy(base) - result.update(overlay or {}) - - for key, value in result.iteritems(): - if isinstance(value, unicode): - result[key] = str(value.decode('utf-8')) - - return result - - -def utf8_dict(base, overlay=None): - result = copy.deepcopy(base) - result.update(overlay or {}) - - for key, value in result.iteritems(): - if isinstance(value, unicode): - result[key] = value.encode('utf-8') - - return result - - def import_class(class_path): module_name, class_name = class_path.rsplit('.', 1) try: @@ -610,114 +587,3 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True - - -def encode_value(val): - """ - Convert the value to string. - If its unicode, use encode otherwise str. - """ - if isinstance(val, unicode): - return val.encode('utf-8') - return str(val) - - -def decode_value(val): - """ - Converts value to unicode, - if its not an instance of unicode. - For doing so convert the val to string, - if its not instance of basestring. - """ - if not isinstance(val, basestring): - val = str(val) - if not isinstance(val, unicode): - val = val.decode('utf-8') - return val - - -def formatMeasurement(number, settings): - ''' - Refer to "Units of information" ( - http://en.wikipedia.org/wiki/Units_of_information - ) for more information about measurement units. - - @param number The number to be normalized. - @param settings - base Measurement base, accepts 2 or 10. defaults to 2. - unit The unit of the measurement, e.g., B, Bytes/s, bps, etc. - fixed The number of digits after the decimal point. - locale The locale for formating the number if not passed - format is done as per current locale. - @returns [object] - v The number part of the measurement. - s The suffix part of the measurement including multiple and unit. - e.g., kB/s means 1000B/s, KiB/s for 1024B/s. - ''' - unitBaseMapping = {2: [{"us": 'Ki', "v": 1024}, - {"us": 'Mi', "v": 1048576}, - {"us": 'Gi', "v": 1073741824}, - {"us": 'Ti', "v": 1099511627776}, - {"us": 'Pi', "v": 1125899906842624}], - 10: [{"us": 'k', "v": 1000}, - {"us": 'M', "v": 1000000}, - {"us": 'G', "v": 1000000000}, - {"us": 'T', "v": 1000000000000}, - {"us": 'P', "v": 1000000000000000}]} - - if(not number): - return number - settings = settings or {} - unit = settings['unit'] if 'unit' in settings else 'B' - base = settings['base'] if 'base' in settings else 2 - - new_locale = settings['locale'] if 'locale' in settings else '' - - if(base != 2 and base != 10): - return encode_value(number) + unit - - fixed = settings['fixed'] - - unitMapping = unitBaseMapping[base] - for mapping in reversed(unitMapping): - suffix = mapping['us'] - startingValue = mapping['v'] - if(number < startingValue): - continue - - formatted = float(number) / startingValue - formatted = formatNumber(formatted, fixed, new_locale) - return formatted + suffix + unit - - formatted_number = formatNumber(number, fixed, new_locale) - return formatted_number+unit - - -def formatNumber(number, fixed, format_locale): - ''' - Format the number based on format_locale passed. - ''' - - # get the current locale - current_locale = locale.getlocale() - new_locale = '' - # set passed locale and set new_locale to same value. - if format_locale: - new_locale = locale.setlocale(locale.LC_ALL, format_locale) - - # Based on type of number use the correct formatter - if isinstance(number, float): - if fixed: - formatted = locale.format('%' + '.%df' % fixed, number, True) - else: - formatted = locale.format('%f', number, True) - if isinstance(number, int): - formatted = locale.format('%d', number, True) - # After formatting is done as per locale, reset the locale if changed. - if (new_locale and not current_locale[0] and not current_locale[1]): - locale.setlocale(locale.LC_ALL, 'C') - elif (new_locale): - locale.setlocale(locale.LC_ALL, current_locale[0] + "." + - current_locale[1]) - - return formatted -- 1.9.1

2 3

[RFC] Use javascript libraries from rpms instead of hardcode it inside the git
by Ramon Medeiros 04 Aug '16

04 Aug '16

Hi, i want to use javascript libraries from rpms, but, not all libraries are available in distro repos. So let's discuss how i can do it: Fedora case: Fedora has jquery, lodash, moment, typeahead and es5-shim libraries available. Opensuse: No library available Ubuntu: Ubuntu has bootstrap, jquery, jquery-ui e lodash. As not all libraries are available, i received a suggestion to use a parameter at configure.ac, like --with-spice, to choose libs from rpm or from the code. So, what is best: Use single parameter (--use-js-from-rpms) I will need to check the distro by code and generate the html templates with the script tag changed. Use parameters with distros (--ubuntu-use-js-from-rpms) Same as above, but distro will not be checked. -- 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

Question on https_only flag of /etc/wok/wok.conf
by Suresh Babu Angadi 04 Aug '16

04 Aug '16

Hi All, Per default settings, 8000 is used as http port and 8001 is used as https port. case 1: https_only=true, was not able to browse with 8000 port, which is as expected. case 2: https_only=false, per my understanding, it should allow http connections, but all the requests are rerouted to https and 8001 port. So is it the case that, though https_only is false, no requests are handled in 8000(http) port? please help me understand the significance of https_only flag. -- Regards, Suresh Babu Angadi

3 4

[PATCH ][Wok]Ginger Issue #376:Unable to edit the text field or click submit/cancel after press ESC or click outside the error message dialog of Add User.
by atreyee＠linux.vnet.ibm.com 03 Aug '16

03 Aug '16

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> ESC button click/blur handler was not available for wok.confirm. --- ui/js/src/wok.confirm.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.confirm.js b/ui/js/src/wok.confirm.js index fde76bf..9b2fdaf 100644 --- a/ui/js/src/wok.confirm.js +++ b/ui/js/src/wok.confirm.js @@ -32,8 +32,10 @@ * the callback function of click the confirm button. * @param cancelCallback * The callback function of click the cancel and X button. + * @param closeCallback + * The callback function of click the Esc button and blur. */ -wok.confirm = function(settings, confirmCallback, cancelCallback) { +wok.confirm = function(settings, confirmCallback, cancelCallback, closeCallback) { "use strict"; var modalStr = '<div id="wok-confirm-modal" class="modal fade host-modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalLabel" aria-hidden="true"></div>'; if ($('#wok-confirm-modal ').size() < 1 && $('#modalWindow').size() < 1 ) { @@ -86,6 +88,9 @@ wok.confirm = function(settings, confirmCallback, cancelCallback) { "use strict"; $('#wok-confirm-modal').removeData('bs.modal'); $('#wok-confirm-modal').remove(); + if (closeCallback) { + closeCallback(); + } }; -}; \ No newline at end of file +}; -- 2.1.0

2 1

[PATCH] [Wok] Externalise missed strings in Wok.
by pkulkark＠linux.vnet.ibm.com 03 Aug '16

03 Aug '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalises some more static strings missed in Wok. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..d61b22b 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title="" /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=""/> <div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e238a34..eaf8815 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -174,8 +174,8 @@ </div> <div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -221,10 +221,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body> -- 2.1.0

3 3