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