March 2016 - Kimchi-devel - oVirt List Archives

[PATCH v2] [Kimchi] Fixed Memory and Max Memory values when adding a new Guest
by Socorro Stoppler 16 Mar '16

16 Mar '16

v2: Socorro Stoppler (1): Fixed Memory and Max Memory values when adding a new Guest Removed showing of max memory in guest and made guest and templates display the same way for cpu/memory for consistency ui/pages/guest-add.html.tmpl | 10 +++++----- ui/pages/tabs/templates.html.tmpl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.9.1 v1: Samuel Guimarães (1): Fixed Memory and Max Memory values when adding a new Guest ui/pages/guest-add.html.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 1.9.3

4 4

[PATCH v3] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v3 - Removed wrong selector change in bootstrap-select files Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/src/modules/_login.scss | 9 ++++----- ui/css/wok.css | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) -- 1.9.3

2 2

[PATCH][Wok] Move function 'get_next_clone_name' from Wok
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

This function is not related to any Wok feature or resource. So moving it to Kimchi. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/utils.py | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 7e9a928..175cf25 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -391,47 +391,6 @@ def remove_old_files(globexpr, hours): wok_log.error(str(e)) -def get_next_clone_name(all_names, basename, name_suffix=''): - """Find the next available name for a cloned resource. - - If any resource named "<basename>-clone-<number><name_suffix>" is found - in "all_names", use the maximum "number" + 1; else, use 1. - - Arguments: - all_names -- All existing names for the resource type. This list will - be used to make sure the new name won't conflict with - existing names. - basename -- The name of the original resource. - name_suffix -- The resource name suffix (optional). This parameter - exist so that a resource named "foo.img" gets the name - "foo-clone-1.img" instead of "foo.img-clone-1". If this parameter - is used, the suffix should not be present in "basename". - - Return: - A UTF-8 string in the format "<basename>-clone-<number><name_suffix>". - """ - re_group_num = 'num' - - re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) - if name_suffix != '': - re_expr = u'%s%s' % (re_expr, name_suffix) - - max_num = 0 - re_compiled = re.compile(re_expr) - - for n in all_names: - match = re_compiled.match(n) - if match is not None: - max_num = max(max_num, int(match.group(re_group_num))) - - # increments the maximum "clone number" found - new_name = u'%s-clone-%d' % (basename, max_num + 1) - if name_suffix != '': - new_name = new_name + name_suffix - - return new_name - - def get_unique_file_name(all_names, name): """Find the next available, unique name for a file. -- 2.1.0

3 2

[PATCH v3][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

v3: - Add default value "1" (requested in review) v2: This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 +++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 +++++++++++++++++++++++++++++++++++ 7 files changed, 152 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

2 4

[PATCH][Kimchi] Fix issue:#838 - Set qemu version to 2.1
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

Qemu only supports memory hotplug after 2.1 version, see: http://wiki.qemu.org/ChangeLog/2.1#x86 In order to avoid errors starting guests, it is better to set the minimal version required (2.1) in packages specs. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index b6acdaf..c46b5b3 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,7 @@ Depends: wok, gettext, libvirt-bin, nfs-common, - qemu-kvm, + qemu-kvm (>= 2.1), python-parted, python-psutil (>= 0.6.0), python-ethtool, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c2111f9..1bdf38c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -9,7 +9,7 @@ License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz Requires: wok Requires: ginger-base -Requires: qemu-kvm +Requires: qemu-kvm >= 2.1 Requires: gettext Requires: libvirt Requires: libvirt-python -- 2.1.0

3 4

[PATCH v2][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 58 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 ++++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 ++++++++++++++++++++++++++++++++++++ 7 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

3 6

[PATCH v2] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 15 Mar '16

15 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed image alignment Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_login.scss | 5 ++--- ui/css/wok.css | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) -- 1.9.3

2 2

[PATCH] [Wok 0/2] Enhancements and new library
by sguimaraes943＠gmail.com 15 Mar '16

15 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> The first patch includes jquery.containsNC pseudo-selector for jQuery functions. This is required in order to fix Kimchi issue #809. The second patch includes an enhancement in Wok login page, fixing Wok logos in small screens. Wok will render up to three logos per row below the login panel instead of only two. Samuel Guimarães (2): Added jquery.containsNC to enable case insensitive pseudo-selector in JS Fixed wok logos in small screen resolutions configure.ac | 1 + ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_login.scss | 3 +-- ui/css/wok.css | 5 ++--- ui/libs/Makefile.am | 2 +- ui/libs/jquery-containsNC/LICENSE | 21 +++++++++++++++++++++ ui/libs/jquery-containsNC/Makefile.am | 22 ++++++++++++++++++++++ ui/libs/jquery-containsNC/jquery.containsNC.js | 3 +++ ui/pages/wok-ui.html.tmpl | 1 + 9 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 ui/libs/jquery-containsNC/LICENSE create mode 100644 ui/libs/jquery-containsNC/Makefile.am create mode 100644 ui/libs/jquery-containsNC/jquery.containsNC.js -- 1.9.3

2 3

[PATCH][Kimchi 1/2] Fix issue when clone a vm multiple times
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

When Kimchi clones a guest it uses the Wok function "get_next_clone_name", which adds an incremental number in the new clone name. This approach causes a race condiction if Kimchi tries to clone a guest multiple times, sending multiple request at once. To avoid this problem, it is better to use timestamps in the clones names instead of incremental numbers. Them it guarantees names will be unique. This patch requires timestamp support in "get_next_clone_name" wok funtion. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 195c879..e60bf51 100644 --- a/model/vms.py +++ b/model/vms.py @@ -318,7 +318,7 @@ class VMModel(object): vms_being_created.append(uri_name) current_vm_names = self.vms.get_list() + vms_being_created - new_name = get_next_clone_name(current_vm_names, name) + new_name = get_next_clone_name(current_vm_names, name, ts=True) # create a task with the actual clone function taskid = add_task(u'/plugins/kimchi/vms/%s/clone' % new_name, -- 2.1.0

2 3

[PATCH][Wok] Add support to timestamps in clone naming function
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

There is a potential race condiction issue when some plugin tries to use the function get_next_clone_name(all_names, basename, name_suffix=''). If clone requests are done so fast, it is possible that the plugin does not send all resource names in all_names parameter, then the function is going to select the same name for 2 or more clones, which is going to cause errors in the plugin. Supporting timestamps in microsecond precision, plugins can avoid this type of error coding its own race condiction fix or just using the timestamp function option. New name will be "basename-clone-timestamp-name-suffix". Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/utils.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 7e9a928..b80a80b 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -31,6 +31,7 @@ import re import sqlite3 import subprocess import sys +import time import traceback import xml.etree.ElementTree as ET @@ -391,7 +392,7 @@ def remove_old_files(globexpr, hours): wok_log.error(str(e)) -def get_next_clone_name(all_names, basename, name_suffix=''): +def get_next_clone_name(all_names, basename, name_suffix='', ts=False): """Find the next available name for a cloned resource. If any resource named "<basename>-clone-<number><name_suffix>" is found @@ -406,26 +407,34 @@ def get_next_clone_name(all_names, basename, name_suffix=''): exist so that a resource named "foo.img" gets the name "foo-clone-1.img" instead of "foo.img-clone-1". If this parameter is used, the suffix should not be present in "basename". + ts -- use timestamp, instead of incremental numbers Return: A UTF-8 string in the format "<basename>-clone-<number><name_suffix>". """ re_group_num = 'num' - re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) - if name_suffix != '': - re_expr = u'%s%s' % (re_expr, name_suffix) + # Use timestamps or increase clone number + if ts: + # Microsecond precision + ts_suffix = int(time.time() * 1000000) + new_name = u'%s-clone-%d' % (basename, ts_suffix) + else: + re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) + if name_suffix != '': + re_expr = u'%s%s' % (re_expr, name_suffix) - max_num = 0 - re_compiled = re.compile(re_expr) + max_num = 0 + re_compiled = re.compile(re_expr) - for n in all_names: - match = re_compiled.match(n) - if match is not None: - max_num = max(max_num, int(match.group(re_group_num))) + for n in all_names: + match = re_compiled.match(n) + if match is not None: + max_num = max(max_num, int(match.group(re_group_num))) + + # increments the maximum "clone number" found + new_name = u'%s-clone-%d' % (basename, max_num + 1) - # increments the maximum "clone number" found - new_name = u'%s-clone-%d' % (basename, max_num + 1) if name_suffix != '': new_name = new_name + name_suffix -- 2.1.0

