January 2014 - Kimchi-devel - oVirt List Archives

[WIP 0/4] Authorization utililty modules
by Shu Ming 17 Feb '14

17 Feb '14

The following patches provide modules to manage groups for the users Also pam modules are provided to check if a user is in one specific group Shu Ming (4): A module to manage the groups of the users A module to do pam account managment An example to demo how pam_members.so is used Configuration files for pam services src/kimchi/pam_members.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/pamauth_acc.py | 51 +++++++++++++++++++++++ src/kimchi/rolegroups.py | 36 ++++++++++++++++ src/kimchi/superadmin | 5 +++ src/kimchi/vmadmin | 5 +++ src/kimchi/vmuser | 5 +++ 6 files changed, 205 insertions(+) create mode 100644 src/kimchi/pam_members.c create mode 100644 src/kimchi/pamauth_acc.py create mode 100644 src/kimchi/rolegroups.py create mode 100644 src/kimchi/superadmin create mode 100644 src/kimchi/vmadmin create mode 100644 src/kimchi/vmuser -- 1.8.1.4

3 9

Fwd: [project-kimchi] NFS img permission problem
by Royce Lv 12 Feb '14

12 Feb '14

Guys, When testing with kimchi nfs feature, I filed two issues related to nfs image permission problem: 1. volume creation failure: Because of storage pool permission is not configured to make write permission.(https://github.com/kimchi-project/kimchi/issues/261) 2. vm with volume cannot be started: Root users are mapped to nobody, so img it created cannot be accessed by libvirt-qemu(on ubuntu) user.(https://github.com/kimchi-project/kimchi/issues/267) After discussed with Mark Wu, we would like to propose the following to resolve these two problem: 1. To allow creation: export with all_squash(gid = kimchi_guid) and group allow write permission. Also with planned nfs-pool prevalidation (a timeout try mount in a process), we can check if the gid and permission is right. This will save us from future trouble. 2. To allow qemu process(started by libvirt) to access img, we add uid ('qemu' under fedora and 'libvirt-qemu' under ubuntu) which running qemu process to 'kimchi' group to allow the write access of the img. I am also investigating other possibilities like using storage pool permissions and so on. Welcome thoughts on it! -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 2

[RFC]: for template cloning.
by Sheldon 10 Feb '14

10 Feb '14

template cloning: <https://github.com/kimchi-project/kimchi/wiki/template-cloning-and-customiz…> |1|||clone a template| from|||template| The user may clone a template from an existing template with different name. Later he can customize some parts of the template to save the effort to create a full new template. For example, he can update the network of the template cloned to have a new different template. 2.||we should also also user||||clone a template| from vm| |I just concern the image volume. For vm may has no CDROM attribute. Then does the template need to copy the image volume. |For VM clone, can we make the the vm image as a backing file(or we can call it base image). Then we can create two new images for this vm and new vm. All these two new images are a read/write snapshot of the original image, -- any changes to new images will not be reflected in original image. http://libvirt.org/formatstorage.html#StorageVolBacking http://wiki.qemu.org/Documentation/CreateSnapshot | -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 5

[PATCH] Bug fix #309 - network: Unable to create vlan tagged on Ubuntu v2
by Ramon Medeiros 10 Feb '14

10 Feb '14

Changes: v1: Put the rollback function above the raise, unless, the line will never run. Ramon Medeiros (1): Bug fix #309 - network: Unable to create vlan tagged on Ubuntu src/kimchi/model.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) -- 1.8.3.1

3 4

Discussion: 312 - LVM VG is left when removing logical storage pool
by Ramon Medeiros 10 Feb '14

10 Feb '14

Well, you can also test using virsh. Libvirt is not removing the vg and the pv when you delete a logical storage pool. The question is: is it better to fix libvirt, submiting a patch for they, or just remove the vg and pv on kimchi? -- Ramon Nunes Medeiros Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 3

Kimchi at Wikipedia
by Ramon Medeiros 10 Feb '14

10 Feb '14

Hi Guys, i did a scratch page for Kimchi at Wikipedia. Also linked this with KVM page. Can you please review this. https://en.wikipedia.org/wiki/KIMCHI https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine -- Ramon Nunes Medeiros Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 6

[RFC] Host's repositories support
by Paulo Ricardo Paz Vital 05 Feb '14

05 Feb '14

Hello guys. This is the RFC for the Host's repositories support (task "Register YUM, apt, zypper repos" of 1.2 sprint 3). The support will be provided by adding in the control/host.py a new collection (Repositories), responsible to manage all repositories of the system, and a new resource (Repository), responsible to operate with a specific repository. All this management/operations will be transparent to host's package management system, being provided by one of the new back end classes. The back end support provides 4 new classes: 1) Repositories (object): Class to represent and operate with repositories information in Kimchi's perspective. It's transparent to host's package management system, and can execute all operations necessary: add repository, get all repositories list, get information about one repository, update a repository, enable and disable a repository and remove a repository. This class will load in run time the necessary classes to work with the host's package management: YumRepo for YUM systems based, AptRepo for APT systems based and ZypperRepo for Zypper systems based; 2) YumRepo (object): Class to represent and operate with YUM repositories. Loaded only on those systems that supports YUM (e.g. Fedora and RHEL), it's responsible to connect, collect and provide information of YUM repositories in the system. Also it's responsible to create/delete the files in disk to maintain the repositories in system after disconnection. 3) AptRepo (object): Class to represent and operate with APT repositories. Loaded only on those systems that supports APT (e.g. Debian and Ubuntu), it's responsible to connect, collect and provide information of APT repositories in the system. Also it's responsible to create/delete the files in disk to maintain the repositories in system after disconnection. 4) ZypperRepo (object): Class to represent and operate with Zypper repositories. Loaded only on those systems that supports Zypper (e.g. OpenSuse), it's responsible to connect, collect and provide information of Zypper repositories in the system. Also it's responsible to create/delete the files in disk to maintain the repositories in system after disconnection. Bellow I present the REST API for the repositories support. ### Collection: Host Repositories **URI:** /host/repositories **Methods:** * **GET**: Retrieve a summarized list of all repositories available * **POST**: Add a new repository * repo_id : Unique repository name for each repository, one word. * repo_name: Human-readable string describing the repository. * baseurl: URL to the repodata directory when "is_mirror" is false. Otherwise, it can be URL to the mirror system for YUM. Can be an http://, ftp:// or file:// URL. * is_mirror *(optional)*: Set the given URI of baseurl as a mirror list, instead of use baseurl in repository configuration. * url_args *(optional)*: Arguments to be passed to baseurl, like the list of APT repositories provided by the same baseurl. * enabled *(optional)*: Indicates if repository should be included as a package source: * false: Do not include the repository. * true: Include the repository. * gpgcheck *(optional)*: Indicates if a GPG signature check on the packages gotten from repository should be performed: * false: Do not check GPG signature * true: Check GPG signature * gpgkey *(optional)*: URL pointing to the ASCII-armored GPG key file for the repository. This option is used if yum needs a public key to verify a package and the required key hasn't been imported into the RPM database. ### Resource: Repository **URI:** /host/repositories/*:repo-id* **Methods:** * **GET**: Retrieve the full description of a Repository * repo_id : Unique repository name for each repository, one word. * repo_type: Indicates which type of repository is: * yum: Indicates it is a YUM repository. * deb: Indicates it is a APT repository. * zyp: Indicates it is a Zypper repository. * repo_name: Human-readable string describing the repository. * baseurl: URL to the repodata directory when "is_mirror" is false. Otherwise, it can be URL to the mirror system for YUM. Can be an http://, ftp:// or file:// URL. * url_args *(optional)*: Arguments to be passed to baseurl, like the list of APT repositories provided by the same baseurl. * enabled *(optional)*: Indicates if repository should be included as a package source: * false: Do not include the repository. * true: Include the repository. * gpgcheck *(optional)*: Indicates if a GPG signature check on the packages gotten from repository should be performed: * false: Do not check GPG signature * true: Check GPG signature * gpgkey *(optional)*: URL pointing to the ASCII-armored GPG key file for the repository. This option is used if yum needs a public key to verify a package and the required key hasn't been imported into the RPM database. * **DELETE**: Remove the Repository * **POST**: *See Repository Actions* * **PUT**: update the parameters of existing Repository * repo_id *(otional)*: Unique repository name for each repository, one word. * repo_name *(otional)*: Human-readable string describing the repository. * baseurl *(optional)*: URL to the repodata directory when "is_mirror" is false. Otherwise, it can be URL to the mirror system for YUM. Can be an http://, ftp:// or file:// URL. * is_mirror *(optional)*: Set the given URI of baseurl as a mirror list, instead of use baseurl in repository configuration. * url_args *(optional)*: Arguments to be passed to baseurl, like the list of APT repositories provided by the same baseurl. * enabled *(optional)*: Indicates if repository should be included as a package source: * false: Do not include the repository. * true: Include the repository. * gpgcheck *(optional)*: Indicates if a GPG signature check on the packages gotten from repository should be performed: * false: Do not check GPG signature * true: Check GPG signature * gpgkey *(optional)*: URL pointing to the ASCII-armored GPG key file for the repository. This option is used if yum needs a public key to verify a package and the required key hasn't been imported into the RPM database. **Actions (POST):** * enable: Enable the Repository as package source * disable: Disable the Repository as package source

3 4

[PATCH 0/3 RFC] Refactor exception
by Aline Manera 04 Feb '14

04 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, This is the RFC for the refactor exception task. Sheldon has already done something related to that some time ago. He also created a wiki for that: - https://github.com/kimchi-project/kimchi/wiki/refactor-exception The only change I made in him approach is translating the message in backend and send it to UI That way we don't need to duplicate the messages on backend and UI (as it is explained on wiki) The steps to get it done: 1) Change cherrypy error handler to send the exception data to UI 2) Create a common Exception class (KimchiError) to translate the error message and proper set the parameters 3) Update UI to show the message received from backend to the user I also would like to create a file on backend: __messages__.py which will contain all messages used on backend. For example: # __messages__.py VM_START_FAILED = "<code>: Failed to start virtual machine %(name)s" The contants names should be: <resource>_<action>_<error> The <code> need to be a unique value between all messages. It is needed in order to we identify the error independent of the message language. That way a user running Kimchi in German can easily post his error on mail list or github, and we can identify where the problem is by the message code. I also will add this code in the UI messages. For the code, we can build it like: <resource><BACK|UI><type-of-error><ident> And on backend: VMBACKINFO01 VMBACKERRO01 VMBACKWARN01 And on UI: VMUIINFO01 VMUIERRO01 VMUIWARN01 So we will also need: 4) Create a __messages__ file with all messages used on backend 5) Update build process to add the messages in this file to .po files 6) Update UI messages to add a code for them I made a small patch set with my proposal. This patch set does not include the items 4,5 and 6 In fact, I used an existent message for test (as you can notice on patches) And *just for example* it will *always* raise an exception while starting a VM. Any comments/suggestions are welcome. =) Aline Manera (2): refactor exception: Create a common Exception to translate error messages refator exception: Example of use ShaoHe Feng (1): refactor exception: Add a kimchi special error handler src/kimchi/control/base.py | 5 ++++- src/kimchi/exception.py | 29 ++++++++++++++++++++++------- src/kimchi/model/vms.py | 4 +++- src/kimchi/template.py | 14 ++++++++++++++ ui/js/src/kimchi.guest_main.js | 4 ++-- 5 files changed, 45 insertions(+), 11 deletions(-) -- 1.7.10.4

3 7

[PATCH V3] Avoid useless libvirt error log produced by featuretest
by Aline Manera 04 Feb '14

04 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> I am sending the next version for the apporc patch as he may be out for the Chinese holidays. v2 -> v3: 1. Any error on feature tests will be log into kimchi error log file For that, silent cherrypy screen log to avoid displyaing the message on screen. v1 -> -v2: 1. Just hide the portocol type error, leave other error messages as it is. (Thanks Cristian) 2. Unregister the error handler when necessary. (Thanks Cristian) 3. Keep back kimchi log "*** Running feature tests ***", etc. (Thanks Cristian) 4. Move libvirt error handler function inside of Featuretest. (Thanks Aline) v1: Avoid useless libvirt error log produced by featuretest apporc (1): Avoid useless libvirt error log produced by featuretests src/kimchi/featuretests.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) -- 1.7.10.4

4 5

RFC: "Add disk to existing logical storage pool"
by Daniel H Barboza 04 Feb '14

