- Kimchi-devel - oVirt List Archives

[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