2 2

[PATCH v2] [Kimchi] Fixed "Add a Storage Device to VM" modal behavior when guest is running
by Socorro Stoppler 14 Mar '16

14 Mar '16

v2: Change default to qcow2 format Samuel Guimarães (1): Fixed "Add a Storage Device to VM" modal behavior when guest is running ui/js/src/kimchi.guest_storage_add.main.js | 41 ++++++++++++++++-------------- ui/pages/guest-storage-add.html.tmpl | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) -- 1.9.1

1 0

[PATCH] [Kimchi] Fixed "Add a Storage Device to VM" modal behavior when guest is running
by sguimaraes943＠gmail.com 14 Mar '16

14 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes an issue when trying to attach a storage device when a guest is running. The combo box was showing the correct option but the disk panel was hidden. Samuel Guimarães (1): Fixed "Add a Storage Device to VM" modal behavior when guest is running ui/js/src/kimchi.guest_storage_add.main.js | 38 ++++++++++++++++-------------- ui/pages/guest-storage-add.html.tmpl | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) -- 1.9.3

3 3

[PATCH] [Kimchi] Fixed Memory and Max Memory values when adding a new Guest
by sguimaraes943＠gmail.com 14 Mar '16

14 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed Memory and Max Memory values when adding a new Guest Samuel Guimarães (1): Fixed Memory and Max Memory values when adding a new Guest ui/pages/guest-add.html.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 1.9.3

4 6

Unable to activate PCI devices
by Samuel Henrique De Oliveira Guimaraes 14 Mar '16

14 Mar '16

Hi team, I was trying to find a fix for enabling PCI devices when editing a guest and the input filter as well but so far I'm unable to test it with any VM that I try to run: "KCHVMHDEV0003E: No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. For Intel CPU, add 'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. For AMD CPU, add 'iommu=pt iommu=1'." Is this correct? Thanks, Samuel

2 1

Re: [Kimchi-devel] [ginger-dev-list] [PATCH V3] [Gingerbase 0/4] Issue #9 - Update selected packages.
by Paulo Ricardo Paz Vital 14 Mar '16

14 Mar '16