04 Feb '14

Hello! I am almost delivering a first version of this feature but now I am having doubts in how it might work or not. My implementation would use vgextend and add a disk to an existing LVM pool. The question is that, in this process, all existing data in the added partition will be deleted. Is this ok? We can warn the user about it, of course. But I am not sure if this is the intended design. I've spoken with Aline a while ago and she agreed that the implementation would function similar to what we have today when creating a new LVM pool. We simply "do not care" about the potential data loss when adding the disk to an existing pool. Any thoughts? thanks!

3 5

[PATCH V2 0/7] (WIP) Storagepool SCSI/FC
by Rodrigo Trujillo 03 Feb '14

03 Feb '14

There is still some work to be done in this functionality. V2: - Implements Fibre Channel devices discover in the host - Allow vms_create receive a volume to create the disk (if pool is SCSI) - Create basic UI to select SCSI Host when creating SCSI FC pool - Draft of UI to select LUN to create new VM when template has a SCSI pool configured. (Need help of UI guys here!) Rodrigo Trujillo (7): Storagepool SCSI/FC: SCSI/Fibre Channel backend implementation Storagepool SCSI/FC: Function to check libvirt version Storagepool SCSI/FC: Assign SCSI fibre channel LUN as disk to a new guest Storagepool SCSI/FC: Implement node devices API backend Storagepool SCSI/FC: Implement UI when a FC scsi_host will be the pool Storagepool SCSI/FC: Create new VM with given SCSI FC LUN (backend) Storagepool SCSI/FC: Draft UI to allow user to select a LUN to new VM docs/API.md | 7 ++ src/kimchi/API.json | 19 ++++- src/kimchi/control/devices.py | 40 +++++++++++ src/kimchi/control/host.py | 3 + src/kimchi/model.py | 117 +++++++++++++++++++++++++++++-- src/kimchi/utils.py | 18 ++++- src/kimchi/vmtemplate.py | 48 ++++++++++++- ui/js/src/kimchi.api.js | 24 +++++++ ui/js/src/kimchi.guest_add_main.js | 32 +++++++++ ui/js/src/kimchi.storagepool_add_main.js | 40 ++++++++++- ui/pages/i18n.html.tmpl | 1 + ui/pages/storagepool-add.html.tmpl | 12 ++++ 12 files changed, 350 insertions(+), 11 deletions(-) create mode 100644 src/kimchi/control/devices.py -- 1.8.4.2

4 34

Re: [Kimchi-devel] RFC: "Add disk to existing logical storage> pool"
by Frank Novak 31 Jan '14

31 Jan '14

> Date: Fri, 31 Jan 2014 11:42:47 -0200 > From: Daniel H Barboza <danielhb(a)linux.vnet.ibm.com> > To: kimchi-devel(a)ovirt.org > Subject: [Kimchi-devel] RFC: "Add disk to existing logical storage > pool" > Message-ID: <52EBA857.2020302(a)linux.vnet.ibm.com> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > Hello! > > I am almost delivering a first version of this feature but now I am > having doubts in how it might work or not. > > My implementation would use vgextend and add a disk to an existing LVM > pool. The question is that, in this process, all existing data in the > added partition will be deleted. Is this ok? We can warn the user about > it, of course. But I am not sure if this is the intended design. > > I've spoken with Aline a while ago and she agreed that the > implementation would function similar to what we have today when > creating a new LVM pool. We simply "do not care" about the potential > data loss when adding the disk to an existing pool. > > Any thoughts? > Certainly if we are going to trash data, we do need to warn the user and make sure they want to proceed... I don't think that is necessarily bad, should be expected for knowledgable admin... Not sure there's an easy answer for add w/o loosing data (well certainly backup/restore after) Primary use case driving this was really the case of adding a new physical disk to system and then add this to the storage pool.. I guess someone could want to take an in use disk from some other system, or elsewhere on the same system, and want ot add that to the pool, thinking that they could still use what was already on there... At this point, I think we stick to KISS... maybe we include the warning/caveat in the Help page for this as well... > > thanks! > > > > ------------------------------ > Cheers, Frank ----------------------------------------------------------------------------------------------------------------------- Frank Novak ( 诺帆 nuò、fān ) STSM, SCEM Open Hypervisor IBM Linux Technology Center US: fnovak(a)us.ibm.com ; Notes: Frank Novak/Watson/IBM @IBMUS cell : 919-671-7966 -------------------------------------------------------------------------------------------------------------------------

1 0

[PATCH 0/4] Host's software update support
by Paulo Vital 30 Jan '14

30 Jan '14

