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