On Fri, Mar 11, 2016 at 06:55:02PM -0300, Aline Manera wrote: > > > On 03/11/2016 04:48 PM, Aline Manera wrote: > > > > > >On 03/10/2016 05:51 PM, Paulo Ricardo Paz Vital wrote: > >> > >>On 03/10/2016 04:23 PM, Daniel Henrique Barboza wrote: > >>>I've tested the patch in a real environment (my dev PC) and noticed > >>>the following behavior: > >>> > >>>- pick a single package to be updated. In this case I've chosen the > >>>'libv4l' package: > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "depends":[ > >>> "libv4l" > >>> ], > >>> "version":"1.10.0-2.fc23", > >>> "arch":"i686", > >>> "repository":"updates", > >>> "package_name":"libv4l" > >>>} > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l/upgrade' > >>> > >>>-X POST -d'{}' > >>>Enter host password for user 'root': > >>>{ > >>> "status":"running", > >>> "message":"", > >>> "id":"1", > >>>"target_uri":"/plugins/gingerbase/host/packagesupdate/libv4l/upgrade" > >>>}[danielhb@arthas gingerbase]$ > >>> > >>> > >>>- after the update process, the lookup was still returning package > >>>info, > >>>as if it > >>>was still available for updating: > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "depends":[ > >>> "libv4l" > >>> ], > >>> "version":"1.10.0-2.fc23", > >>> "arch":"i686", > >>> "repository":"updates", > >>> "package_name":"libv4l" > >>>} > >>> > >>>- after that I've listed all the packages to be updated, wondering if > >>>there was some > >>>sort of refresh problem after the single update: > >>> > >>>}[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: aplication/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/' -X GET > >>>(... long output) > >>> > >>> > >>>- and finally tried the lookup of the libv4l package again: > >>> > >>>][danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: aplication/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "reason":"GGBPKGUPD0002E: Package libv4l is not marked to be > >>>updated.", > >>> "code":"404 Not Found", > >>> "call_stack":"Traceback (most recent call last):\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/_cprequest.py\", line 670, > >>>in respond\n response.body = self.handler()\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/lib/encoding.py\", line > >>>217, > >>>in __call__\n self.body = self.oldhandler(*args, **kwargs)\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/_cpdispatch.py\", line 61, > >>>in __call__\n return self.callable(*self.args, **self.kwargs)\n > >>>File > >>>\"/home/danielhb/kimchi/wok_ginger/src/wok/control/base.py\", line 210, > >>>in index\n raise cherrypy.HTTPError(404, e.message)\nHTTPError: > >>>(404, > >>>u'GGBPKGUPD0002E: Package libv4l is not marked to be updated.')\n" > >>>}[ > >>> > >>> > >>>My conclusion is that, after the single package update, we need to do > >>>a list of the all the packages again to update/refresh some internal > >>>model > >>>info. > >>> > >>Yes, this happens because the lookup of one single package returns the > >>dictionary from the internal list, after the first overall lookup. > >> > >>>In my opinion the package list needs to be updated after every single > >>>update. > >>>Perhaps there is a way of simply removing the updated package(s) from > >>>this > >>>list instead of refreshing the whole list again, operation that is now > >>>even slower > >>>than before due to all the additional info being fetched. > >>> > >>Ok, I'll add something to remove from the internal list of packages the > >>package and its dependencies in the V4 > > > >My suggestion is to save the timestamp when a request to get_list() is > >made. > >And on lookup() verifies the timestamp does not exceed X seconds and if > >so, grab the information from yum again for the given resource. > > > > Instead of doing that, it would be better to do not cache the information on > get_list(). > get_list() should return only the list of packages names and lookup() grabs > the detailed information for each package. > > As you are calling a new command on lookup() for a given package with this > patch (to get the list of dependencies), I believe this command you are > using also returns the information cached on get_list() - repository, > version, etc. The way PackagesUpdate works is different from what you described here. PackagesUpdate.get_list() returns the same return of SoftwareUpdate.getUpdates() that is, basically, the cached dictionary (called SoftwareUpdate._packages) that contains all packages eligible to update and it's information (package_name, version, arch, repository and, now, list of dependencies). All these information are collected by the private method SoftwareUpdate._scanUpdates() that is executed at first time, when the first PackagesUpdate.get_list() is requested by user. PackageUpdate.lookup() returns the information of one package by calling SoftwareUpdate.getUpdate(<package_name>), that is nothing more that the information of that specific package cached in SoftwareUpdate._packages. > > Said that, I'd say to you change get_list() to only returns the packages > names. > And improve your command output on lookup() to grab the information before > cached on get_list(). > Ok, interesting idea, but doesn't this change how UI and user see the information - I mean, how API should works? If following your idea, when user access the Updates tab on UI, he/she will see only the list of packages. Today, it's provided the information of the bew version number of that package, the arch and repository that provides the package. > If you fail to parse the command output on lookup() that means the package > is not marked to be upgraded so raise an error. > > Something like below on lookup(): > > out = run_command(<command to get the dependencies>) > name = get_name_from_out() > if name is None: > # package is not marked to be upgraded > raise NotFound() > > deps = get_deps_from_out() > ... > > return info > > >>>Thanks, > >>> > >>> > >>>Daniel > >>> > >>> > >>>On 03/09/2016 04:01 PM, pvital(a)linux.vnet.ibm.com wrote: > >>>>From: Paulo Vital <pvital(a)linux.vnet.ibm.com> > >>>> > >>>>V2 - V3: > >>>> * Modified _get_dnf_info_requires() of DnfUpdate class to > >>>>prevent > >>>>the > >>>> addition of the package in the dependencies list, and how to > >>>>process the > >>>> name of the dependencies to be added. > >>>> > >>>>V2: > >>>> > >>>>This patch-set is the V2 of the feature to add backend support to > >>>>select one or > >>>>more packages to be updated by host package manager. > >>>> > >>>>All modifications for V2 were based on the feedback provided by the > >>>>mail thread > >>>>"[RFC] Gingerbase Issue#9: Update selected packages." > >>>> > >>>>To test, use: > >>>> > >>>># List all packages selected by host package manager, as eligible to > >>>>be updated > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate' -X GET > >>>>Enter host password for user 'test': > >>>>[ > >>>> { > >>>> "depends":[ > >>>> "libudisks2", > >>>> "udisks2" > >>>> ], > >>>> "version":"2.1.7-1.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"libudisks2" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "glusterfs-client-xlators", > >>>> "glusterfs", > >>>> "glusterfs-fuse", > >>>> "glusterfs-libs", > >>>> "glusterfs-api" > >>>> ], > >>>> "version":"3.7.8-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"glusterfs-client-xlators" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "parted" > >>>> ], > >>>> "version":"3.2-16.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"parted" > >>>> }, > >>>> > >>>> < result cut, due to a large number of packages > > >>>> > >>>> { > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"openssl" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "gnome-shell" > >>>> ], > >>>> "version":"3.18.4-1.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"gnome-shell" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"i686", > >>>> "repository":"updates", > >>>> "package_name":"openssl-libs" > >>>> }, > >>>> > >>>> < result cut, due to a large number of packages > > >>>> > >>>>] > >>>> > >>>># Print information about one selected package > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/openssl' > >>>>-X > >>>>GET > >>>>Enter host password for user 'test': > >>>>{ > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"openssl" > >>>>} > >>>> > >>>># Select only one package to be updated. All packages that were > >>>>listed as > >>>># eligible to be update and are dependencies of this package will > >>>>also be > >>>># updated automatically. > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/openssl/upgra…' > >>>> > >>>>\ > >>>>-X POST -d '{}' > >>>>Enter host password for user 'test': > >>>>{ > >>>> "status":"running", > >>>> "message":"", > >>>> "id":"1", > >>>>"target_uri":"/plugins/gingerbase/host/packagesupdate/openssl/upgrade" > >>>>} > >>>> > >>>> > >>>>Paulo Vital (4): > >>>> Issue #9 - Reorganize Package Update classes. > >>>> Issue #9 - List dependencies of packages to update > >>>> Issue #9 - Add support to update selected packages > >>>> Issue #9 - Test cases to update selected packages > >>>> > >>>> control/host.py | 36 ++-------- > >>>> control/packagesupdate.py | 53 ++++++++++++++ > >>>> docs/API.md | 18 +++-- > >>>> mockmodel.py | 39 ++++++++--- > >>>> model/host.py | 43 ------------ > >>>> model/packagesupdate.py | 116 +++++++++++++++++++++++++++++++ > >>>> swupdate.py | 172 > >>>>+++++++++++++++++++++++++++++++++++++++++----- > >>>> tests/test_host.py | 37 ++++++++-- > >>>> yumparser.py | 16 ++--- > >>>> 9 files changed, 404 insertions(+), 126 deletions(-) > >>>> create mode 100644 control/packagesupdate.py > >>>> create mode 100644 model/packagesupdate.py > >>>> > >>>>-- > >>>>2.5.0 > >>>> > > > > -- > You received this message because you are subscribed to the Google Groups "Ginger Development Mailing List" group. > To unsubscribe from this group and stop receiving emails from it, send an email to ginger-dev-list+unsubscribe(a)googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- Paulo Ricardo Paz Vital IBM Linux Technology Center http://www.ibm.com

1 1

[PATCH] [Kimchi] Removing disks.py because it was moved to gingerbase
by Jose Ricardo Ziviani 11 Mar '16

11 Mar '16

- I didn't find any place using this module so I'm removing the file to avoid any confusion. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- disks.py | 297 --------------------------------------------------------------- 1 file changed, 297 deletions(-) delete mode 100644 disks.py diff --git a/disks.py b/disks.py deleted file mode 100644 index 52a793c..0000000 --- a/disks.py +++ /dev/null @@ -1,297 +0,0 @@ -# -# Project Kimchi -# -# Copyright IBM Corp, 2015-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 os.path -import re -from parted import Device as PDevice -from parted import Disk as PDisk - -from wok.exception import OperationFailed -from wok.utils import run_command, wok_log - - -def _get_dev_node_path(maj_min): - """ Returns device node path given the device number 'major:min' """ - - dm_name = "/sys/dev/block/%s/dm/name" % maj_min - if os.path.exists(dm_name): - with open(dm_name) as dm_f: - content = dm_f.read().rstrip('\n') - return "/dev/mapper/" + content - - uevent = "/sys/dev/block/%s/uevent" % maj_min - with open(uevent) as ueventf: - content = ueventf.read() - - data = dict(re.findall(r'(\S+)=(".*?"|\S+)', content.replace("\n", " "))) - - return "/dev/%s" % data["DEVNAME"] - - -def _get_lsblk_devs(keys, devs=[]): - out, err, rc = run_command(["lsblk", "-Pbo"] + [','.join(keys)] + devs) - if rc != 0: - raise OperationFailed("KCHDISKS0001E", {'err': err}) - - return _parse_lsblk_output(out, keys) - - -def _get_dev_major_min(name): - maj_min = None - - keys = ["NAME", "MAJ:MIN"] - dev_list = _get_lsblk_devs(keys) - - for dev in dev_list: - if dev['name'].split()[0] == name: - maj_min = dev['maj:min'] - break - else: - raise OperationFailed("KCHDISKS0002E", {'device': name}) - - return maj_min - - -def _is_dev_leaf(devNodePath): - try: - # By default, lsblk prints a device information followed by children - # device information - childrenCount = len( - _get_lsblk_devs(["NAME"], [devNodePath])) - 1 - except OperationFailed as e: - # lsblk is known to fail on multipath devices - # Assume these devices contain children - wok_log.error( - "Error getting device info for %s: %s", devNodePath, e) - return False - - return childrenCount == 0 - - -def _is_dev_extended_partition(devType, devNodePath): - if devType != 'part': - return False - diskPath = devNodePath.rstrip('0123456789') - device = PDevice(diskPath) - try: - extended_part = PDisk(device).getExtendedPartition() - except NotImplementedError as e: - wok_log.warning( - "Error getting extended partition info for dev %s type %s: %s", - devNodePath, devType, e.message) - # Treate disk with unsupported partiton table as if it does not - # contain extended partitions. - return False - if extended_part and extended_part.path == devNodePath: - return True - return False - - -def _parse_lsblk_output(output, keys): - # output is on format key="value", - # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc - lines = output.rstrip("\n").split("\n") - r = [] - for line in lines: - d = {} - for key in keys: - expression = r"%s=\".*?\"" % key - match = re.search(expression, line) - field = match.group() - k, v = field.split('=', 1) - d[k.lower()] = v[1:-1] - r.append(d) - return r - - -def _get_vgname(devNodePath): - """ Return volume group name of a physical volume. If the device node path - is not a physical volume, return empty string. """ - out, err, rc = run_command(["pvs", "--unbuffered", "--nameprefixes", - "--noheadings", "-o", "vg_name", devNodePath]) - if rc != 0: - return "" - - return re.findall(r"LVM2_VG_NAME='([^\']*)'", out)[0] - - -def _is_available(name, devtype, fstype, mountpoint, majmin): - devNodePath = _get_dev_node_path(majmin) - # Only list unmounted and unformated and leaf and (partition or disk) - # leaf means a partition, a disk has no partition, or a disk not held - # by any multipath device. Physical volume belongs to no volume group - # is also listed. Extended partitions should not be listed. - if (devtype in ['part', 'disk', 'mpath'] and - fstype in ['', 'LVM2_member'] and - mountpoint == "" and - _get_vgname(devNodePath) == "" and - _is_dev_leaf(devNodePath) and - not _is_dev_extended_partition(devtype, devNodePath)): - return True - return False - - -def get_partitions_names(check=False): - names = set() - keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT", "MAJ:MIN"] - # output is on format key="value", - # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT - for dev in _get_lsblk_devs(keys): - # split()[0] to avoid the second part of the name, after the - # whiteline - name = dev['name'].split()[0] - if check and not _is_available(name, dev['type'], dev['fstype'], - dev['mountpoint'], dev['maj:min']): - continue - names.add(name) - - return list(names) - - -def get_partition_details(name): - majmin = _get_dev_major_min(name) - dev_path = _get_dev_node_path(majmin) - - keys = ["TYPE", "FSTYPE", "SIZE", "MOUNTPOINT"] - try: - dev = _get_lsblk_devs(keys, [dev_path])[0] - except OperationFailed as e: - wok_log.error( - "Error getting partition info for %s: %s", name, e) - return {} - - dev['available'] = _is_available(name, dev['type'], dev['fstype'], - dev['mountpoint'], majmin) - if dev['mountpoint']: - # Sometimes the mountpoint comes with [SWAP] or other - # info which is not an actual mount point. Filtering it - regexp = re.compile(r"\[.*\]") - if regexp.search(dev['mountpoint']) is not None: - dev['mountpoint'] = '' - dev['path'] = dev_path - dev['name'] = name - return dev - - -def vgs(): - """ - lists all volume groups in the system. All size units are in bytes. - - [{'vgname': 'vgtest', 'size': 999653638144L, 'free': 0}] - """ - cmd = ['vgs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'vg_name,vg_size,vg_free'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of VGs - vgs = map(lambda v: v.strip(), out.strip('\n').split('\n')) - - # create a dict based on data retrieved from vgs - return map(lambda l: {'vgname': l[0], - 'size': long(l[1]), - 'free': long(l[2])}, - [fields.split() for fields in vgs]) - - -def lvs(vgname=None): - """ - lists all logical volumes found in the system. It can be filtered by - the volume group. All size units are in bytes. - - [{'lvname': 'lva', 'path': '/dev/vgtest/lva', 'size': 12345L}, - {'lvname': 'lvb', 'path': '/dev/vgtest/lvb', 'size': 12345L}] - """ - cmd = ['lvs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'lv_name,lv_path,lv_size,vg_name'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of LVs filtered by vgname, if - # provided - lvs = filter(lambda f: vgname is None or vgname in f, - map(lambda v: v.strip(), out.strip('\n').split('\n'))) - - # create a dict based on data retrieved from lvs - return map(lambda l: {'lvname': l[0], - 'path': l[1], - 'size': long(l[2])}, - [fields.split() for fields in lvs]) - - -def pvs(vgname=None): - """ - lists all physical volumes in the system. It can be filtered by the - volume group. All size units are in bytes. - - [{'pvname': '/dev/sda3', - 'size': 469502001152L, - 'uuid': 'kkon5B-vnFI-eKHn-I5cG-Hj0C-uGx0-xqZrXI'}, - {'pvname': '/dev/sda2', - 'size': 21470642176L, - 'uuid': 'CyBzhK-cQFl-gWqr-fyWC-A50Y-LMxu-iHiJq4'}] - """ - cmd = ['pvs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'pv_name,pv_size,pv_uuid,vg_name'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of PVs filtered by vgname, if - # provided - pvs = filter(lambda f: vgname is None or vgname in f, - map(lambda v: v.strip(), out.strip('\n').split('\n'))) - - # create a dict based on data retrieved from pvs - return map(lambda l: {'pvname': l[0], - 'size': long(l[1]), - 'uuid': l[2]}, - [fields.split() for fields in pvs]) -- 1.9.1

3 2

[PATCH] [Kimchi 0/4] Fix issues on web serial console
by Jose Ricardo Ziviani 11 Mar '16

11 Mar '16

This patchset contains some issues found in the web serial console code as well as some small improvements. Jose Ricardo Ziviani (4): Move unix socket files from /tmp to /run/wok Improve log messages printed by the serial console Make serial console timeout configurable Check if guest is listening to serial before connecting to it config.py.in | 3 ++ i18n.py | 2 + model/vms.py | 26 ++++++++-- serialconsole.py | 115 ++++++++++++++++++++++++++++++--------------- ui/serial/html/serial.html | 4 -- 5 files changed, 105 insertions(+), 45 deletions(-) -- 1.9.1

4 16

Storage Volume and selected disks
by Samuel Henrique De Oliveira Guimaraes 09 Mar '16

09 Mar '16

Hi team, In the final design spec for Storage Management we have two view modes for disks like we have in Guests and Templates. It also features a filter input and sort button, as well a new drop-down button for Volume management but there isn't any UI feedback for Volume selection. In the other hand, the old mockups for this screen features a checkbox and a green outline when the user selects the volume in gallery view mode. Here are my proposals: Keep the checkbox in the list/table view and hide it with Gallery view; Green outline like the other style used when selecting a Template in the modal window for Gallery view; Disable Action dropdown-button when nothing is selected. Questions: What are the formats to convert the files to? Regarding volume management, where is the full spec for volume actions such as create, delete, clone, resize and wipe? Should we append these actions to the Activate/Deactivate and Undefine dropdown? Thanks, Samuel

3 2

[PATCH] [Kimchi] Fix issue #849: Get network name for bridged networks
by Aline Manera 08 Mar '16

08 Mar '16

After attaching a bridged network to a guest, if you close the dialog and open it again, the network field was displayed in blank. So fix it. This patch also fix the KeyError issue reported in #849 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- mockmodel.py | 3 +-- model/vmifaces.py | 28 ++++++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index a765770..cbeeb5d 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -34,7 +34,6 @@ from wok.xmlutils.utils import xml_item_update from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.model import cpuinfo -from wok.plugins.kimchi.model import vmifaces from wok.plugins.kimchi.model.groups import PAMGroupsModel from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.host import DevicesModel @@ -86,7 +85,7 @@ class MockModel(Model): self._mock_storagevolumes = MockStorageVolumes() cpuinfo.get_topo_capabilities = MockModel.get_topo_capabilities - vmifaces.getDHCPLeases = MockModel.getDHCPLeases + libvirt.virNetwork.DHCPLeases = MockModel.getDHCPLeases libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain libvirt.virDomain.attachDeviceFlags = MockModel.attachDeviceFlags diff --git a/model/vmifaces.py b/model/vmifaces.py index 72f717b..0ec89b6 100644 --- a/model/vmifaces.py +++ b/model/vmifaces.py @@ -29,14 +29,6 @@ from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel from wok.plugins.kimchi.xmlutils.interface import get_iface_xml -def getDHCPLeases(net, mac): - try: - leases = net.DHCPLeases(mac) - return leases - except libvirt.libvirtError: - return [] - - class VMIfacesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -134,10 +126,9 @@ class VMIfaceModel(object): info['type'] = iface.attrib['type'] info['mac'] = iface.mac.get('address') + info['network'] = iface.source.get('network') if iface.find("model") is not None: info['model'] = iface.model.get('type') - if info['type'] == 'network': - info['network'] = iface.source.get('network') if info['type'] == 'bridge': info['bridge'] = iface.source.get('bridge') info['ips'] = self._get_ips(vm, info['mac'], info['network']) @@ -159,14 +150,19 @@ class VMIfaceModel(object): # First check the ARP cache. with open('/proc/net/arp') as f: ips = [line.split()[0] for line in f.xreadlines() if mac in line] + # Some ifaces may be inactive, so if the ARP cache didn't have them, # and they happen to be assigned via DHCP, we can check there too. - net = conn.networkLookupByName(network) - leases = getDHCPLeases(net, mac) - for lease in leases: - ip = lease.get('ipaddr') - if ip not in ips: - ips.append(ip) + try: + # Some type of interfaces may not have a network associated with + net = conn.networkLookupByName(network) + leases = net.DHCPLeases(mac) + for lease in leases: + ip = lease.get('ipaddr') + if ip not in ips: + ips.append(ip) + except libvirt.libvirtError: + pass return ips -- 2.5.0

2 2

[PATCH] [Kimchi] Issue #859 - Fix error when adding new disk to VM.
by pvital＠linux.vnet.ibm.com 08 Mar '16

08 Mar '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Remove hard-coded reference to the storage pool when attaching a new disk to a guest. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 55bc3ac..3f416e7 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -322,7 +322,7 @@ kimchi.guest_storage_add_main = function() { } var createVol = function(settings, addVolSettings) { - kimchi.createVolumeWithCapacity('default', { + kimchi.createVolumeWithCapacity(settings['pool'], { name: settings['vol'], format: settings['format'], capacity: settings['capacity'] -- 2.5.0

4 3

[PATCH] [Kimchi] Customize user request log messages
by Lucio Correia 08 Mar '16

08 Mar '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/networks.py | 15 +++++++++++++++ control/storagepools.py | 16 ++++++++++++++++ control/storagevolumes.py | 17 +++++++++++++++++ control/templates.py | 15 +++++++++++++++ control/vm/hostdevs.py | 11 +++++++++++ control/vm/ifaces.py | 12 ++++++++++++ control/vm/snapshots.py | 14 ++++++++++++++ control/vm/storages.py | 12 ++++++++++++ control/vms.py | 24 ++++++++++++++++++++++++ 9 files changed, 136 insertions(+) diff --git a/control/networks.py b/control/networks.py index cd1feed..a8a26b2 100644 --- a/control/networks.py +++ b/control/networks.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +NETWORKS_REQUESTS = { + 'POST': {'default': "Create virtual network '%(name)s'"}, +} + +NETWORK_REQUESTS = { + 'DELETE': {'default': "Remove virtual network '%(ident)s'"}, + 'POST': { + 'activate': "Activate virtual network '%(ident)s'", + 'deactivate': "Deactivate virtual network '%(ident)s'", + }, +} + + @UrlSubNode('networks', True) class Networks(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Networks(Collection): self.role_key = 'network' self.admin_methods = ['POST'] self.resource = Network + self.log_map = NETWORKS_REQUESTS class Network(Resource): @@ -39,6 +53,7 @@ class Network(Resource): self.activate = self.generate_action_handler('activate') self.deactivate = self.generate_action_handler('deactivate', destructive=True) + self.log_map = NETWORK_REQUESTS @property def data(self): diff --git a/control/storagepools.py b/control/storagepools.py index 10b371d..2139566 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -29,6 +29,20 @@ from wok.plugins.kimchi.control.storagevolumes import StorageVolumes from wok.plugins.kimchi.model.storagepools import ISO_POOL_NAME +STORAGEPOOLS_REQUESTS = { + 'POST': {'default': "Create storage pool '%(name)s'"}, +} + +STORAGEPOOL_REQUESTS = { + 'DELETE': {'default': "Remove storage pool '%(ident)s'"}, + 'PUT': {'default': "Update storage pool"}, + 'POST': { + 'activate': "Activate storage pool '%(ident)s'", + 'deactivate': "Deactivate storage pool '%(ident)s'", + }, +} + + @UrlSubNode('storagepools', True) class StoragePools(Collection): def __init__(self, model): @@ -38,6 +52,7 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + self.log_map = STORAGEPOOLS_REQUESTS def create(self, params, *args): try: @@ -84,6 +99,7 @@ class StoragePool(Resource): self.deactivate = self.generate_action_handler('deactivate', destructive=True) self.storagevolumes = StorageVolumes(self.model, ident) + self.log_map = STORAGEPOOL_REQUESTS @property def data(self): diff --git a/control/storagevolumes.py b/control/storagevolumes.py index d78eefb..01654cb 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -22,6 +22,21 @@ from wok.control.base import AsyncCollection, Collection, Resource from wok.control.utils import get_class_name, model_fn +STORAGEVOLUMES_REQUESTS = { + 'POST': {'default': "Create storage volume '%(name)s'"}, +} + +STORAGEVOLUME_REQUESTS = { + 'DELETE': {'default': "Remove template '%(ident)s'"}, + 'PUT': {'default': "Update storage volume"}, + 'POST': { + 'wipe': "Wipe storage volume '%(ident)s'", + 'resize': "Resize storage volume '%(ident)s'", + 'clone': "Clone storage volume '%(ident)s'", + }, +} + + class StorageVolumes(AsyncCollection): def __init__(self, model, pool): super(StorageVolumes, self).__init__(model) @@ -29,6 +44,7 @@ class StorageVolumes(AsyncCollection): self.pool = pool self.resource_args = [self.pool, ] self.model_args = [self.pool, ] + self.log_map = STORAGEVOLUMES_REQUESTS def filter_data(self, resources, fields_filter): # filter directory from storage volumes @@ -48,6 +64,7 @@ class StorageVolume(Resource): self.resize = self.generate_action_handler('resize', ['size']) self.wipe = self.generate_action_handler('wipe') self.clone = self.generate_action_handler_task('clone') + self.log_map = STORAGEVOLUME_REQUESTS @property def data(self): diff --git a/control/templates.py b/control/templates.py index aebac0c..486dca1 100644 --- a/control/templates.py +++ b/control/templates.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +TEMPLATES_REQUESTS = { + 'POST': {'default': "Create template '%(name)s'"}, +} + +TEMPLATE_REQUESTS = { + 'DELETE': {'default': "Remove template '%(ident)s'"}, + 'PUT': {'default': "Update template"}, + 'POST': { + 'clone': "Clone template '%(ident)s'", + }, +} + + @UrlSubNode('templates', True) class Templates(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Templates(Collection): self.role_key = 'templates' self.admin_methods = ['GET', 'POST'] self.resource = Template + self.log_map = TEMPLATES_REQUESTS class Template(Resource): @@ -37,6 +51,7 @@ class Template(Resource): self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') + self.log_map = TEMPLATE_REQUESTS @property def data(self): diff --git a/control/vm/hostdevs.py b/control/vm/hostdevs.py index bae98df..11e59c2 100644 --- a/control/vm/hostdevs.py +++ b/control/vm/hostdevs.py @@ -21,6 +21,15 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMHOSTDEVS_REQUESTS = { + 'POST': {'default': "Attach host device '%(name)s' to guest"}, +} + +VMHOSTDEV_REQUESTS = { + 'DELETE': {'default': "Detach host device '%(ident)s' from guest"}, +} + + @UrlSubNode("hostdevs") class VMHostDevs(Collection): def __init__(self, model, vmid): @@ -29,6 +38,7 @@ class VMHostDevs(Collection): self.vmid = vmid self.resource_args = [self.vmid, ] self.model_args = [self.vmid, ] + self.log_map = VMHOSTDEVS_REQUESTS class VMHostDev(Resource): @@ -37,6 +47,7 @@ class VMHostDev(Resource): self.vmid = vmid self.ident = ident self.model_args = [self.vmid, self.ident] + self.log_map = VMHOSTDEV_REQUESTS @property def data(self): diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index d856956..f7c4e36 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -21,6 +21,16 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMIFACES_REQUESTS = { + 'POST': {'default': "Attach network interface '%(network)s' to guest"}, +} + +VMIFACE_REQUESTS = { + 'DELETE': {'default': "Detach network interface '%(ident)s' from guest"}, + 'PUT': {'default': "Update guest network interface"}, +} + + @UrlSubNode("ifaces") class VMIfaces(Collection): def __init__(self, model, vm): @@ -29,6 +39,7 @@ class VMIfaces(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMIFACES_REQUESTS class VMIface(Resource): @@ -39,6 +50,7 @@ class VMIface(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/ifaces/%s' + self.log_map = VMIFACE_REQUESTS @property def data(self): diff --git a/control/vm/snapshots.py b/control/vm/snapshots.py index b95eaa9..5a6013c 100644 --- a/control/vm/snapshots.py +++ b/control/vm/snapshots.py @@ -21,6 +21,18 @@ from wok.control.base import AsyncCollection, Resource from wok.control.utils import UrlSubNode +VMSNAPSHOTS_REQUESTS = { + 'POST': {'default': "Create guest snapshot '%(name)s'"}, +} + +VMSNAPSHOT_REQUESTS = { + 'DELETE': {'default': "Remove guest snapshot '%(ident)s'"}, + 'POST': { + 'revert': "Revert to guest snapshot '%(ident)s'", + }, +} + + @UrlSubNode('snapshots') class VMSnapshots(AsyncCollection): def __init__(self, model, vm): @@ -30,6 +42,7 @@ class VMSnapshots(AsyncCollection): self.resource_args = [self.vm, ] self.model_args = [self.vm, ] self.current = CurrentVMSnapshot(model, vm) + self.log_map = VMSNAPSHOTS_REQUESTS class VMSnapshot(Resource): @@ -40,6 +53,7 @@ class VMSnapshot(Resource): self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/snapshots/%s' self.revert = self.generate_action_handler('revert') + self.log_map = VMSNAPSHOT_REQUESTS @property def data(self): diff --git a/control/vm/storages.py b/control/vm/storages.py index 3c7d1a3..5e7b8c4 100644 --- a/control/vm/storages.py +++ b/control/vm/storages.py @@ -21,6 +21,16 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMSTORAGES_REQUESTS = { + 'POST': {'default': "Attach '%(type)s' storage '%(path)s' to guest"}, +} + +VMSTORAGE_REQUESTS = { + 'DELETE': {'default': "Remove storage '%(ident)s' from guest"}, + 'PUT': {'default': "Update guest storage path to '%(path)s'"}, +} + + @UrlSubNode("storages") class VMStorages(Collection): def __init__(self, model, vm): @@ -29,6 +39,7 @@ class VMStorages(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMSTORAGES_REQUESTS class VMStorage(Resource): @@ -39,6 +50,7 @@ class VMStorage(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/storages/%s' + self.log_map = VMSTORAGE_REQUESTS @property def data(self): diff --git a/control/vms.py b/control/vms.py index 7745a18..1297955 100644 --- a/control/vms.py +++ b/control/vms.py @@ -23,6 +23,28 @@ from wok.control.utils import internal_redirect, UrlSubNode from wok.plugins.kimchi.control.vm import sub_nodes +VMS_REQUESTS = { + 'POST': {'default': "Create guest from template '%(template)s'"}, +} + +VM_REQUESTS = { + 'DELETE': {'default': "Remove guest '%(ident)s'"}, + 'PUT': {'default': "Update guest"}, + 'POST': { + 'start': "Start guest '%(ident)s'", + 'poweroff': "Power off guest '%(ident)s'", + 'shutdown': "Shutdown guest '%(ident)s'", + 'reset': "Restart guest '%(ident)s'", + 'connect': "Connect to guest '%(ident)s' through novnc/spice", + 'clone': "Clone guest '%(ident)s'", + 'migrate': "Migrate guest '%(ident)s'", + 'suspend': "Suspend guest '%(ident)s'", + 'resume': "Resume guest '%(ident)s'", + 'serial': "Connect to guest '%(ident)s' through serial", + }, +} + + @UrlSubNode('vms', True) class VMs(AsyncCollection): def __init__(self, model): @@ -30,6 +52,7 @@ class VMs(AsyncCollection): self.resource = VM self.role_key = 'guests' self.admin_methods = ['POST'] + self.log_map = VMS_REQUESTS class VM(Resource): @@ -56,6 +79,7 @@ class VM(Resource): self.suspend = self.generate_action_handler('suspend') self.resume = self.generate_action_handler('resume') self.serial = self.generate_action_handler('serial') + self.log_map = VM_REQUESTS @property def data(self): -- 1.9.1

2 1

[PATCH v3][Kimchi] Increase guest Max Memory limits
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

This patch changes the limits of max memory to 16TiB in PowerPC and 4TiB in x86 architectures. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 12 ++++++++---- tests/test_template.py | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..707b74b 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..92705b6 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,10 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB for PPC and 4TiB for X (according to Red Hat), in KiB +MAX_MEM_LIM = 4294967296 # 4 TiB +if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + MAX_MEM_LIM *= 4 # 16TiB class TemplatesModel(object): @@ -225,9 +227,11 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TiB (PPC) or 4TiB (x86) and the Host + # memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): - raise InvalidParameter("KCHVM0079E") + raise InvalidParameter("KCHVM0079E", + {'value': str(MAX_MEM_LIM / (1024**3))}) if (current > host_memory) or (maxmem > host_memory): raise InvalidParameter("KCHVM0078E", {'memHost': host_memory}) diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..fcb2e46 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -29,6 +29,7 @@ from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.mockmodel import MockModel from wok.plugins.kimchi.model.featuretests import FeatureTests +from wok.plugins.kimchi.model.templates import MAX_MEM_LIM model = None @@ -227,8 +228,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 + req = json.dumps({'memory': {'maxmemory': MAX_MEM_LIM + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

3 2

[PATCH v2][Kimchi] Increase guest Max Memory limits
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

This patch changes the limits of max memory to 16TiB in PowerPC and 4TiB in x86 architectures. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 12 ++++++++---- tests/test_template.py | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..707b74b 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..ef725f5 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,10 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB for PPC and 4TiB for X (according to Red Hat), in KiB +MAX_MEM_LIM = 4294967296 # 4 TiB +if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + MAX_MEM_LIM = 4 * 4294967296 # 16TiB class TemplatesModel(object): @@ -225,9 +227,11 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TiB (PPC) or 4TiB (x86) and the Host + # memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): - raise InvalidParameter("KCHVM0079E") + raise InvalidParameter("KCHVM0079E", + {'value': str(MAX_MEM_LIM / (1024**3))}) if (current > host_memory) or (maxmem > host_memory): raise InvalidParameter("KCHVM0078E", {'memHost': host_memory}) diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..fcb2e46 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -29,6 +29,7 @@ from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.mockmodel import MockModel from wok.plugins.kimchi.model.featuretests import FeatureTests +from wok.plugins.kimchi.model.templates import MAX_MEM_LIM model = None @@ -227,8 +228,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 + req = json.dumps({'memory': {'maxmemory': MAX_MEM_LIM + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

2 2

[PATCH][Kimchi] Increase guest Max Memory limit to 16TiB
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 6 +++--- tests/test_template.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..dc374c3 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 16TiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..39e8982 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,8 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB, in KiB +MAX_MEM_LIM = 17179869184 class TemplatesModel(object): @@ -225,7 +225,7 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TB and the Host memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): raise InvalidParameter("KCHVM0079E") if (current > host_memory) or (maxmem > host_memory): diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..912afe3 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -227,8 +227,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than 16TiB limit + req = json.dumps({'memory': {'maxmemory': (16 * 1073741824) + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

1 1

[PATCH] [Kimchi] Bug fix: Remove storage volume file while removing the storage volume
by Aline Manera 07 Mar '16

07 Mar '16

When removing a storage volume, it was only removed from a libvirt perspective, ie, the storage volume file kept in the system. It may confuse user as he/she will not be able to create a new storage volume with the same name from the storage volume removed before as the file exists in the system. To avoid it, remove the file from the system after removing it from a libvirt perspective. This issue was identified due a failure in the test suite. 2 files related to storage volume tests were kept on the system causing errors when running the test suite multiple times. To verify this patch, please, make sure to do not have any leftovers in the 'default' storage pool directory (/var/lib/libvirt/images). After that, run the test suite mutliple times and you will see no leftovers will be in the system when the test completes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/storagevolumes.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/storagevolumes.py b/model/storagevolumes.py index d010bcd..f87738f 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -367,12 +367,19 @@ class StorageVolumeModel(object): raise InvalidParameter("KCHVOL0012E", {'type': pool_info['type']}) volume = StorageVolumeModel.get_storagevolume(pool, name, self.conn) + vol_path = volume.path() try: volume.delete(0) except libvirt.libvirtError as e: raise OperationFailed("KCHVOL0010E", {'name': name, 'err': e.get_error_message()}) + try: + os.remove(vol_path) + except OSError, e: + wok_log.error("Unable to delete storage volume file: %s." + "Details: %s" % (pool_info['path'], e.message)) + def resize(self, pool, name, size): volume = StorageVolumeModel.get_storagevolume(pool, name, self.conn) -- 2.5.0

4 10