This patch set provides support to host's software update operations. At this point, an agnostic class is providing support to backend and REST API operations. In addition, YUM (for RHEL and Fedora), APT (for Debian and Ubuntu) and ZYPPER (for OpenSuse) specific classes are provided to support the operation os each software update system. There's no test case to check backend once the software update information is volatile to each system/box. To test the REST API, execute the following commands (all them are agnostic of the host's distro): 1) Get list of all packages to be updated in the host: $curl -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/softwareupdate/ -X GET 2) Update the host system: $ curl -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/softwareupdate/update -X POST -d '' Paulo Vital (4): Host's software update: Update API.md Host's software update: Update REST API Host's software update: Update backend. Host's software update: Update Makefile docs/API.md | 20 ++++ src/kimchi/Makefile.am | 1 + src/kimchi/control/host.py | 12 ++ src/kimchi/mockmodel.py | 12 ++ src/kimchi/model.py | 8 ++ src/kimchi/swupdate.py | 279 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 332 insertions(+) create mode 100644 src/kimchi/swupdate.py -- 1.8.3.1

5 20

[PATCH V2]Avoid useless libvirt error log produced by featuretest
by apporc 30 Jan '14

30 Jan '14

v2-v1: 1. Just hide the portocol type error, leave other error messages as it is.(Thanks Cristian) 2. Unregister the error handler when necessary.(Thanks Cristian) 3. Keep back kimchi log "*** Running feature tests ***", etc.(Thanks Cristian) 4. Move libvirt error handler function inside of Featuretest.(Thanks Aline) v1: Avoid useless libvirt error log produced by featuretest apporc (1): Avoid useless libvirt error log produced by featuretests src/kimchi/featuretests.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 1.7.9.5

5 8

[PATCH V2 1/2] Plugins: Fix plugins framework in kimchi
by Rodrigo Trujillo 30 Jan '14

30 Jan '14

If the plugin tab name string is not found in kimchi i18n file, the tab name is set as 'unknown'. This patch also add more messages to kimchis log, and fixes a problem with the plugins extra tabs file location Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 13 ++++++++++--- ui/js/src/kimchi.main.js | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index b820263..4fcb0df 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -28,6 +28,7 @@ import logging.handlers import os import sslcert + from kimchi import auth from kimchi import config from kimchi import model @@ -208,14 +209,19 @@ class Server(object): script_name = plugin_config['kimchi']['uri'] del plugin_config['kimchi'] + tabs_extra_file = config.get_plugin_tab_xml(plugin_name) plugin_config['/ui/config/tab-ext.xml'] = { 'tools.staticfile.on': True, - 'tools.staticfile.filename': - config.get_plugin_tab_xml(plugin_name), + 'tools.staticfile.filename': tabs_extra_file, 'tools.nocache.on': True} except KeyError: continue - + except IOError as e: + msg = "Failed to load plugin tabs file %s" %tabs_extra_file + cherrypy.log.error_log.error(msg) + cherrypy.log.error_log.error('Ignoring plugin "%s"', + plugin_name) + continue try: plugin_app = import_class(plugin_class)() except ImportError: @@ -223,6 +229,7 @@ class Server(object): plugin_class) continue cherrypy.tree.mount(plugin_app, script_name, plugin_config) + cherrypy.log('Plugin loaded: %s' %plugin_class) def _init_ssl(self, options): ssl_server = cherrypy._cpserver.Server() diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index cc8afee..8b84a34 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -211,7 +211,7 @@ kimchi.getTabHtml = function(url) { $(xmlData).find('tab').each(function() { var $tab = $(this); var titleKey = $tab.find('title').text(); - var title = i18n[titleKey]; + var title = i18n[titleKey] || titleKey; var path = $tab.find('path').text(); tabsHtml += "<li><a class='item' href=" + path + ">" + title + "</a></li>"; }); -- 1.8.4.2

3 10

Sprint 3 deadlines
by Aline Manera 30 Jan '14

30 Jan '14

Hi all, As we agreed in last scrum meeting <http://kimchi-project.github.io/kimchi/meetings/kimchi.scrum.2014-01-29-13.…> (Jan 29th), from now on all the sprints will have deadlines. Which means the RFC or first patch series needs to be send to mail list at the begging of the sprint. Following are the dates I recommend everyone to follow for sprint 3. *02/03 09:00 (**UTC-03:00*) - RFC or first patch series By this date all tasks planned in the sprint needs to have RFC or patch on mail list. *02/10 **09:00 (**UTC-03:00*) - Next patch version Address comments made on RFC and moving to final patch series version. It only applies to the tasks planned for the sprint. All other patches are welcome any time - bug fixes, improvements, etc. Regards, Aline Manera

1 0

[PATCH v2 1/2] Break the 'sample' plugin's monolithic model into several smaller ones
by Mark Wu 30 Jan '14

30 Jan '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In kimchi the model is always a monolithic class. This is not good from the point of modulization, and it is not necessary to put everything into one big model. Unfortunately the problem will not get solved unless we conduct enormous refactor against the whole controller-model architecture. This patch tries to mitigate the problem by firstly splitting the model class into some smaller ones, than automatically mapping all sub-model instance methods to a RootModel instance. As a demonstration, this patch splits the 'sample' plugin's model. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- plugins/__init__.py | 23 ++++++++++ plugins/sample/model.py | 109 ++++++++++++++++++++++++++++++------------------ src/kimchi/model.py | 26 ++++++++++++ 3 files changed, 117 insertions(+), 41 deletions(-) diff --git a/plugins/__init__.py b/plugins/__init__.py index e69de29..4103a65 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -0,0 +1,23 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# Authors: +# Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> +# +# 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 + + diff --git a/plugins/sample/model.py b/plugins/sample/model.py index 9a2f22f..e606176 100644 --- a/plugins/sample/model.py +++ b/plugins/sample/model.py @@ -21,79 +21,106 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from kimchi.exception import InvalidOperation, NotFoundError +from kimchi.model import RootModel -class Model(object): +class CirclesModel(object): + def __init__(self): + self._circles = {} + + def create(self, params): + name = params['name'] + if name in self._circles: + raise InvalidOperation("Circle %s already exists" % name) + self._circles[name] = Circle(params['radius']) + return name + def get_list(self): + return sorted(self._circles) + + +class CircleModel(object): + def __init__(self, parent_model): + # Circel and Circles models are friends, it's OK to share _circles. + self._circles = parent_model._circles + + def lookup(self, name): + try: + circle = self._circles[name] + except KeyError: + raise NotFoundError("Circle %s not found" % name) + return {'radius': circle.radius} + + def update(self, name, params): + if name not in self._circles: + raise NotFoundError("Circle %s not found" % name) + self._circles[name].radius = params['radius'] + return name + + def delete(self, name): + try: + del self._circles[name] + except KeyError: + pass + + +class RectanglesModel(object): def __init__(self): - self.rectangles = {} - self.circles = {} + self._rectangles = {} - def rectangles_create(self, params): + def create(self, params): name = params['name'] - if name in self.rectangles: + if name in self._rectangles: raise InvalidOperation("Rectangle %s already exists" % name) - self.rectangles[name] = Rectangle(params['length'], params['width']) + self._rectangles[name] = Rectangle(params['length'], params['width']) return name - def rectangles_get_list(self): - return sorted(self.rectangles) + def get_list(self): + return sorted(self._rectangles) + - def rectangle_lookup(self, name): +class RectangleModel(object): + def __init__(self, parent_model): + self._rectangles = parent_model._rectangles + + def lookup(self, name): try: - rectangle = self.rectangles[name] + rectangle = self._rectangles[name] except KeyError: raise NotFoundError("Rectangle %s not found" % name) return {'length': rectangle.length, 'width': rectangle.width} - def rectangle_update(self, name, params): - if name not in self.rectangles: + def update(self, name, params): + if name not in self._rectangles: raise NotFoundError("Rectangle %s not found" % name) try: - self.rectangles[name].length = params['length'] + self._rectangles[name].length = params['length'] except KeyError: pass try: - self.rectangles[name].width = params['width'] + self._rectangles[name].width = params['width'] except KeyError: pass return name - def rectangle_delete(self, name): + def delete(self, name): try: - del self.rectangles[name] + del self._rectangles[name] except KeyError: pass - def circles_create(self, params): - name = params['name'] - if name in self.circles: - raise InvalidOperation("Circle %s already exists" % name) - self.circles[name] = Circle(params['radius']) - return name - def circles_get_list(self): - return sorted(self.circles) - - def circle_lookup(self, name): - try: - circle = self.circles[name] - except KeyError: - raise NotFoundError("Circle %s not found" % name) - return {'radius': circle.radius} +class Model(RootModel): + def __init__(self): + circles = CirclesModel() + circle = CircleModel(circles) - def circle_update(self, name, params): - if name not in self.circles: - raise NotFoundError("Circle %s not found" % name) - self.circles[name].radius = params['radius'] - return name + rectangles = RectanglesModel() + rectangle = RectangleModel(rectangles) - def circle_delete(self, name): - try: - del self.circles[name] - except KeyError: - pass + return super(Model, self).__init__( + [circle, circles, rectangle, rectangles]) class Rectangle(object): diff --git a/src/kimchi/model.py b/src/kimchi/model.py index ea528c6..47f2d22 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1853,3 +1853,29 @@ class LibvirtConnection(object): # However the values need to be considered wisely to not affect # hosts which are hosting a lot of virtual machines return conn + + +class RootModel(object): + ''' + This model squashes all sub-model's public callable methods to itself. + + Model methods are not limited to get_list, create, lookup, update, delete. + Controller can call generate_action_handler to generate new actions, which + call the related model methods. So all public callable methods of a + sub-model should be mapped to this model. + ''' + def __init__(self, model_instances): + for model_instance in model_instances: + cls_name = model_instance.__class__.__name__ + if cls_name.endswith('Model'): + method_prefix = cls_name[:-len('Model')].lower() + else: + method_prefix = cls_name.lower() + + callables = [m for m in dir(model_instance) + if not m.startswith('_') and + callable(getattr(model_instance, m))] + + for member_name in callables: + m = getattr(model_instance, member_name, None) + setattr(self, '%s_%s' % (method_prefix, member_name), m) -- 1.8.4.2

3 5

[PATCH 00/23 V2] Refactor model
by Aline Manera 30 Jan '14

30 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Rebase - Create ConfigModel to acommodate new changes on control - Update Makefile and spec files Hi all, This patch set splitted model.py into several model implementations. One for each resource in kimchi. It also includes a mechanism implemented by Zhou Zheng Sheng to automatically load all the models in one. So we don't nee to change tests and controller to work with new models. It is just the first step. I also will send a patch to split mockmodel And finally, a new one to separate common code and specific code from models. I am sending it separately because all that require a lot of work (and tests) and also can conflict with new features. I am planning to merge it on next Wed (when sprint 2 ends) so I hope those changes will not impact so much any developer. PS. it seems to to be a huge patch set but I just move code from one place to another. There is no new implementation/feature in there. Aline Manera (23): refactor model: Separate libvirtconnection from model.py refactor model: Move StoragePooldef from model to libvirtstoragepools.py refactor model: Create a common model builder Create a model to join all model resources implementation refactor model: Create a separated model for task resource refactor model: Create a separated model for plugins resource refactor model: Create a separated model for debug report resource refactor model: Create a separated model for config resource refactor model: Create a separated model for network resource refactor model: Create a separated model for interface resource refactor model: Create a separated model for storage pool resource refactor model: Create a separated model for storage volume resource refactor model: Create a separated model for storage server resource refactor model: Create a separated model for storage target resource refactor model: Create a separated model for template resource refactor model: Create a separated model for vm resource refactor model: Create a separated model for vm interface resource refactor model: Create a separated model for host resource Update server to use the new model Update tests to use the new model Update mockmodel imports Delete former model.py and rename model_ to model refactor model: Update makefile and specs files Makefile.am | 1 + configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + src/kimchi/Makefile.am | 3 +- src/kimchi/basemodel.py | 55 + src/kimchi/control/config.py | 6 +- src/kimchi/control/storagepools.py | 2 +- src/kimchi/control/utils.py | 12 +- src/kimchi/mockmodel.py | 27 +- src/kimchi/model.py | 2029 -------------------------------- src/kimchi/model/Makefile.am | 28 + src/kimchi/model/__init__.py | 21 + src/kimchi/model/config.py | 98 ++ src/kimchi/model/debugreports.py | 167 +++ src/kimchi/model/host.py | 201 ++++ src/kimchi/model/interfaces.py | 46 + src/kimchi/model/libvirtconnection.py | 122 ++ src/kimchi/model/libvirtstoragepool.py | 257 ++++ src/kimchi/model/model.py | 125 ++ src/kimchi/model/networks.py | 265 +++++ src/kimchi/model/plugins.py | 31 + src/kimchi/model/storagepools.py | 246 ++++ src/kimchi/model/storageservers.py | 78 ++ src/kimchi/model/storagetargets.py | 86 ++ src/kimchi/model/storagevolumes.py | 176 +++ src/kimchi/model/tasks.py | 39 + src/kimchi/model/templates.py | 172 +++ src/kimchi/model/utils.py | 33 + src/kimchi/model/vmifaces.py | 135 +++ src/kimchi/model/vms.py | 447 +++++++ src/kimchi/server.py | 2 +- src/kimchi/utils.py | 46 +- tests/test_model.py | 91 +- tests/test_storagepool.py | 4 +- tests/utils.py | 4 +- 36 files changed, 2943 insertions(+), 2115 deletions(-) create mode 100644 src/kimchi/basemodel.py delete mode 100644 src/kimchi/model.py create mode 100644 src/kimchi/model/Makefile.am create mode 100644 src/kimchi/model/__init__.py create mode 100644 src/kimchi/model/config.py create mode 100644 src/kimchi/model/debugreports.py create mode 100644 src/kimchi/model/host.py create mode 100644 src/kimchi/model/interfaces.py create mode 100644 src/kimchi/model/libvirtconnection.py create mode 100644 src/kimchi/model/libvirtstoragepool.py create mode 100644 src/kimchi/model/model.py create mode 100644 src/kimchi/model/networks.py create mode 100644 src/kimchi/model/plugins.py create mode 100644 src/kimchi/model/storagepools.py create mode 100644 src/kimchi/model/storageservers.py create mode 100644 src/kimchi/model/storagetargets.py create mode 100644 src/kimchi/model/storagevolumes.py create mode 100644 src/kimchi/model/tasks.py create mode 100644 src/kimchi/model/templates.py create mode 100644 src/kimchi/model/utils.py create mode 100644 src/kimchi/model/vmifaces.py create mode 100644 src/kimchi/model/vms.py -- 1.7.10.4

2 25

[PATCH v5 0/3] Reorganize kimchi's path vars generation code
by Mark Wu 30 Jan '14

30 Jan '14

This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler. Changes: v5: Fix the test break on ubuntu because of system paths varies on different distros (per Aline) v4: Fix the test break when installed to non system dirs. (per Shaohe) v3: Rebase Only access the paths instance when the request is for html, which can avoid forcibly installing paths to the plugin which just have json requests. v2: Rebase Remove the optimization for plugin paths since it just have a few instantiations. Mark Wu (3): Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Allow plugin use kimchi's ui handler .gitignore | 1 + src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 155 +++++++++++++++++++----------------------------- src/kimchi/root.py | 23 ++++--- src/kimchi/server.py | 14 +++-- src/kimchi/template.py | 17 ++++-- src/kimchi/utils.py | 6 +- src/kimchid.in | 7 ++- tests/Makefile.am | 9 ++- tests/test_config.py.in | 85 ++++++++++++++++++++++++++ 10 files changed, 196 insertions(+), 125 deletions(-) create mode 100644 tests/test_config.py.in -- 1.8.4.2

2 5

[PATCH V8] add a method to fix search permissions
by shaohef＠linux.vnet.ibm.com 30 Jan '14

30 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V6 -> V7 do not fix path search permission for others. also fix read permission for file. ShaoHe Feng (1): add a method to fix search permissions src/kimchi/utils.py | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) -- 1.8.4.2

2 2

[PATCH] Move resource config's info fetching to model level
by Mark Wu 30 Jan '14

30 Jan '14

We should not put the resource specefic information in controller level. Controller is just used to dispatch request and act a glue of view and model. We can dynamcially generate the controller code in future. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/control/config.py | 8 +------- src/kimchi/mockmodel.py | 7 +++++++ src/kimchi/model.py | 7 +++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/kimchi/control/config.py b/src/kimchi/control/config.py index 16cc384..4750410 100644 --- a/src/kimchi/control/config.py +++ b/src/kimchi/control/config.py @@ -22,10 +22,6 @@ # 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 cherrypy - - -from kimchi.config import config from kimchi.control.base import Collection, Resource from kimchi.control.utils import UrlSubNode @@ -39,9 +35,7 @@ class Config(Resource): @property def data(self): - display_proxy_port = config.get('display', 'display_proxy_port') - return {'http_port': cherrypy.server.socket_port, - 'display_proxy_port': display_proxy_port} + return self.info class Capabilities(Resource): diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 0fe69dd..bcc2ae0 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -45,6 +45,7 @@ import kimchi.model from kimchi import config from kimchi import network as knetwork from kimchi.asynctask import AsyncTask +from kimchi.config import config as kconfig from kimchi.distroloader import DistroLoader from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import MissingParameter, NotFoundError, OperationFailed @@ -658,6 +659,12 @@ class MockModel(object): % name) return disks.get_partition_details(name) + def config_lookup(self, name): + return {'http_port': cherrypy.server.socket_port, + 'display_proxy_port': + kconfig.get('display', 'display_proxy_port')} + + class MockVMTemplate(VMTemplate): def __init__(self, args, mockmodel_inst=None): VMTemplate.__init__(self, args) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 1f98bfa..7a9ebca 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -67,6 +67,7 @@ from kimchi import vnc from kimchi import xmlutils from kimchi.asynctask import AsyncTask from kimchi.distroloader import DistroLoader +from kimchi.config import config as kconfig from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError from kimchi.exception import MissingParameter, NotFoundError, OperationFailed, TimeoutExpired from kimchi.featuretests import FeatureTests @@ -1583,6 +1584,12 @@ class Model(object): kimchi_log.info('Host is going to reboot.') os.system('reboot') + def config_lookup(self, name): + return {'http_port': cherrypy.server.socket_port, + 'display_proxy_port': + kconfig.get('display', 'display_proxy_port')} + + class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): -- 1.8.4.2

3 2

[PATCH v5 0/2] Change all CSS files indentation to 4 spaces
by Crístian Viana 30 Jan '14

30 Jan '14

This is the difference between this and the previous patchset (v4): - Rebased to a6a4999. Crístian Viana (2): CSS: Do not allow lines longer than 79 characters CSS: Change all CSS files indentation to 4 spaces ui/css/theme-default/button.css | 167 ++++++++++++++++++++---------- ui/css/theme-default/error.css | 15 ++- ui/css/theme-default/grid.css | 36 ++++--- ui/css/theme-default/host.css | 6 +- ui/css/theme-default/jquery-ui.custom.css | 27 +++-- ui/css/theme-default/line-chart.css | 6 +- ui/css/theme-default/list.css | 15 ++- ui/css/theme-default/nav-tree.css | 12 ++- ui/css/theme-default/network.css | 12 ++- ui/css/theme-default/popover.css | 39 ++++--- ui/css/theme-default/report-add.css | 3 +- ui/css/theme-default/reset.css | 8 +- ui/css/theme-default/storage.css | 18 ++-- ui/css/theme-default/template-edit.css | 9 +- ui/css/theme-default/template_add.css | 20 ++-- ui/css/theme-default/template_list.css | 24 +++-- ui/css/theme-default/toolbar.css | 6 +- ui/css/theme-default/topbar.css | 29 ++++-- ui/css/theme-default/window.css | 3 +- 19 files changed, 296 insertions(+), 159 deletions(-) -- 1.8.5.3

2 4

[PATCH v2] HTML: Make the form element's labels clickable
by Crístian Viana 30 Jan '14

30 Jan '14

This is the difference between this and the previous patchset (v1): - Attach the checkbox that enables VLAN on the bridged network dialog to the appropriate label ("Enable VLAN"). Crístian Viana (1): HTML: Make the form element's labels clickable ui/pages/storagepool-add.html.tmpl | 6 +++--- ui/pages/tabs/network.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.8.5.3

2 3

[PATCH] Update README to direct users to the oVirt mailing list
by Adam King 29 Jan '14

29 Jan '14

Update README to direct users to the oVirt mailing list rather than the old google group. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- docs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index a1f02ee..9c7c188 100644 --- a/docs/README.md +++ b/docs/README.md @@ -136,9 +136,9 @@ environment. Participating ------------- -All patches are sent through our mailing list hosted at Google Groups. More +All patches are sent through our mailing list hosted by oVirt. More information can be found at: -https://groups.google.com/forum/#!forum/project-kimchi +https://github.com/kimchi-project/kimchi/wiki/Communications -Patches should be sent using git-send-email. +Patches should be sent using git-send-email to kimchi-devel(a)ovirt.org. -- 1.8.1.4

3 3

[PATCH] Use Autoconf macros AC_PROG_MKDIR_P and MKDIR_P
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> configure complains AM_PROG_MKDIR_P and MKDIR_P are obsolete. configure.ac:44: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged. configure.ac:44: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead, configure.ac:44: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files. Automake manual says: >From Automake 1.8 to 1.9.6 AM_PROG_MKDIR_P used to define the output variable mkdir_p to one of mkdir -p, install-sh -d, or mkinstalldirs Nowadays Autoconf provides a similar functionality with AC_PROG_MKDIR_P. Automake manual advises to switch ASAP to the more modern Autoconf-provided interface instead; both the macro and the variable might be removed in a future major Automake release. AC_PROG_MKDIR_P will set output variable MKDIR_P. And kimchi already contains install-sh under build-aux. REF: http://www.gnu.org/software/automake/manual/automake.html#Obsolete-Macros http://www.gnu.org/software/autoconf/manual/autoconf.html#index-AC_005fPROG… Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- m4/po.m4 | 2 +- po/Makefile.in.in | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/m4/po.m4 b/m4/po.m4 index 47f36a4..8bc921d 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by autoconf AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that diff --git a/po/Makefile.in.in b/po/Makefile.in.in index c2e9c1b..f7c1611 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -32,17 +32,14 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -# We use $(mkdir_p). -# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as -# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# @install_sh@ does not start with $(SHELL), so we add it. -# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined -# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake -# versions, $(mkinstalldirs) and $(install_sh) are unused. +# We use $(MKDIR_P). +# This macro uses the 'mkdir -p' command if possible. Otherwise, it falls ba +# on invoking install-sh with the -d option, so your package should contain +# install-sh as described under AC_PROG_INSTALL. mkinstalldirs = $(SHELL) @install_sh@ -d install_sh = $(SHELL) @install_sh@ MKDIR_P = @MKDIR_P@ -mkdir_p = @mkdir_p@ +MKDIR_P = @MKDIR_P@ GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ @@ -168,7 +165,7 @@ install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -186,7 +183,7 @@ install-data-yes: all cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ + $(MKDIR_P) $(DESTDIR)$$dir; \ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ @@ -226,7 +223,7 @@ installdirs: installdirs-exec installdirs-data installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi @@ -237,7 +234,7 @@ installdirs-data-yes: cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ + $(MKDIR_P) $(DESTDIR)$$dir; \ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -- 1.8.4.2

2 2

[PATCH] Storage pool support unicode correctly
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> >From unicode, we have handle the incoming text from kimchi server and outgoing text to kimchi server correctly. But we do not handle the incoming text from libvirt and outgoing text to libvirt correctly. For some variables of storage pool, such as pool name and pool xml do not follow our principle. https://github.com/kimchi-project/kimchi/wiki/support-unicode This patch will improve the follow: 1. Handle storage pool xml and pool name as unicode in kimchi, and decode them when pass them to libvirt. 2. Decode the pool name from libvirt. We should guarantee: All text strings, everywhere should be of type unicode, not str. If we're handling text, and our variable is a str, it's a bug! Test this patch: 1. create a pool $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/storagepools/ -X POST -d ' { "name":"kīмсhī-pool", "type":"dir", "path":"/tmp/test" } ' 2. get this pool $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/storagepols/kīмсhī-pool 3. delete this pool $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/storagepols/kīмсhī-pool \ -X DELETE Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 81c1507..55de570 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1170,7 +1170,7 @@ class Model(object): task_id = self._do_deep_scan(params) poolDef = StoragePoolDef.create(params) poolDef.prepare(conn) - xml = poolDef.xml + xml = poolDef.xml.encode("utf-8") except KeyError, key: raise MissingParameter(key) @@ -1297,14 +1297,14 @@ class Model(object): conn = self.conn.get() names = conn.listStoragePools() names += conn.listDefinedStoragePools() - return sorted(names) + return sorted(map(lambda x: x.decode('utf-8'), names)) except libvirt.libvirtError as e: raise OperationFailed(e.get_error_message()) def _get_storagepool(self, name): conn = self.conn.get() try: - return conn.storagePoolLookupByName(name) + return conn.storagePoolLookupByName(name.encode("utf-8")) except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_NO_STORAGE_POOL: raise NotFoundError("Storage Pool '%s' not found" % name) @@ -1594,7 +1594,7 @@ class LibvirtVMTemplate(VMTemplate): pool_name = pool_name_from_uri(pool_uri) try: conn = self.conn.get() - pool = conn.storagePoolLookupByName(pool_name) + pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) except libvirt.libvirtError: raise InvalidParameter('Storage specified by template does not exist') if not pool.isActive(): @@ -1719,7 +1719,7 @@ class DirPoolDef(StoragePoolDef): # name: # type: # path: - xml = """ + xml = u""" <pool type='dir'> <name>{name}</name> <target> @@ -1775,7 +1775,7 @@ class NetfsPoolDef(StoragePoolDef): # source[path]: poolArgs = copy.deepcopy(self.poolArgs) poolArgs['path'] = self.path - xml = """ + xml = u""" <pool type='netfs'> <name>{name}</name> <source> @@ -1811,7 +1811,7 @@ class LogicalPoolDef(StoragePoolDef): poolArgs['source']['devices'] = ''.join(devices) poolArgs['path'] = self.path - xml = """ + xml = u""" <pool type='logical'> <name>{name}</name> <source> @@ -1845,7 +1845,7 @@ class IscsiPoolDef(StoragePoolDef): virSecret = conn.secretLookupByUsage( libvirt.VIR_SECRET_USAGE_TYPE_ISCSI, self.poolArgs['name']) except libvirt.libvirtError: - xml = ''' + xml = u''' <secret ephemeral='no' private='yes'> <description>Secret for iSCSI storage pool {name}</description> <auth type='chap' username='{username}'/> @@ -1871,7 +1871,7 @@ class IscsiPoolDef(StoragePoolDef): except KeyError: return "" - return ''' + return u''' <auth type='chap' username='{username}'> <secret type='iscsi' usage='{name}'/> </auth>'''.format(name=poolArgs['name'], username=auth['username']) @@ -1891,7 +1891,7 @@ class IscsiPoolDef(StoragePoolDef): 'auth': self._format_auth(poolArgs)}) poolArgs['path'] = '/dev/disk/by-id' - xml = """ + xml = u""" <pool type='iscsi'> <name>{name}</name> <source> -- 1.8.4.2

2 2

[PATCH] get vms list by listAllDomains
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> we can get all domains by listAllDomains Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 671af02..4b7df7e 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -646,10 +646,7 @@ class Model(object): def vms_get_list(self): conn = self.conn.get() - ids = conn.listDomainsID() - names = map(lambda x: conn.lookupByID(x).name(), ids) - names += conn.listDefinedDomains() - names = map(lambda x: x.decode('utf-8'), names) + names = [dom.name().decode('utf-8') for dom in conn.listAllDomains(0)] return sorted(names, key=unicode.lower) def vmscreenshot_lookup(self, name): -- 1.8.4.2

5 8

[PATCH V2] GET /plugins failed, fix it
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 get(self, *args) -> get(self, filter_params) ShaoHe Feng (1): GET /plugins failed, fix it src/kimchi/control/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.4.2

2 3

[PATCH] bug fix: remove decode for resouce ident when use cherrypy's default dispatcher
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Now there are two kinds of sub-collection/resource dispatchers. 1. Use cherrypy's default dispatcher Cherrypy will decode the ident automatically But now in kimchi we decode the ident manually. This is a bug. Kimchi can not list the resources with unicode name. For examle: create a pool with kīмсhī-pool name list this pool $ curl -u shhfeng -H 'Accept: application/json' \ -H 'Content-type: application/json' \ http://localhost:8000/storagepools/kīмсhī-pool kimchi will throw an UnicodeEncodeError. This patch fixes this bug. 2. customized dispatcher by overriding the cherrypy dispatcher We need to decode the ident explicitly. Now kimchi handles it correctly. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/control/storagepools.py | 2 +- src/kimchi/control/vms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index 3b8ef79..881c61e 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -85,7 +85,7 @@ class StoragePool(Resource): self.uri_fmt = "/storagepools/%s" self.activate = self.generate_action_handler('activate') self.deactivate = self.generate_action_handler('deactivate') - self.storagevolumes = StorageVolumes(self.model, ident.decode("utf-8")) + self.storagevolumes = StorageVolumes(self.model, ident) @property def data(self): diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 06c7be3..60fc8ff 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -41,7 +41,7 @@ class VM(Resource): self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): - setattr(self, ident, node(model, self.ident.decode("utf-8"))) + setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') self.stop = self.generate_action_handler('stop') self.connect = self.generate_action_handler('connect') -- 1.8.4.2

3 4

[PATCH] Make guests template handling more robust like host template handling
by Adam King 29 Jan '14

29 Jan '14

Change guest tab loading from an ajax request to an inline element processed by Cheetah at guests.html.tmpl load time. This will eliminate the potential for error when fetching the guest template, as well as improve the performance of the flow. Also updated kimchi-ui.html to eliminate potential race condition as I integrated the new guests load into the main flow. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 20 ++------------------ ui/pages/kimchi-ui.html.tmpl | 28 +++++++++++++--------------- ui/pages/tabs/guests.html.tmpl | 18 ++++++++++-------- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 9c45cf5..8467f3f 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -228,27 +228,11 @@ kimchi.guest_main = function() { $("#vm-add").on("click", function(event) { kimchi.window.open('guest-add.html'); }); - - $.ajax({ - headers : { - Accept : "text/html" - }, - url : 'guest.html', - type : 'GET', - dataType : 'html', - accepts : 'text/html', - success : function(response) { - kimchi.guestTemplate = response; - kimchi.listVmsAuto() - }, - error : function() { - console.error('Could not get guest.html'); - }, - }); - + kimchi.guestTemplate = $('#guest-tmpl').html(); $('#guests-root-container').on('remove', function() { kimchi.vmTimeout && clearTimeout(kimchi.vmTimeout); }); + kimchi.listVmsAuto() }; kimchi.editTemplate = function(guestTemplate, oldPopStat) { diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 8e234e2..eebe886 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -32,9 +32,14 @@ <title>Kimchi</title> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <link rel="shortcut icon" href="images/logo.ico"> -<link rel="stylesheet" href="$href("libs/themes/base/jquery-ui.min.css")"> -<link rel="stylesheet" href="$href("css/theme-default.min.css")"> -<script src="$href("libs/modernizr.custom.76777.js")"></script> +<link rel="stylesheet" href="$href('libs/themes/base/jquery-ui.min.css')"> +<link rel="stylesheet" href="$href('css/theme-default.min.css')"> + +<script src="$href('libs/modernizr.custom.76777.js')"></script> +<script src="$href('libs/jquery-1.10.0.min.js')"></script> +<script src="$href('libs/jquery-ui.min.js')"></script> +<script src="$href('libs/jquery-ui-i18n.min.js')"></script> +<script src="$href('js/kimchi.min.js')"></script>  <style type="text/css"> @@ -62,7 +67,7 @@ } </style> </head> -<body> +<body onload="kimchi.main()"> <div class="container"> <header class="topbar"> <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> @@ -89,19 +94,12 @@ </div> </div> </div> -<script src="$href("libs/jquery-1.10.0.min.js")"></script> -<script src="$href("libs/jquery-ui.min.js")"></script> -<script src="$href("libs/jquery-ui-i18n.min.js")"></script> -<script src="$href("js/kimchi.min.js")"></script> <div id="buildme"> -<div>Oops! It looks like I am running from a source tree and you forgot to build! -Please run the following command and reload this page: -<p><code>python setup.py build</code></p> -</div> + <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 kimchi directory and reload this page:</p> + <p><code>make</code></p> + </div> </div> -<script> -kimchi.main(); -</script> </body> </html> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index d73eb39..e2ab173 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -22,13 +22,14 @@ #unicode UTF-8 #import gettext +#from Cheetah.Template import Template #from kimchi.cachebust import href #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) #silent _ = t.gettext #silent _t = t.gettext -<!DOCTYPE html> -<html> -<body> + +#silent ht = Template + <div id="guests-root-container"> <div class="toolbar"> <div class="tools"> @@ -50,9 +51,10 @@ <div id="noGuests" class="list-no-result" style="display: none;"> $_("No guests found.") </div> + <script id="guest-tmpl" type="kimchi/template"> + $ht(file="ui/pages/guest.html.tmpl",searchList=[self,{'lang':$lang}]) + </script> + <script type="text/javascript"> + kimchi.guest_main(); + </script> </div> -<script> - kimchi.guest_main(); -</script> -</body> -</html> -- 1.8.1.4

3 2

[PATCH] bug fix: Expose /storageservers
by Aline Manera 29 Jan '14

29 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> Now to expose a new uri for kimchi server we need to use the UrlSubNode decorator, otherwise the uri will not be available. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/control/storageservers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/control/storageservers.py b/src/kimchi/control/storageservers.py index 5cbb5a1..9e7f4ac 100644 --- a/src/kimchi/control/storageservers.py +++ b/src/kimchi/control/storageservers.py @@ -20,11 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from kimchi.control.base import Collection, Resource -from kimchi.control.utils import get_class_name, model_fn import kimchi.template +from kimchi.control.base import Collection, Resource +from kimchi.control.utils import get_class_name, model_fn, UrlSubNode +@UrlSubNode("storageservers", True) class StorageServers(Collection): def __init__(self, model): super(StorageServers, self).__init__(model) -- 1.7.10.4

2 2

[PATCH] Remove the unnecessary 'exposed'
by Mark Wu 29 Jan '14

29 Jan '14

'exposed' is only need to be set when a leaf hander is exposed, so this patch removes the usages on resources. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/control/config.py | 2 -- src/kimchi/control/host.py | 2 -- src/kimchi/control/storagepools.py | 1 - 3 files changed, 5 deletions(-) diff --git a/src/kimchi/control/config.py b/src/kimchi/control/config.py index cc41e8a..c28e6e3 100644 --- a/src/kimchi/control/config.py +++ b/src/kimchi/control/config.py @@ -35,9 +35,7 @@ class Config(Resource): def __init__(self, model, id=None): super(Config, self).__init__(model, id) self.capabilities = Capabilities(self.model) - self.capabilities.exposed = True self.distros = Distros(model) - self.distros.exposed = True @property def data(self): diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index f041b35..053c822 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -35,9 +35,7 @@ class Host(Resource): self.reboot = self.generate_action_handler('reboot') self.shutdown = self.generate_action_handler('shutdown') self.stats = HostStats(self.model) - self.stats.exposed = True self.partitions = Partitions(self.model) - self.partitions.exposed = True @property def data(self): diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index 3b8ef79..01078ba 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -40,7 +40,6 @@ class StoragePools(Collection): super(StoragePools, self).__init__(model) self.resource = StoragePool isos = IsoPool(model) - isos.exposed = True setattr(self, ISO_POOL_NAME, isos) def create(self, *args): -- 1.8.4.2

3 2

[PATCH] Bug fix #309 - network: Unable to create vlan tagged on Ubuntu
by Ramon Medeiros 29 Jan '14

29 Jan '14

Python binding for libvirt does not support conn.changeBegin() and conn.commit(). To make the change safe, this procedure was changed to a internal framework: RollbackContext. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 81c1507..a2f5634 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -951,16 +951,17 @@ class Model(object): br_xml = networkxml.create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) conn = self.conn.get() - conn.changeBegin() - try: - vlan_tagged_br = conn.interfaceDefineXML(br_xml) - vlan_tagged_br.create() - except libvirt.libvirtError as e: - conn.changeRollback() - raise OperationFailed(e.message) - else: - conn.changeCommit() - return br_name + + with RollbackContext() as rollback: + + try: + vlan_tagged_br = conn.interfaceDefineXML(br_xml) + vlan_tagged_br.create() + except libvirt.libvirtError as e: + raise OperationFailed(e.message) + rollback.prependDefer(vlan_tagged_br.destroy) + else: + return br_name def _remove_vlan_tagged_bridge(self, network): try: -- 1.8.3.1

3 3

[PATCH] Use resource's lookup interface to fetch capabilities
by Mark Wu 29 Jan '14

29 Jan '14

Capabilities is kind of resource, so we can use its lookup interface to fetch information from model. It can reduce the special code, which is helpful for further refactoring. This patch removes the dict initialization in controller level intentionally, because the model should return full information of capabilities always. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/control/config.py | 6 +----- src/kimchi/mockmodel.py | 2 +- src/kimchi/model.py | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/kimchi/control/config.py b/src/kimchi/control/config.py index c28e6e3..16cc384 100644 --- a/src/kimchi/control/config.py +++ b/src/kimchi/control/config.py @@ -50,11 +50,7 @@ class Capabilities(Resource): @property def data(self): - caps = ['libvirt_stream_protocols', 'qemu_stream', - 'screenshot', 'system_report_tool'] - ret = dict([(x, None) for x in caps]) - ret.update(self.model.get_capabilities()) - return ret + return self.info class Distros(Collection): diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 916020a..0fe69dd 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -60,7 +60,7 @@ class MockModel(object): self.objstore = ObjectStore(objstore_loc) self.distros = self._get_distros() - def get_capabilities(self): + def capabilities_lookup(self, name): return {'libvirt_stream_protocols': ['http', 'https', 'ftp', 'ftps', 'tftp'], 'qemu_stream': True, 'screenshot': True, diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 81c1507..1f98bfa 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -242,7 +242,7 @@ class Model(object): kimchi_log.info("*** Feature tests completed ***") _set_capabilities.priority = 90 - def get_capabilities(self): + def capabilities_lookup(self, name): report_tool = self._get_system_report_tool() return {'libvirt_stream_protocols': self.libvirt_stream_protocols, -- 1.8.4.2

3 2

[PATCH v4 0/3] Reorganize kimchi's path vars generation code
by Mark Wu 29 Jan '14

29 Jan '14

This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler. Changes: v4: Fix the test break when installed to non system dirs. (per Shaohe) v3: Rebase Only access the paths instance when the request is for html, which can avoid forcibly installing paths to the plugin which just have json requests. v2: Rebase Remove the optimization for plugin paths since it just have a few instantiations. Mark Wu (3): Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Allow plugin use kimchi's ui handler .gitignore | 1 + src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 155 +++++++++++++++++++----------------------------- src/kimchi/root.py | 23 ++++--- src/kimchi/server.py | 14 +++-- src/kimchi/template.py | 17 ++++-- src/kimchi/utils.py | 6 +- src/kimchid.in | 7 ++- tests/Makefile.am | 9 ++- tests/test_config.py.in | 85 ++++++++++++++++++++++++++ 10 files changed, 196 insertions(+), 125 deletions(-) create mode 100644 tests/test_config.py.in -- 1.8.4.2

3 7

[PATCH] bug fix: failed to update vm with unicode name
by shaohef＠linux.vnet.ibm.com 29 Jan '14

29 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> update a vm's name with unicode name, kimchi will report error. $ curl -u <user> -H 'Accept: application/json' \ -H 'Content-type: application/json' \ http://localhost:8000/vms/u13.10 -X PUT -d ' {"name": "kīмсhī-∨м"}' There are two bugs: 1. typo encode the ident with "utf8" when HTTPRedirect change it to "utf-8" 2. The name form libvirt is str, need decode. ref: https://github.com/kimchi-project/kimchi/wiki/support-unicode Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 2 +- src/kimchi/model.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index f50ff6e..0b656ab 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -154,7 +154,7 @@ class Resource(object): ident = update(self.ident, params) if ident != self.ident: uri_params = list(self.model_args[:-1]) - uri_params += [urllib2.quote(ident.encode('utf8'))] + uri_params += [urllib2.quote(ident.encode('utf-8'))] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), 303) return self.get() diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 55de570..6590ca3 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -504,7 +504,7 @@ class Model(object): dom = self._get_vm(name) dom = self._static_vm_update(dom, params) self._live_vm_update(dom, params) - return dom.name() + return dom.name().decode('utf-8') def vm_lookup(self, name): dom = self._get_vm(name) -- 1.8.4.2

2 1

[PATCH 00/22] Refactor Model
by Aline Manera 29 Jan '14

29 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, This patch set splitted model.py into several model implementations. One for each resource in kimchi. It also includes a mechanism implemented by Zhou Zheng Sheng to automatically load all the models in one. So we don't nee to change tests and controller to work with new models. It is just the first step. I also will send a patch to split mockmodel And finally, a new one to separate common code and specific code from models. I am sending it separately because all that require a lot of work (and tests) and also can conflict with new features. I am planning to merge it on next Wed (when sprint 2 ends) so I hope those changes will not impact so much any developer. PS. it seems to to be a huge patch set but I just move code from one place to another. There is no new implementation/feature in there. Aline Manera (22): refactor model: Separate libvirtconnection from model.py refactor model: Move StoragePooldef from model to libvirtstoragepools.py refactor model: Create a common model builder Create a model to join all model resources implementation refactor model: Create a separated model for task resource refactor model: Create a separated model for plugins resource refactor model: Create a separated model for debug report resource refactor model: Create a separated model for config resource refactor model: Create a separated model for network resource refactor model: Create a separated model for interface resource refactor model: Create a separated model for storage pool resource refactor model: Create a separated model for storage volume resource refactor model: Create a separated model for storage server resource refactor model: Create a separated model for storage target resource refactor model: Create a separated model for template resource refactor model: Create a separated model for vm resource refactor model: Create a separated model for vm interface resource refactor model: Create a separated model for host resource Update server to use the new model Update tests to use the new model Update mockmodel imports Delete former model.py and rename model_ to model Makefile.am | 1 + src/kimchi/basemodel.py | 55 + src/kimchi/control/config.py | 6 +- src/kimchi/control/storagepools.py | 2 +- src/kimchi/control/utils.py | 12 +- src/kimchi/mockmodel.py | 27 +- src/kimchi/model.py | 2025 -------------------------------- src/kimchi/model/__init__.py | 21 + src/kimchi/model/config.py | 87 ++ src/kimchi/model/debugreports.py | 167 +++ src/kimchi/model/host.py | 201 ++++ src/kimchi/model/interfaces.py | 46 + src/kimchi/model/libvirtconnection.py | 122 ++ src/kimchi/model/libvirtstoragepool.py | 257 ++++ src/kimchi/model/model.py | 53 + src/kimchi/model/networks.py | 265 +++++ src/kimchi/model/plugins.py | 31 + src/kimchi/model/storagepools.py | 246 ++++ src/kimchi/model/storageservers.py | 78 ++ src/kimchi/model/storagetargets.py | 86 ++ src/kimchi/model/storagevolumes.py | 176 +++ src/kimchi/model/tasks.py | 39 + src/kimchi/model/templates.py | 172 +++ src/kimchi/model/utils.py | 33 + src/kimchi/model/vmifaces.py | 135 +++ src/kimchi/model/vms.py | 450 +++++++ src/kimchi/server.py | 2 +- src/kimchi/utils.py | 46 +- tests/test_model.py | 91 +- tests/test_storagepool.py | 4 +- tests/utils.py | 4 +- 31 files changed, 2831 insertions(+), 2109 deletions(-) create mode 100644 src/kimchi/basemodel.py delete mode 100644 src/kimchi/model.py create mode 100644 src/kimchi/model/__init__.py create mode 100644 src/kimchi/model/config.py create mode 100644 src/kimchi/model/debugreports.py create mode 100644 src/kimchi/model/host.py create mode 100644 src/kimchi/model/interfaces.py create mode 100644 src/kimchi/model/libvirtconnection.py create mode 100644 src/kimchi/model/libvirtstoragepool.py create mode 100644 src/kimchi/model/model.py create mode 100644 src/kimchi/model/networks.py create mode 100644 src/kimchi/model/plugins.py create mode 100644 src/kimchi/model/storagepools.py create mode 100644 src/kimchi/model/storageservers.py create mode 100644 src/kimchi/model/storagetargets.py create mode 100644 src/kimchi/model/storagevolumes.py create mode 100644 src/kimchi/model/tasks.py create mode 100644 src/kimchi/model/templates.py create mode 100644 src/kimchi/model/utils.py create mode 100644 src/kimchi/model/vmifaces.py create mode 100644 src/kimchi/model/vms.py -- 1.7.10.4

2 23

[RFC] Authorization enhancement
by Frank Novak 29 Jan '14

29 Jan '14

Sounds reasonable by me.... Is it done yet? :-) Cheers, Frank ----------------------------------------------------------------------------------------------------------------------- Frank Novak ( 诺帆 nuò、fān ) STSM, SCEM Open Hypervisor IBM Linux Technology Center US: fnovak(a)us.ibm.com ; Notes: Frank Novak/Watson/IBM @IBMUS cell : 919-671-7966 ------------------------------------------------------------------------------------------------------------------------- Adam King rak at linux.vnet.ibm.com Tue Jan 21 20:38:51 EST 2014 Previous message: [Kimchi-devel] [RFC] Authorization enhancement Next message: [Kimchi-devel] [PATCH V6] Add nfs server and target UI in create storage pool Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] The proposal is over ambitious in some areas, under ambitious in others. I'd suggest the following: *Assumptions:* The first objective of introducing authorization into Kimchi is to allow an admin to partition defined VMs for independent, secure use by different users. *Scenario: *Frank is the manager of a team consisting of developers and testers with a clear separation of responsibility. He already has groups created on his linux host with user id membership organized by the user's function. Frank needs to create some VMs for his teams to use. He is the sole root user on the host. He wants the developers to be able to manage their VMs' lifecycle, but not to have permission to increase their VMs resource allocation. Developers always want as much memory as they can get away with:-) He wants the testers to have permission to edit the resource allocation of their VMs. The software needs to be verified with different hardware configurations, and he doesn't want to have to make every edit for his testers each time they need to validate a new scenario. *Resolution:* Frank creates his VMs. Those he has created for use by his developers, he assigns the user role to the development group for each of the VMs granting all his developers permission to see and manage the life cycle of the VMs Those he has created for use by his testers, he assigns the admin role to the test group for each of the VMs granting all his testers permission to see and take all actions to the VMs *User Design goals* An existing system user will only see the resources and actions the user is authorized to use An existing system sudo user will see and be able to act on all resources Actions on a given resource can be restricted with more than binary granularity. Some authorized users may have more privilege on a resource than others. ie Some authorized users may be able to edit a VMs resource definition, while others can only manipulate its life cycle *System Design Goals* No new prerequisites are required to be installed or managed. i.e. No database prerequisite No new user repository is required beyond what the host system is configured to use. PAM The authorization scheme will work with read only user repositories. Authorization information will be portable. ie. If a VM is moved from one kimchi host to another, the new host is immediately aware of the security constraints. The system is secure. A user will not be able discover the REST API and invoke actions directly without authorization. Kimchi managed resources can still be managed by other KVM tools, and returned to Kimchi without loss of function. Kimchi 1.2 authorization design is extensible to cover arbitrarily fine grained constraints *Kimchi 1.2 Proposal* Users in the sudo (admin) group would continue having full access to all Kimchi functions. Users not in the sudo (admin) group would only have access to VMs that they are authorized to use. A VM user could have one of two roles on a given VM admin - user has access to all VM actions on the individual VM user - user has access to power on, power off, reboot, snapshot, VNC/Spice as appropriate on the individual VM Group/role mapping will be stored in the <metadata> element of the VM Domain XML. If the VM is migrated to a new host, the metadata will go with it. *Algorithm* Login: If the user is a member of the sudo (admin) group grant all permissions and render the full Kimchi UI as today else enumerate all the groups the user is a member of, including groups of groups recursively for each VM determine the highest role available to the user by the various groups he is a member of render the kimchi frame with only a list of the authorized VMs, each with the appropriate actions If none, render the empty list *Kimchi 1.2+ Extensibilty *How can the 1.2 proposal be extended in future Kimchi versions as needed? * Resource ** * Other resources (network, storage) can use the same group/role authorization concept, relying on similar libvirt metadata for storage. Storage for the authorization mapping would have to be elsewhere for any resource libvirt has not defined metadata on. * Admin granularity* Additional roles can be introduced to allow some admins control over network while others control storage pools and volumes. Storage for these administration scoped roles would have to be defined and replicated for future cluster support. *Role granularity* Additional roles can be introduced beyond admin and user to allow more differentiation in what actions a specific group of users can access including custom administrator defined roles -- Adam King <rak at linux.vnet.ibm.com> IBM CSI

3 2

[PATCH v3 0/3] Reorganize kimchi's path vars generation code
by Mark Wu 28 Jan '14

28 Jan '14

This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler. Changes: v3: Rebase Only access the paths instance when the request is for html, which can avoid forcibly installing paths to the plugin which just have json requests. v2: Rebase Remove the optimization for plugin paths since it just have a few instantiations. Mark Wu (3): PEP8 cleanup and bug fix for src/kimchi/utils.py Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Makefile.am | 1 + src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 155 +++++++++++++++++++----------------------------- src/kimchi/root.py | 7 ++- src/kimchi/server.py | 10 ++-- src/kimchi/template.py | 14 +++-- src/kimchi/utils.py | 15 ++--- src/kimchid.in | 7 ++- tests/test_config.py | 73 +++++++++++++++++++++++ 9 files changed, 168 insertions(+), 118 deletions(-) create mode 100644 tests/test_config.py -- 1.8.4.2

2 6

[PATCH v4 0/2] Change all CSS files indentation to 4 spaces
by Crístian Viana 28 Jan '14

28 Jan '14

This is the difference between this and the previous patchset (v3): - Limit line length to 79 characters instead of 80, according to the PEP8 specification. Even though PEP8 rules are meant to be applied for Python code, it is better if we can reuse the same ones (when applicable). Crístian Viana (2): CSS: Do not allow lines longer than 79 characters CSS: Change all CSS files indentation to 4 spaces ui/css/theme-default/button.css | 167 ++++++++++++++++++++---------- ui/css/theme-default/error.css | 15 ++- ui/css/theme-default/grid.css | 36 ++++--- ui/css/theme-default/host.css | 6 +- ui/css/theme-default/jquery-ui.custom.css | 27 +++-- ui/css/theme-default/line-chart.css | 6 +- ui/css/theme-default/list.css | 15 ++- ui/css/theme-default/nav-tree.css | 12 ++- ui/css/theme-default/network.css | 12 ++- ui/css/theme-default/popover.css | 39 ++++--- ui/css/theme-default/report-add.css | 3 +- ui/css/theme-default/reset.css | 8 +- ui/css/theme-default/storage.css | 18 ++-- ui/css/theme-default/template-edit.css | 9 +- ui/css/theme-default/template_add.css | 20 ++-- ui/css/theme-default/template_list.css | 24 +++-- ui/css/theme-default/toolbar.css | 6 +- ui/css/theme-default/topbar.css | 29 ++++-- ui/css/theme-default/window.css | 3 +- 19 files changed, 296 insertions(+), 159 deletions(-) -- 1.8.4.2

2 5

[PATCH] fix: Add missing license copyright to css files
by Aline Manera 28 Jan '14

28 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> host.css, grid.css and line-chart.css were missing the Kimchi license. Add it to them. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- ui/css/theme-default/grid.css | 20 ++++++++++++++++++++ ui/css/theme-default/host.css | 20 ++++++++++++++++++++ ui/css/theme-default/line-chart.css | 20 ++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 2704fee..c5aa8e6 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -1,3 +1,23 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ .resizing { cursor: col-resize; } diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 457c4ef..0ef8b10 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -1,3 +1,23 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ .host-panel { font-size: 12px; margin-bottom: 100px; diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css index 4fc0e2e..e1d8cb9 100644 --- a/ui/css/theme-default/line-chart.css +++ b/ui/css/theme-default/line-chart.css @@ -1,3 +1,23 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ .chart-container { background: black; } -- 1.7.10.4

3 3

[PATCH] GET /plugins failed, fix it
by shaohef＠linux.vnet.ibm.com 27 Jan '14

27 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> commit 478d01d add a more parameter "filter_params" for get method of collection. But it does not add this new parameter to derived class. $ curl -H "Content-Type: application/json" -H "Accept: application/json" \ http://localhost:8000/plugins Error as follow: [27/Jan/2014:23:01:50] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/cherrypy/_cprequest.py", line 656, in respond response.body = self.handler() File "/usr/lib/python2.7/site-packages/cherrypy/lib/encoding.py", line 188, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/site-packages/cherrypy/_cpdispatch.py", line 34, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/shhfeng/work/workdir/kimchi/src/kimchi/control/base.py", line 266, in index return self.get(filter_params) TypeError: get() takes exactly 1 argument (2 given) Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/control/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/control/plugins.py b/src/kimchi/control/plugins.py index 5938085..1221342 100644 --- a/src/kimchi/control/plugins.py +++ b/src/kimchi/control/plugins.py @@ -37,7 +37,7 @@ class Plugins(Collection): def data(self): return self.info - def get(self): + def get(self, *args): res_list = [] try: get_list = getattr(self.model, model_fn(self, 'get_list')) -- 1.8.4.2

3 3

[PATCH] Github issue #306: Creating a guest OS whose name contain spaces causes it to fail.
by Otavio R. Piske 27 Jan '14

27 Jan '14

From: "Otavio R. Piske" <angusyoung(a)gmail.com> Kimchi fails to start the guest OS if the user names it with spaces. As pointed in the issue #306, other VM management interfaces prevent the user from creating a guest OS if the name contain invalid characters. This patch adds a validation logic that prevents the user from naming a Guest OS with anything other than alphanumeric chars, '-', '.' or '_'. Signed-off-by: Otavio R. Piske <angusyoung(a)gmail.com> --- ui/js/src/kimchi.guest_add_main.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ui/js/src/kimchi.guest_add_main.js b/ui/js/src/kimchi.guest_add_main.js index 2085562..b65f2ef 100644 --- a/ui/js/src/kimchi.guest_add_main.js +++ b/ui/js/src/kimchi.guest_add_main.js @@ -53,6 +53,18 @@ kimchi.guest_add_main = function() { if (!$('input[name=template]:checked', '#templateTile').val()) { return false; } + + var name = $('input[name=name]', '#form-vm-add').val(); + + /* This regex should match anything that it's not an alphanumeric + * string, -, ., or _. + */ + var invalidChars = /[^A-Za-z0-9\-\.\_]/g; + + if (invalidChars.exec(name)) { + return false; + } + return true; } @@ -60,6 +72,9 @@ kimchi.guest_add_main = function() { if (validateForm()) { $('#vm-doAdd').removeAttr('disabled'); } + else { + $('#vm-doAdd').attr('disabled', 'disabled'); + } }); var addGuest = function(event) { -- 1.7.10.4

4 6

About the review process
by Shu Ming 27 Jan '14

27 Jan '14

More and more patches coming into this mailing list and I found some comments to the patches were not addressed correctly. One scenario was that reviewer A had concern on the patch, but B and C gave the "reviewed-by" to th patch, then the maintainer merged the patch into the upstream without the concern addressed. The concern may be a very good point to improve the code. In order to eliminate the scenario, I think we can improve the code review process in this way: 1) To the reviewer, if you have concern on the patch, please give your opinion in a very clear way like "NACK" opposite to "Reviewed-by" in the first line of the reply. 2) To the submitter, please address all the concern and have the reviewer to give a clear opinion. 3) To the maintainer, please don't not merge the patch if the concern is not addressed. 4) To help the reviewer to understand your code, please post RFC for your features and have a widely discussion. One example, see the detail in the bottom, "Use new control modules in root.py" which was given one concern on the patch, but the submitter didn't reply to the concern. Then two others gave the "reviewed-by" to th patch that leads to the patch merged. The concern on the patch "not sure we can move these code to __all__ or other attribute of control/__init__.py just from kimchi.control.networks import *" was not very clear to the patch submitter and the patch submitter just ignored the comment. IMO, that is not a clean way to do the review. Here, we do miss the chance to improve the origin patch. Finally, another patch "Improve controller" was post to address the concern which caused code quality improvement of the original patch delayed and work duplicated. See the example patch here and the reviewer's comment and concern inline. --- On 12/24/2013 02:41 AM, Aline Manera wrote: > --- a/src/kimchi/root.py > +++ b/src/kimchi/root.py > @@ -26,13 +26,23 @@ import json > > > from kimchi import auth > -from kimchi import controller > from kimchi import template > from kimchi.config import get_api_schema_file > from kimchi.control.utils import parse_request > - > - > -class Root(controller.Resource): > +from kimchi.control.base import Resource > +from kimchi.control.config import Config > +from kimchi.control.debugreports import DebugReports > +from kimchi.control.host import Host > +from kimchi.control.interfaces import Interfaces > +from kimchi.control.networks import Networks > +from kimchi.control.plugins import Plugins > +from kimchi.control.storagepools import StoragePools > +from kimchi.control.tasks import Tasks > +from kimchi.control.templates import Templates > +from kimchi.control.vms import VMs not sure we can move these code to __all__ or other attribute of control/__init__.py just from kimchi.control.networks import * + + +class Root(Resource): def __init__(self, model, dev_env): self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', @@ -45,17 +55,17 @@ class Root(controller.Resource): self._cp_config = dict([(key, self.error_development_handler) for key in self._handled_error])

3 2

[PATCH] PEP8 cleanup and bug fix for src/kimchi/utils.py
by Mark Wu 26 Jan '14

26 Jan '14

This patch makes src/kimchi/utils.py pep8 clean, and fix the wrong var reference of 'storage_server'. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- Makefile.am | 1 + src/kimchi/utils.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9ccac0e..1ee8c1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ PEP8_WHITELIST = \ src/kimchi/rollbackcontext.py \ src/kimchi/root.py \ src/kimchi/server.py \ + src/kimchi/utils.py \ tests/test_mockmodel.py \ tests/test_model.py \ tests/test_plugin.py \ diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index ae0cfac..be32195 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -18,7 +18,7 @@ # # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # import cherrypy @@ -37,6 +37,7 @@ from threading import Timer kimchi_log = cherrypy.log.error_log + def is_digit(value): if isinstance(value, int): return True @@ -169,11 +170,11 @@ def patch_find_nfs_target(nfs_server): try: out = run_command(cmd, 10)[0] except TimeoutExpired: - kimchi_log.warning("server %s query timeout, may not have any path exported", - storage_server) + kimchi_log.warning("server %s query timeout, may not have any path " + "exported", nfs_server) return list() - targets = parse_cmd_output(out, output_items = ['target']) + targets = parse_cmd_output(out, output_items=['target']) for target in targets: target['type'] = 'nfs' target['host_name'] = nfs_server -- 1.8.4.2

2 2

[PATCH] Python: Do not allow lines longer than 80 characters
by Crístian Viana 26 Jan '14

26 Jan '14

In order to make the code more consistent, set a maximum of 80 characters per line in Python files. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 24 ++++++++----- src/kimchi/model.py | 88 ++++++++++++++++++++++++++++------------------- src/kimchi/objectstore.py | 3 +- src/kimchi/osinfo.py | 18 ++++++---- src/kimchi/scan.py | 7 ++-- src/kimchi/template.py | 3 +- src/kimchi/vmtemplate.py | 7 ++-- tests/test_osinfo.py | 3 +- 8 files changed, 96 insertions(+), 57 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 4ef3fa6..1b345ae 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -61,7 +61,8 @@ class MockModel(object): self.distros = self._get_distros() def get_capabilities(self): - return {'libvirt_stream_protocols': ['http', 'https', 'ftp', 'ftps', 'tftp'], + return {'libvirt_stream_protocols': ['http', 'https', 'ftp', 'ftps', + 'tftp'], 'qemu_stream': True, 'screenshot': True, 'system_report_tool': True} @@ -208,10 +209,12 @@ class MockModel(object): ident = name new_storagepool = new_t.get(u'storagepool', '') + new_name = kimchi.model.pool_name_from_uri(new_storagepool) try: - self._get_storagepool(kimchi.model.pool_name_from_uri(new_storagepool)) + self._get_storagepool(new_name) except Exception as e: - raise InvalidParameter("Storagepool specified is not valid: %s." % e.message) + raise InvalidParameter("Storagepool specified is not valid: %s." % + e.message) for net_name in params.get(u'networks', []): try: @@ -303,7 +306,8 @@ class MockModel(object): pool.info['autostart'] = False except KeyError, item: raise MissingParameter(item) - if name in self._mock_storagepools or name in (kimchi.model.ISO_POOL_NAME,): + if (name in self._mock_storagepools or + name in (kimchi.model.ISO_POOL_NAME,)): raise InvalidOperation("StoragePool already exists") self._mock_storagepools[name] = pool return name @@ -605,9 +609,11 @@ class MockVMTemplate(VMTemplate): try: pool = self.model._get_storagepool(pool_name) except NotFoundError: - raise InvalidParameter('Storage specified by template does not exist') + raise InvalidParameter('Storage specified by template does ' + 'not exist') if pool.info['state'] != 'active': - raise InvalidParameter('Storage specified by template is not active') + raise InvalidParameter('Storage specified by template is ' + 'not active') return pool @@ -634,13 +640,15 @@ class MockVM(object): self.networks = template_info['networks'] self.info = {'state': 'shutoff', 'stats': "{'cpu_utilization': 20, 'net_throughput' : 35, \ - 'net_throughput_peak': 100, 'io_throughput': 45, \ + 'net_throughput_peak': 100, \ + 'io_throughput': 45, \ 'io_throughput_peak': 100}", 'uuid': self.uuid, 'memory': template_info['memory'], 'cpus': template_info['cpus'], 'icon': None, - 'graphics': {'type': 'vnc', 'listen': '0.0.0.0', 'port': None} + 'graphics': {'type': 'vnc', 'listen': '0.0.0.0', + 'port': None} } self.info['graphics'].update(template_info['graphics']) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index ea528c6..37d98dc 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -64,7 +64,8 @@ from kimchi import xmlutils from kimchi.asynctask import AsyncTask from kimchi.distroloader import DistroLoader from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError -from kimchi.exception import MissingParameter, NotFoundError, OperationFailed, TimeoutExpired +from kimchi.exception import MissingParameter, NotFoundError, OperationFailed +from kimchi.exception import TimeoutExpired from kimchi.featuretests import FeatureTests from kimchi.iscsi import TargetClient from kimchi.isoinfo import IsoImage @@ -155,7 +156,8 @@ class Model(object): # Please add new possible debug report command here # and implement the report generating function # based on the new report command - self.report_tools = ({'cmd': 'sosreport --help', 'fn': self._sosreport_generate}, + self.report_tools = ({'cmd': 'sosreport --help', + 'fn': self._sosreport_generate}, {'cmd': 'supportconfig -h', 'fn':None}, {'cmd': 'linuxexplorers --help', 'fn':None}) @@ -185,18 +187,18 @@ class Model(object): try: net = conn.networkDefineXML(xml) except libvirt.libvirtError, e: - cherrypy.log.error( - "Fatal: Cannot create default network because of %s, exit kimchid" % e.message, - severity=logging.ERROR) + cherrypy.log.error("Fatal: Cannot create default network " + "because of %s, exit kimchid" % + e.message, severity=logging.ERROR) sys.exit(1) if net.isActive() == 0: try: net.create() except libvirt.libvirtError, e: - cherrypy.log.error( - "Fatal: Cannot activate default network because of %s, exit kimchid" % e.message, - severity=logging.ERROR) + cherrypy.log.error("Fatal: Cannot activate default network " + "because of %s, exit kimchid" % + e.message, severity=logging.ERROR) sys.exit(1) def _default_pool_check(self): @@ -210,9 +212,9 @@ class Model(object): pass except OperationFailed as e: # path used by other pool or other reasons of failure, exit - cherrypy.log.error( - "Fatal: Cannot create default pool because of %s, exit kimchid" % e.message, - severity=logging.ERROR) + cherrypy.log.error("Fatal: Cannot create default pool because of " + "%s, exit kimchid" % + e.message, severity=logging.ERROR) sys.exit(1) if self.storagepool_lookup('default')['state'] == 'inactive': @@ -477,12 +479,15 @@ class Model(object): for key, val in params.items(): if key in VM_STATIC_UPDATE_PARAMS: - new_xml = xmlutils.xml_item_update(new_xml, VM_STATIC_UPDATE_PARAMS[key], val) + new_xml = xmlutils.xml_item_update(new_xml, + VM_STATIC_UPDATE_PARAMS[key], + val) try: if 'name' in params: if state == 'running': - raise InvalidParameter("vm name can just updated when vm shutoff") + raise InvalidParameter("vm name can just updated when " + "vm shutoff") else: dom.undefine() conn = self.conn.get() @@ -506,7 +511,8 @@ class Model(object): info = dom.info() state = Model.dom_state_map[info[0]] screenshot = None - graphics_type, graphics_listen, graphics_port = self._vm_get_graphics(name) + graphics = self._vm_get_graphics(name) + graphics_type, graphics_listen, graphics_port = graphics graphics_port = graphics_port if state == 'running' else None try: if state == 'running': @@ -628,7 +634,8 @@ class Model(object): t = self._get_template(t_name, vm_overrides) if not self.qemu_stream and t.info.get('iso_stream', False): - raise InvalidOperation("Remote ISO image is not supported by this server.") + raise InvalidOperation("Remote ISO image is not supported by " + "this server.") t.validate() vol_list = t.fork_vm_storage(vm_uuid) @@ -639,7 +646,7 @@ class Model(object): with self.objstore as session: session.store('vm', vm_uuid, {'icon': icon}) - libvirt_stream = False if len(self.libvirt_stream_protocols) == 0 else True + libvirt_stream = len(self.libvirt_stream_protocols) != 0 graphics = params.get('graphics') xml = t.to_vm_xml(name, vm_uuid, @@ -718,7 +725,8 @@ class Model(object): try: self._get_storagepool(pool_name_from_uri(new_storagepool)) except Exception as e: - raise InvalidParameter("Storagepool specified is not valid: %s." % e.message) + raise InvalidParameter("Storagepool specified is not valid: %s." % + e.message) for net_name in params.get(u'networks', []): try: @@ -1041,7 +1049,8 @@ class Model(object): with self.objstore as session: session.delete('scanning', pool_name) except Exception, e: - kimchi_log.debug("Exception %s occured when cleaning scan result" % e.message) + kimchi_log.debug("Exception %s occured when cleaning scan result" % + e.message) def _do_deep_scan(self, params): scan_params = dict(ignore_list=[]) @@ -1054,10 +1063,11 @@ class Model(object): if res['state'] == 'active': scan_params['ignore_list'].append(res['path']) except Exception, e: - kimchi_log.debug("Exception %s occured when get ignore path" % e.message) + kimchi_log.debug("Exception %s occured when get ignore path" % + e.message) - params['path'] = scan_params['pool_path'] = self.scanner.scan_dir_prepare( - params['name']) + path = self.scanner.scan_dir_prepare(params['name']) + params['path'] = scan_params['pool_path'] = path task_id = self.add_task('', self.scanner.start_scan, scan_params) # Record scanning-task/storagepool mapping for future querying with self.objstore as session: @@ -1252,8 +1262,8 @@ class Model(object): bootable = True except IsoFormatError: bootable = False - res.update( - dict(os_distro=os_distro, os_version=os_version, path=path, bootable=bootable)) + res.update(dict(os_distro=os_distro, os_version=os_version, + path=path, bootable=bootable)) return res @@ -1315,7 +1325,8 @@ class Model(object): def _sosreport_generate(self, cb, name): command = 'sosreport --batch --name "%s"' % name try: - retcode = subprocess.call(command, shell=True, stdout=subprocess.PIPE) + retcode = subprocess.call(command, shell=True, + stdout=subprocess.PIPE) if retcode < 0: raise OperationFailed('Command terminated with signal') elif retcode > 0: @@ -1360,7 +1371,8 @@ class Model(object): for helper_tool in self.report_tools: try: retcode = subprocess.call(helper_tool['cmd'], shell=True, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) if retcode == 0: return helper_tool['fn'] except Exception, e: @@ -1450,9 +1462,11 @@ class LibvirtVMTemplate(VMTemplate): conn = self.conn.get() pool = conn.storagePoolLookupByName(pool_name) except libvirt.libvirtError: - raise InvalidParameter('Storage specified by template does not exist') + raise InvalidParameter('Storage specified by template does ' + 'not exist') if not pool.isActive(): - raise InvalidParameter('Storage specified by template is not active') + raise InvalidParameter('Storage specified by template is ' + 'not active') return pool @@ -1463,9 +1477,11 @@ class LibvirtVMTemplate(VMTemplate): conn = self.conn.get() network = conn.networkLookupByName(name) except libvirt.libvirtError: - raise InvalidParameter('Network specified by template does not exist') + raise InvalidParameter('Network specified by template does ' + 'not exist') if not network.isActive(): - raise InvalidParameter('Network specified by template is not active') + raise InvalidParameter('Network specified by template is ' + 'not active') def _get_storage_path(self): pool = self._storage_validate() @@ -1582,7 +1598,8 @@ class NetfsPoolDef(StoragePoolDef): run_command(mount_cmd, 30) rollback.prependDefer(run_command, umount_cmd) except TimeoutExpired: - raise InvalidParameter("Export path %s may block during nfs mount" % export_path) + raise InvalidParameter("Export path %s may block during " + "nfs mount" % export_path) with open("/proc/mounts" , "rb") as f: rawMounts = f.read() @@ -1593,8 +1610,8 @@ class NetfsPoolDef(StoragePoolDef): mounted = True if not mounted: - raise InvalidParameter( - "Export path %s mount failed during nfs mount" % export_path) + raise InvalidParameter("Export path %s mount failed during " + "nfs mount" % export_path) @property def xml(self): @@ -1830,7 +1847,8 @@ class LibvirtConnection(object): except libvirt.libvirtError: kimchi_log.error('Unable to connect to libvirt.') if not retries: - kimchi_log.error('Libvirt is not available, exiting.') + kimchi_log.error('Libvirt is not available, ' + 'exiting.') cherrypy.engine.stop() raise time.sleep(2) @@ -1847,8 +1865,8 @@ class LibvirtConnection(object): setattr(cls, name, wrapMethod(method)) self._connections[conn_id] = conn - # In case we're running into troubles with keeping the connections - # alive we should place here: + # In case we're running into troubles with keeping the + # connections alive we should place here: # conn.setKeepAlive(interval=5, count=3) # However the values need to be considered wisely to not affect # hosts which are hosting a lot of virtual machines diff --git a/src/kimchi/objectstore.py b/src/kimchi/objectstore.py index 7b567f3..5096ea8 100644 --- a/src/kimchi/objectstore.py +++ b/src/kimchi/objectstore.py @@ -107,7 +107,8 @@ class ObjectStore(object): try: return self._connections[ident] except KeyError: - self._connections[ident] = sqlite3.connect(self.location, timeout=10) + self._connections[ident] = sqlite3.connect(self.location, + timeout=10) if len(self._connections.keys()) > 10: id, conn = self._connections.popitem(last=False) conn.interrupt() diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index f92db3d..14df9a6 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -56,18 +56,24 @@ modern_version_bases = {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', isolinks = { 'debian': { - 'squeeze': 'http://cdimage.debian.org/debian-cd/6.0.7-live/amd64/iso-hybrid/debian-live…', + 'squeeze': 'http://cdimage.debian.org/debian-cd/6.0.7-live/amd64/' + 'iso-hybrid/debian-live-6.0.7-amd64-gnome-desktop.iso', }, 'ubuntu': { - 'raring': 'http://ubuntu-releases.cs.umn.edu/13.04/ubuntu-13.04-desktop-amd64.iso', + 'raring': 'http://ubuntu-releases.cs.umn.edu/13.04/' + 'ubuntu-13.04-desktop-amd64.iso', }, 'opensuse': { - '12.3': 'http://suse.mirrors.tds.net/pub/opensuse/distribution/12.3/iso/openSUSE-12.…', + '12.3': 'http://suse.mirrors.tds.net/pub/opensuse/distribution/12.3/' + 'iso/openSUSE-12.3-DVD-x86_64.iso', }, 'fedora': { - '16': 'http://fedora.mirrors.tds.net/pub/fedora/releases/16/Live/x86_64/Fedora-16-…', - '17': 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/x86_64/Fedora-17-…', - '18': 'http://fedora.mirrors.tds.net/pub/fedora/releases/18/Live/x86_64/Fedora-18-…', + '16': 'http://fedora.mirrors.tds.net/pub/fedora/releases/16/Live/' + 'x86_64/Fedora-16-x86_64-Live-Desktop.iso', + '17': 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/' + 'x86_64/Fedora-17-x86_64-Live-Desktop.iso', + '18': 'http://fedora.mirrors.tds.net/pub/fedora/releases/18/Live/' + 'x86_64/Fedora-18-x86_64-Live-Desktop.iso', }, } diff --git a/src/kimchi/scan.py b/src/kimchi/scan.py index e192f01..ca460a0 100644 --- a/src/kimchi/scan.py +++ b/src/kimchi/scan.py @@ -59,8 +59,8 @@ class Scanner(object): shutil.rmtree(d) self.clean_cb(transient_pool) except OSError as e: - kimchi_log.debug( - "Exception %s occured when cleaning stale pool, ignore" % e.message) + kimchi_log.debug("Exception %s occured when cleaning stale pool, " + "ignore" % e.message) def scan_dir_prepare(self, name): # clean stale scan storage pools @@ -77,7 +77,8 @@ class Scanner(object): if (iso_info['distro'], iso_info['version']) == iso_img.probe(): return - iso_path = iso_name + hashlib.md5(iso_info['path']).hexdigest() + '.iso' + iso_path = (iso_name + hashlib.md5(iso_info['path']).hexdigest() + + '.iso') link_name = os.path.join(params['pool_path'], os.path.basename(iso_path)) os.symlink(iso_info['path'], link_name) diff --git a/src/kimchi/template.py b/src/kimchi/template.py index 1f19c4a..faa3c72 100644 --- a/src/kimchi/template.py +++ b/src/kimchi/template.py @@ -83,7 +83,8 @@ def can_accept_html(): def render(resource, data): if can_accept('application/json'): - cherrypy.response.headers['Content-Type'] = 'application/json;charset=utf-8' + cherrypy.response.headers['Content-Type'] = ('application/json;' + 'charset=utf-8') return json.dumps(data, indent=2, separators=(',', ':'), encoding='iso-8859-1') diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 58147e3..6a3def3 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -111,9 +111,12 @@ class VMTemplate(object): qemu_stream_cmdline = """ <qemu:commandline> <qemu:arg value='-drive'/> - <qemu:arg value='file=%(url)s,if=none,id=drive-%(bus)s0-1-0,readonly=on,format=raw'/> + <qemu:arg value='file=%(url)s, + if=none,id=drive-%(bus)s0-1-0,readonly=on, + format=raw'/> <qemu:arg value='-device'/> - <qemu:arg value='%(bus)s-cd,bus=%(bus)s.1,unit=0,drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> + <qemu:arg value='%(bus)s-cd,bus=%(bus)s.1,unit=0, + drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> </qemu:commandline> """ diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index 0f88a35..28ac89b 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -34,7 +34,8 @@ class OSInfoTests(unittest.TestCase): self.assertEquals(['default'], entry['networks']) def test_fedora_lookup(self): - cd = 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/x86_64/Fedora-17-…' + cd = 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/x86_64/' + 'Fedora-17-x86_64-Live-Desktop.iso' entry = lookup('fedora', '17') self.assertEquals(10, entry['disks'][0]['size']) self.assertEquals(cd, entry['cdrom']) -- 1.8.4.2

3 4

[PATCH] HTML: Make the form element's labels clickable
by Crístian Viana 26 Jan '14

26 Jan '14

A good usability feature of an HTML form is to click on an element's label to activate the element itself. For example, when clicking on a checkbox's label, the checkbox itself is checked, instead of requiring the user to click on the small corresponding element. Assign every checkbox's and radio's labels to their corresponding form elements. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/pages/storagepool-add.html.tmpl | 6 +++--- ui/pages/tabs/network.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 03c063d..12a9779 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -117,7 +117,7 @@ <section class="form-section"> <div class="field"> <input type="checkbox" id="authId" name="authname"> - <label>$_("Add iSCSI Authentication")</label> + <label for="authId">$_("Add iSCSI Authentication")</label> </div> </section> <section class="authenticationfield form-section tmpl-html"> @@ -143,8 +143,8 @@ </script> <script id="partitionTmpl" type="html/text"> <div> - <input type="checkbox" value="{path}" name="devices"> - <label>{path}</label> + <input type="checkbox" id="{name}" value="{path}" name="devices"> + <label for="{name}">{path}</label> </div> </script> </body> diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index fcf8556..9c149b7 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -61,15 +61,15 @@ <div class="section-content"> <div class="input-container"> <input type="radio" id="networkTypeIso" name="networkType" value="isolated"> - <label>$_("Isolated: no physical network connection")</label> + <label for="networkTypeIso">$_("Isolated: no physical network connection")</label> </div> <div class="input-container"> <input type="radio" id="networkTypeNat" name="networkType" value="nat"> - <label>$_("NAT: outbound physical network connection only")</label> + <label for="networkTypeNat">$_("NAT: outbound physical network connection only")</label> </div> <div class="input-container"> <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> - <label>$_("Bridged: VMs are connected to physical network directly")</label> + <label for="networkTypeBri">$_("Bridged: VMs are connected to physical network directly")</label> </div> <div class="destination"> <label>$_("Destination"): </label> @@ -78,7 +78,7 @@ <div class="VLAN"> <label>$_("Enable VLAN"): </label> <input id="enableVlan" type="checkbox" value=""/> - <label>$_("VLAN ID"): </label> + <label for="enableVlan">$_("VLAN ID"): </label> <input type="text" id="networkVlanID" disabled> </div> </div> -- 1.8.4.2

2 1

[PATCH V3 0/4] support create/delete VMIface
by shaohef＠linux.vnet.ibm.com 25 Jan '14

25 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 rebase V1 -> V2 do not support hot plugging attach/detach interface we will support this feature after we implement events. 1. get all vms: $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms 2. get all networks: $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/networks 3. get all ifaces of a vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-0/ifaces/ [ { "mac":"52:54:00:00:00:01", "model":"virtio", "type":"network", "network":"default" } ] 4. attach a new iface to vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-8/ifaces -X POST -d ' { "type":"network", "network":"test-network-0" } ' { "mac":"52:54:00:00:00:0d", "model":"virtio", "type":"network", "network":"test-network-0" } 5. detach a iface from vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-8/ifaces/52:54:00:00:00:0d -X DELETE ShaoHe Feng (4): support create/delete VMIface: update model support create/delete VMIface: update mockmodel support create/delete VMIface: update API.json support create/delete VMIface: update testcase src/kimchi/API.json | 21 +++++++++++++++++++ src/kimchi/mockmodel.py | 21 +++++++++++++++++++ src/kimchi/model.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- tests/test_model.py | 22 +++++++++++++++++++ tests/test_rest.py | 27 ++++++++++++++++++++++++ 5 files changed, 146 insertions(+), 1 deletion(-) -- 1.8.4.2

3 12

[PATCH V2] bug fix: guest iface does not return model if no model is found
by shaohef＠linux.vnet.ibm.com 25 Jan '14

25 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> On some distros, libvirt will not set model automatically. if no model is found, guest iface will not return this field. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: SAline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 2 +- src/kimchi/model.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index f6f89f9..580728c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -180,7 +180,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. - * model: model of emulated network interface card. It will be one of these models: + * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the interface type is network. diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 63e748e..544fa80 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1001,7 +1001,8 @@ class Model(object): info['type'] = iface.attrib['type'] info['mac'] = iface.mac.get('address') - info['model'] = iface.model.get('type') + 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': -- 1.8.4.2

3 3

Help from UI experts to my latest patch
by Rodrigo Trujillo 25 Jan '14

25 Jan '14

Hi guys, I wonder if someone expert in UI can help me with my latest patch. Actually, the patch: [PATCH V2 7/7] (WIP) Storagepool SCSI/FC: Draft UI to allow user to select a LUN to new VM You guys will find the code some TODO's and FIXME I need to popup a window with LUN's names and allow user to select one of them. Then retrieve this selection. I think this is not that complicated, but I could not research deeper how to do it. See an example below: ********************************* (X) Close Select Host () Lun 1 () Lun 2 () Lun xxx ---------------------------------------- ________ | Select | ********************************* Appreciate any help Regards, Rodrigo

3 3