August 2014 - Kimchi-devel - oVirt List Archives

[PATCH] Bug fix: Github #354
by Daniel Henrique Barboza 19 Aug '14

19 Aug '14

The following patch fixes the issue described in Github #354: "storage: used nfs source path need to be filtered out in creation page" https://github.com/kimchi-project/kimchi/issues/354 Daniel Henrique Barboza (1): model/storagetargets: filtering used nfs paths src/kimchi/model/storagetargets.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 1.8.3.1

4 6

[PATCH] Add hover description to template type icons
by Crístian Viana 19 Aug '14

19 Aug '14

The small icons on each template indicate whether they are local or remote but that may not be obvious to everyone. Show a description when the user hovers the mouse over the template icons indicating what they mean: local or remote template. Also, the same descriptive text will be shown in the icon's place if the browser is not able to load images. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_main.js | 2 ++ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/tabs/templates.html.tmpl | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 3c8421d..ae3f290 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -25,8 +25,10 @@ kimchi.doListTemplates = function() { var isLocal = /^\//.test(value['cdrom']); if(isLocal){ value.location = "images/theme-default/icon-local.png"; + value.iconDescription = i18n['KCHTMPL6004M']; }else{ value.location = "images/theme-default/icon-remote.png"; + value.iconDescription = i18n['KCHTMPL6005M']; } listHtml += kimchi.substitute(templateHtml, value); }); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index f1478a7..8e6fcd6 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -61,6 +61,8 @@ "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6004M": "$_("Local template")", + "KCHTMPL6005M": "$_("Remote template")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 7cf7fcd..4fe1d73 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -50,7 +50,7 @@ <div class="template-icon template-icon-position"> <img alt="" src="{icon}"> - <img alt="" src="{location}" class="template-type-icon-position"> + <img alt="{iconDescription}" title="{iconDescription}" src="{location}" class="template-type-icon-position"> </div> <div class="template-general template-title template-title-position"> <h2 class="title" title="{name}">{name}</h2> -- 1.9.3

3 3

RFC: Discover Kimchi Peers - UI Mockup
by Yu Xin Huo 19 Aug '14

19 Aug '14

4 6

RFC: Display iSCSI Targets - UI Mockup
by Yu Xin Huo 19 Aug '14

19 Aug '14

4 5

[RFC] Mock for Authorization: Allow admin user change permission settings when VM is running
by Wen Wang 19 Aug '14

19 Aug '14

Hi all, Here is the new design of the "Edit" function. We are going to enable user viewing VM details when VMs are running and "Permission" is always available whether a VM is running or not. Here's the detail of the design: 1) Enable "Edit" in "Action" whether VM is running or not. 2) Delete "Manage Media" button and move it to a tab in "Edit" 3) Enable "Permission" & "Manage Media" and provide read-only privilege of "General", "Storage", "Interface" when a VM is running. 4) Enable "General", "Storage", "Interface", "Permission" and provide read-only privilege of "Manage Media"when a VM is not running. Mocks are added below: Delete "Manage Media" and enable "Edit" all the time. When a VM is running, tabs are presented: When a VM is not running, tabs are presented all like what is right now only with a new tab of "Manage Media" read-only: Any comment is welcomed Best Regards Wang Wen

3 6

RFC: Asynchronous event notify
by Wen Wang 19 Aug '14

19 Aug '14

Hi all, Back-end: STOMP <http://stomp.github.com/> is a simple text-orientated messaging protocol, based on which, we can accomplish the "TCP for the web". What we need is a message server and a client that communicate with the server. We can send messages to server using this protocol and receive messages from server, which needs a subscription to the server first and then server gives the callback. Here are the possible STOMP servers: Apache ActiveMQ the most popular and powerful open source messaging and Integration Patterns server Apache Apollo a redesigned version of ActiveMQ CoilMQ a lightweight pure Python STOMP broker inspired by StompServer Gozirra a lightweight Java STOMP broker HornetQ puts the buzz in messaging MorbidQ a STOMP publish/subscribe server with absolutely no potential to cluster RabbitMQ an Erlang-based, multi-protocol broker with full support for STOMP via a plugin Sprinkle written in Python and runs on Unix type platforms Stampy a Java implementation of the STOMP 1.2 specification StompConnect provides a bridge to any other JMS provider StompServer a lightweight pure Ruby STOMP server And the client: pyactivemq module for communicating with the ActiveMQ message broker stomper a client implementation of the STOMP protocol stompest a full-featured STOMP implementation for Python including both synchronous and asynchronous clients stompy implementation of the STOMP protocol in Python stomp.py a Python client library which can also be run as a standalone, command-line client for testing. Front-end: As I mentioned before. Front-end only change the way that the long time task communicate with the back-end. UI should look just the same with a more enhanced display. Also, more function will be enabled according to this like we can enable actions when generating a debug report, etc. Best Regards Wang Wen

1 0

[RFC] upload ISO to OOTB pool
by Royce Lv 18 Aug '14

18 Aug '14

1. Backend: (1)API definition: POST /storagepools/isos/storagevolumes/upload {'file': fileobject} -- This is from backend view, as cherrypy's embedded support wraps fileobject. REF:http://docs.cherrypy.org/en/latest/pkg/cherrypy.tutorial.html?highlight… (2) implementation: We can get the file handler from cherrypy's embedded scheme, and use it to read and write to a local file, ref: https://groups.google.com/forum/#!topic/cherrypy-users/xGvxBGgQ90k The only thing we need to concern at backend is the file size, cherrypy demo has proposed a example leverage cgi lib: http://tools.cherrypy.org/wiki/DirectToDiskFileUpload 2. For UI, we need to supply user with a form which input type is 'file', or we construct formdata in ajax(for IE only supported in IE10+): REF: http://stackoverflow.com/questions/6974684/how-to-send-formdata-objects-wit… 3. To support the progress bar in UI, we can utilize resumable js: http://github.com/23/resumable.js

2 2

[RFC] Create template from VM
by Rodrigo Trujillo 18 Aug '14

18 Aug '14

Complementing what Aline has already pointed (thanks Aline) === Create template from VM === This will use the same backing storage mechanism used to create a template from a IMG file. POST /templates {'name': <template-name>, 'vm': <vm-name>} ** change 'create' in src/kimchi/models/template.py: - check if template is based on ISO or VM - fetch VM information - create new LibvirtVMTemplate ** change api.json - Documentation ** New error messages UI: 1) When creating a template: Add an option "From guest"; then list all guests to user choose one or multiples and do the requests ** Add the new option in /ui/pages/template-add.html.tmpl <a id="iso-local" class="local">$_("Local ISO Image")</a> ... <a id="iso-remote" class="remote">$_("Remote ISO Image")</a> ---> <a id="guest-template" class="guest">$_("From Guest")</a> <------- NEW ** List VMs and allow select more then one. (use same behaviour like in multiple local or remote isos )

1 0

[PATCH v2 0/1] UI-set-ticket-password
by Simon Jin 18 Aug '14

18 Aug '14

V2-V1: - Put new password input box on 'general' tab instead of being a sperate tab. - Rename the input label as 'Console password'. Simon Jin (1): UI: set ticket password ui/css/theme-default/guest-edit.css | 10 +++++----- ui/js/src/kimchi.guest_edit_main.js | 4 ++++ ui/pages/guest-edit.html.tmpl | 13 +++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) -- 1.8.5.3

2 2

Kimchi 1.3 Sprint 2 Overview
by Aline Manera 18 Aug '14

18 Aug '14

Hi all, As agreed in the last scrum meeting (http://kimchi-project.github.io/kimchi/meetings/kimchi.scrum.2014-08-13-13.…) I am sending to you an overview about the sprint 2 tasks. That way everyone can be aware of what is expected in each task and we don't block the UI development. Just to make clear, this is my view on each task! Maybe you - the task owner - have a different view on that. In this case, share your ideas with us. And *don't forget to send a RFC, V1 patch, UI mockup *or something related to your task by *next Monday (08/18)* This email is just a summary to motivate you! ;-) *ISO pool: Support to download ISO from URL (vianac)* The idea here is to provide a way to user download a ISO from URL to the OOTB pool (ISO pool) POST /storagepools/ISO/storagevolumes/ {'name': <vol-name>, 'url': <http|https|ftp://url>} - name can be optional. We can generate one automatically based on ISO path when any name is provided by user. - url is required. Questions: - Which protocols will we support? http, https, ftp? Any other? - About the UI, how do we show this feature to user? Basically we have 2 options: 1) In the storage tab: Add an option "Add ISO" to the ISO pool (or any pool ?); get the URL and display a progress bar. 2) While creating a template: Add an option "Download ISO"; get the URL and display a progress bar. When the download is completed, we create a template using the new ISO. I prefer the first option (storage tab) as it can also be used for upload ISO (see below) *ISO pool: Support to upload ISO* This has a similar idea from downloading ISO from URL, but instead of providing a URL the user will select a local file on client side. POST /storagepools/ISO/storagevolumes/ {'name': <vol-name>, 'filepath': filepath} For the UI we also have the same 2 options from downloading ISO from URL feature I prefer the first one (storage tab) as we can use the same UI for both cases, download and upload. While selection "Add ISO" option, a new dialog will be displayed with a radio box: a browser input box (for upload) and a simple input box for URL (for download). The user can only select one option and confirm the operation. *Create template from VM (rotru)* This will use the same backing storage mechanism used to create a template from a IMG file. POST /templates {'name': <template-name>, 'vm': <vm-name>} About the UI: We have 2 options: 1) When creating a template: Add an option "From guest"; then list all guests to user choose one (or multiples ? ) and do the requests 2) On guests Actions menu Add an option "Create template" and do the request I prefer the first option (while creating a template) *Discover Kimchi peers(alinefm)* This will use openSLP to register and discover Kimchi peers in the same network. GET /peers will return the Kimchi peers [{server: "https://1.2.3.4:8001"}, {server: "https://1.2.3.5:8001"}...] I think this feature should be optional, ie, we will have a config file entry that can be enabled/disabled - as this feature is not critical for virtualization and requires additional software installation (openSLP) and configuration. federation = enable|disable When enabled, the kimchi server will be register in the openSLP tool and when requesting /peers we will search for peers When disabled, /peers will return an empty list. Maybe it would be good to also display a message on UI "Federation feature is disabled for your Kimchi server." To display that message, we need to update /config/capabilities to also return this info. GET /config/capabilities { ... federation: enable|disable } *Migration(Simon Jin)* This task was added after we have finished the 1.3 Plan. So it would be difficult to accommodate the UI for it in out current plan. So I'd say I only expect to have the backend done for 1.3 release. POST /vms/<name>/migrate {server: <other-kimchi-server-ip>} *Asynchronous event notify(Sheldon Feng/Zhengsheng Zhou)[backend]* *Asynchronous event notify(WenWang)[UI]* This is an important and big task. But I am not sure we will be able to finish it on time for 1.3 release. We have already started some discussion on ML "[Kimchi-devel] [RFC] Improve task management for kimchi" (http://lists.ovirt.org/pipermail/kimchi-devel/2014-June/006230.html) *Authorization: Allow admin user change permission settings when VM is running (WenWang) *The idea is display the same "Edit" dialog view when vm is running or not. And when vm is running only enable the information that can be updated with running vm for editing. That way we eliminate the "Manage Media" option and keep the UI consistent. And also provide a way to user checks the vm configuration (https://github.com/kimchi-project/kimchi/issues/387) *VM ticket: update novnc/spice code (sheldon)* POST /vms/<name>/connect will automatically set a random console password for the VM and sets its expiration time to 10 seconds later. When accessing the console URL, we need to pass the password as a parameter (password=...) so noVNC/Spice can do the connection to the guest console. *Display iSCSI targets when iSCSI server is provided (backend done in 3c6c5c) (Yu Xin)* It is similar to what we did for NFS servers. But in this case we will list the iSCSI targets for a given server. GET /storageservers?_target_type=iscsi [ { "host":"127.0.0.1" "port":"3260" } ] GET /storageservers/<server>/storagetargets?_target_type=iscsi&_server_port=<port> [ { "host":"127.0.0.1", "target":"iqn.2003-01.org.linux-iscsi.localhost.x8664:sn.edb1a004dc57", "target_type":"iscsi" } ] ----------- And thanks for your patience if you were reading this line now! :-) I know it is a big email but it could not be different based on the tasks we have for sprint 2. Feel free to use it as base for your RFC email. I am looking forward to see all that done. Regards, Aline Manera

4 9

[PATCH RFC] Discover Kimchi peers using openSLP
by Aline Manera 18 Aug '14

18 Aug '14

GET /peers [ "https://ubuntu-vm:8001", "https://rhel-vm:8001", ] How to test it? - Install openslp and openslp-server - Start opnslp service: servicd slpd start - Make sure to open openSLP port (427 UDP and TCP) on firewall I tested it using VMs as they are in the same host network. TODO: #1: Add option on Kimchi config file to enable/disable this feature #2: Update /config/capabilities to return if federation is enabled or not GET /config/capabilities { ... federation: enable|disable } #3: Create README-federation file to provide details on how to enable this feature #4: Update API.md, mockmodel and test cases Aline Manera (1): Discover Kimchi peers using openSLP src/kimchi/control/peers.py | 29 ++++++++++++++++++++++++++ src/kimchi/model/peers.py | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

2 3

[PATCH] Fix UI: Show proper message when detaching a guest storage
by Rodrigo Trujillo 14 Aug '14

14 Aug '14

Whenever an user tries to detach a storage from a guest, the confirmation message always contains "CDROM". This patch fix this problem, so when the storage type is "disk", it shows the right message. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 ++ ui/pages/guest-edit.html.tmpl | 4 ++-- ui/pages/i18n.json.tmpl | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 7d24b44..01d8045 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -107,6 +107,8 @@ kimchi.guest_edit_main = function() { confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; + if ($(this).data('type') == "disk") + settings['content'] = i18n['KCHVMCD6009M']; var dev = $(this).data('dev'); kimchi.confirm(settings, function() { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index f24f7de..ed7ddeb 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -169,7 +169,7 @@ title='$_("Replace")'> </button> <button class="guest-edit-cdrom-button detach" - data-vm="{vm}" data-dev="{dev}" + data-vm="{vm}" data-dev="{dev}" data-type="{type}" title='$_("Detach")'> </button> <button class="guest-edit-cdrom-button save hidden" @@ -213,7 +213,7 @@ </span> <span class="action-area"> <button class="guest-edit-cdrom-button detach" - data-vm="{vm}" data-dev="{dev}" + data-vm="{vm}" data-dev="{dev}" data-type="{type}" title="$_("Detach")"> </button> </span> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 697f946..ccfb081 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -135,6 +135,7 @@ "KCHVMCD6006M": "$_("Successfully attached!")", "KCHVMCD6007M": "$_("Successfully replaced!")", "KCHVMCD6008M": "$_("Successfully detached!")", + "KCHVMCD6009M": "$_("This disk will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")", -- 1.9.3

3 2

[PATCHv2] Refactor vmstorage name generation
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We generated all storage name with 'hd' prefix, which is not proper for scsi and virtio disk. So refactor name generation to produce proper device name. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..513f756 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -38,6 +38,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +PREFIX_MAP = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} def _get_device_bus(dev_type, dom): @@ -140,17 +141,8 @@ class VMStoragesModel(object): def create(self, vm_name, params): dom = VMModel.get_vm(vm_name, self.conn) - # Use device name passed or pick next - dev_name = params.get('dev', None) - if dev_name is None: - params['dev'] = self._get_storage_device_name(vm_name) - else: - devices = self.get_list(vm_name) - if dev_name in devices: - raise OperationFailed( - 'KCHVMSTOR0004E', - {'dev_name': dev_name, 'vm_name': vm_name}) - + params['bus'] = _get_device_bus(params['type'], dom) + self._get_storage_device_name(vm_name, params) # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' @@ -171,7 +163,6 @@ class VMStoragesModel(object): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) - params['bus'] = _get_device_bus(params['type'], dom) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -187,16 +178,27 @@ class VMStoragesModel(object): raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return params['dev'] - def _get_storage_device_name(self, vm_name): - dev_list = [dev for dev in self.get_list(vm_name) - if dev.startswith('hd')] - if len(dev_list) == 0: - return 'hda' - dev_list.sort() - last_dev = dev_list.pop() - # TODO: Improve to device names "greater then" hdz - next_dev_letter_pos = string.ascii_lowercase.index(last_dev[2]) + 1 - return 'hd' + string.ascii_lowercase[next_dev_letter_pos] + def _get_storage_device_name(self, vm_name, params): + if params.get('dev') is None: + bus_prefix = PREFIX_MAP[params['bus']] + dev_list = [dev for dev in self.get_list(vm_name) + if dev.startswith(bus_prefix)] + if len(dev_list) == 0: + params['dev'] = bus_prefix + 'a' + else: + dev_list.sort() + last_dev = dev_list.pop() + # TODO: Improve to device names "greater then" hdz + next_dev_letter_pos =\ + string.ascii_lowercase.index(last_dev[2]) + 1 + params['dev'] =\ + bus_prefix + string.ascii_lowercase[next_dev_letter_pos] + + devices = self.get_list(vm_name) + if params['dev'] in devices: + raise OperationFailed( + 'KCHVMSTOR0004E', + {'dev_name': params['dev'], 'vm_name': vm_name}) def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) -- 1.8.3.2

2 1

[PATCH] Fix Key Error when editing CD ROM path
by Christy Perez 14 Aug '14

14 Aug '14

lxml only accepts strings as parameters when looking up xml elements. The port for remote ISO was being passed in as an int, and a KeyError was thrown. This patch just casts the ints to strings for the lookups. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index cd985fa..5543f40 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -68,7 +68,8 @@ def _get_storage_xml(params, ignore_source=False): if src_type == 'network': output = urlparse.urlparse(params.get('path')) host = E.host(name=output.hostname, port= - output.port or socket.getservbyname(output.scheme)) + str(output.port) or + str(socket.getservbyname(output.scheme))) source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) -- 1.9.3

3 4

[PATCH] Refactor vmstorage name generation
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We generated all storage name with 'hd' prefix, which is not proper for scsi and virtio disk. So refactor name generation to produce proper device name. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..9ae8584 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -38,6 +38,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +prefix_map = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} def _get_device_bus(dev_type, dom): @@ -140,17 +141,8 @@ class VMStoragesModel(object): def create(self, vm_name, params): dom = VMModel.get_vm(vm_name, self.conn) - # Use device name passed or pick next - dev_name = params.get('dev', None) - if dev_name is None: - params['dev'] = self._get_storage_device_name(vm_name) - else: - devices = self.get_list(vm_name) - if dev_name in devices: - raise OperationFailed( - 'KCHVMSTOR0004E', - {'dev_name': dev_name, 'vm_name': vm_name}) - + params['bus'] = _get_device_bus(params['type'], dom) + self._get_storage_device_name(vm_name, params) # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' @@ -171,7 +163,6 @@ class VMStoragesModel(object): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) - params['bus'] = _get_device_bus(params['type'], dom) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -187,16 +178,27 @@ class VMStoragesModel(object): raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return params['dev'] - def _get_storage_device_name(self, vm_name): - dev_list = [dev for dev in self.get_list(vm_name) - if dev.startswith('hd')] - if len(dev_list) == 0: - return 'hda' - dev_list.sort() - last_dev = dev_list.pop() - # TODO: Improve to device names "greater then" hdz - next_dev_letter_pos = string.ascii_lowercase.index(last_dev[2]) + 1 - return 'hd' + string.ascii_lowercase[next_dev_letter_pos] + def _get_storage_device_name(self, vm_name, params): + if params.get('dev') is None: + bus_prefix = prefix_map[params['bus']] + dev_list = [dev for dev in self.get_list(vm_name) + if dev.startswith(bus_prefix)] + if len(dev_list) == 0: + params['dev'] = bus_prefix + 'a' + else: + dev_list.sort() + last_dev = dev_list.pop() + # TODO: Improve to device names "greater then" hdz + next_dev_letter_pos =\ + string.ascii_lowercase.index(last_dev[2]) + 1 + params['dev'] =\ + bus_prefix + string.ascii_lowercase[next_dev_letter_pos] + + devices = self.get_list(vm_name) + if params['dev'] in devices: + raise OperationFailed( + 'KCHVMSTOR0004E', + {'dev_name': params['dev'], 'vm_name': vm_name}) def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) -- 1.8.3.2

2 2

[PATCHv2] Reject cdrom update when protocol is not supported by libvirt
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, fix pep8. When remote iso protocol is not supported by libvirt, even if we work around by qemu command, it will mess up device list logic. So reject this use case. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 4 ++++ tests/test_model.py | 16 +++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..f5ef275 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -255,6 +255,7 @@ messages = { "KCHVMSTOR0015E": _("Cannot lookup disk path information by given pool/volume: %(error)s"), "KCHVMSTOR0016E": _("Volume already been used by other vm"), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), + "KCHVMSTOR0018E": _("Remote ISO update/attach is not supported by your libvirt version"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index e5be17c..72bdccc 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError from kimchi.exception import OperationFailed +from kimchi.model.config import CapabilitiesModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag @@ -38,6 +39,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +caps = CapabilitiesModel() def _get_device_bus(dev_type, dom): @@ -69,6 +71,8 @@ def _get_storage_xml(params, ignore_source=False): output = urlparse.urlparse(params.get('path')) port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) + if output.scheme not in caps.libvirt_stream_protocols: + raise InvalidOperation("KCHVMSTOR0018E") source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) diff --git a/tests/test_model.py b/tests/test_model.py index 7fd0f00..ef0a0e6 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -29,6 +29,7 @@ import tempfile import threading import time import unittest +import urlparse import uuid @@ -38,6 +39,7 @@ import utils from kimchi import netinfo from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.featuretests import FeatureTests from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext @@ -397,13 +399,25 @@ class ModelTests(unittest.TestCase): valid_remote_iso_path = utils.get_remote_iso_path() cdrom_args = {"type": "cdrom", "path": valid_remote_iso_path} + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorages_create, + vm_name, cdrom_args) + return + cdrom_dev = inst.vmstorages_create(vm_name, cdrom_args) storage_list = inst.vmstorages_get_list(vm_name) self.assertEquals(prev_count + 1, len(storage_list)) # Update remote-backed cdrom with the same ISO + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorage_update, + vm_name, cdrom_dev, + {'path': valid_remote_iso_path}) + return inst.vmstorage_update(vm_name, cdrom_dev, - {'path': valid_remote_iso_path}) + {'path': valid_remote_iso_path}) cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev) cur_cdrom_path = re.sub(":80/", '/', cdrom_info['path']) self.assertEquals(valid_remote_iso_path, cur_cdrom_path) -- 1.8.3.2

4 3

[PATCH] Remote ISO attachment: fix UI to accept remote ISO link for cdrom attachment
by lvroyce＠linux.vnet.ibm.com 13 Aug '14

13 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> UI just accept local ISO as cdrom attachment before, enable remote ISO link for it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 1f4c4bd..a8c5acb 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -109,7 +109,7 @@ kimchi.guest_storage_add_main = function() { }); var validateCDROM = function(settings) { - if (/^(\/.*)+$/.test(settings['path'])) + if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])) return true; else { kimchi.message.error.code('KCHVMSTOR0001E'); -- 1.8.3.2

2 2

[PATCH v2 0/3] Update remote CD ROM
by Christy Perez 13 Aug '14

13 Aug '14

This patchset adds changes to allow a user to update a CD ROM created with a remote ISO. It fixes a KeyError issue, improves the way a remote ISO file is verified, and adds unit tests. Note: Currently updating a CD ROM created with a local iso using a remote ISO is not supported. This patchset does not address that issue, but does add a test for it. This patchset is primarily to correct the KeyError and prevent a regression when trying to update a remote ISO's file. Christy Perez (3): Fix Key Error when editing CD ROM path Fix verification of remote ISO Add unit tests for remote-backed CD ROM updates. src/kimchi/model/vmstorages.py | 2 +- src/kimchi/utils.py | 21 +++++++++++----- tests/test_model.py | 55 +++++++++++++++++++++++++++++++++++++++++- tests/utils.py | 21 +++++++++++++++- 4 files changed, 90 insertions(+), 9 deletions(-) -- 1.9.3

3 9

[PATCH] UI: refactor guest edit code.
by shaohef＠linux.vnet.ibm.com 13 Aug '14

13 Aug '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> We don not need a special "save" button for permission form. All form in guest edit tab can share the same "save" button. also, we will add a password form, it will also share this button. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 5 ----- ui/js/src/kimchi.guest_edit_main.js | 40 +++++++++++++++++++++---------------- ui/pages/guest-edit.html.tmpl | 3 --- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 1092cc9..74c2237 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -261,8 +261,3 @@ width: 46%; float: right; } - -#form-guest-edit-permission-save { - float: right; - margin-right: 10px; -} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 38a2bc0..7d24b44 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -19,13 +19,11 @@ kimchi.guest_edit_main = function() { var buttonContainer = $('#action-button-container'); $('#guest-edit-tabs').tabs({ beforeActivate: function(event, ui) { + var display_list = ['form-guest-edit-general', 'form-guest-edit-permission'] $(buttonContainer).addClass('hidden'); - $("#form-guest-edit-permission-save").addClass('hidden'); var deactivated = ui['newPanel']; - if($(deactivated).attr('id') === 'form-guest-edit-general') { + if(display_list.indexOf($(deactivated).attr('id')) >= 0) { $(buttonContainer).removeClass('hidden'); - }else if($(deactivated).attr('id') === 'form-guest-edit-permission'){ - $("#form-guest-edit-permission-save").removeClass('hidden'); } } }); @@ -335,18 +333,6 @@ kimchi.guest_edit_main = function() { filterNodes("", $("#permission-avail-users")); filterNodes("", $("#permission-avail-groups")); }); - $("#form-guest-edit-permission-save").on("click", function(){ - var content = { users: [], groups: [] }; - $("#permission-sel-users").children().each(function(){ - content.users.push($("label", this).text()); - }); - $("#permission-sel-groups").children().each(function(){ - content.groups.push($("label", this).text()); - }); - kimchi.updateVM(kimchi.selectedGuest, content, function(){ - kimchi.window.close(); - }); - }); }; var initContent = function(guest) { @@ -393,7 +379,7 @@ kimchi.guest_edit_main = function() { kimchi.retrieveVM(kimchi.selectedGuest, initContent); - var submitForm = function(event) { + var generalSubmit = function(event) { $(saveButton).prop('disabled', true); var data=$('#form-guest-edit-general').serializeObject(); if(data['memory']!=undefined) { @@ -410,7 +396,27 @@ kimchi.guest_edit_main = function() { kimchi.message.error(err.responseJSON.reason); $(saveButton).prop('disabled', false); }); + } + var permissionSubmit = function(event) { + var content = { users: [], groups: [] }; + $("#permission-sel-users").children().each(function(){ + content.users.push($("label", this).text()); + }); + $("#permission-sel-groups").children().each(function(){ + content.groups.push($("label", this).text()); + }); + kimchi.updateVM(kimchi.selectedGuest, content, function(){ + kimchi.window.close(); + }); + } + + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + var submit_map = {0: generalSubmit, 3:permissionSubmit}; + var submitForm = function(event) { + var current = $('#guest-edit-tabs').tabs( "option", "active" ); + var submitFun = submit_map[current]; + submitFun && submitFun(event); event.preventDefault(); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 1c1d7d4..f24f7de 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -150,9 +150,6 @@ <span class="text">$_("Save")</span> </button> </div> - <button id="form-guest-edit-permission-save" class="btn-normal hidden"> - <span class="text">$_("Save")</span> - </button> </footer> </div> <script id="cdrom-row-tmpl" type="text/html"> -- 1.9.3

6 10

[PATCH v4 0/3] Update Remote CD ROM
by Christy Perez 13 Aug '14

13 Aug '14

Aline pointed out some test failures I'd assumed were the same as failures on the mater branch, but were actually as result of the changes to check for valid url paths. The fix was causing a false negative to be returned for valid repository URLs. The only change in this patchset versus the previous (v3) version is 2/3: Fix verification of remote ISO. 1/3 and 3/3 are the same as version 3. Christy Perez (3): Fix Key Error when editing CD ROM path Fix verification of remote ISO Add unit tests for remote-backed CD ROM updates. src/kimchi/model/vmstorages.py | 2 +- src/kimchi/utils.py | 26 ++++++++++++++++++++++---- tests/test_model.py | 23 ++++++++++++++++++++++- tests/utils.py | 20 +++++++++++++++++++- 4 files changed, 64 insertions(+), 7 deletions(-) -- 1.9.3

2 6

[PATCH v5 1/3] Fix Key Error when editing CD ROM path
by Christy Perez 13 Aug '14

13 Aug '14

lxml only accepts strings as parameters when looking up xml elements. The port for remote ISO was being passed in as an int, and a KeyError was thrown. This patch just casts the ints to strings for the lookups. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..e5be17c 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -67,7 +67,7 @@ def _get_storage_xml(params, ignore_source=False): # Working with url paths if src_type == 'network': output = urlparse.urlparse(params.get('path')) - port = output.port or socket.getservbyname(output.scheme) + port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) source = E.source(protocol=output.scheme, name=output.path) source.append(host) -- 1.9.3

2 3

[PATCH V3] UI enhancement: Request /config/capabilities as soon as possible
by Aline Manera 12 Aug '14

12 Aug '14

V2 - V3: - Make host tab uses the cached capabilities values (Cristian) V1 - V2: - Make sure kimchi.capabilities is properly set before using its value (Cristian) I prefered to do it this way because making a sync request will prevent the full UI to load even for some seconds. Aline Manera (1): UI enhancement: Request /config/capabilities as soon as possible ui/js/src/kimchi.host.js | 21 +++++++++++-------- ui/js/src/kimchi.main.js | 8 ++++++++ ui/js/src/kimchi.template_add_main.js | 37 ++++++++++++++++++++-------------- ui/js/src/kimchi.template_edit_main.js | 20 ++++++++++-------- 4 files changed, 55 insertions(+), 31 deletions(-) -- 1.9.3

3 4

[PATCH] Change default environment configuration to production mode.
by Paulo Vital 12 Aug '14

12 Aug '14

Changed the default environment configuration present in the final files src/kimchi.conf and src/kimchi.config.py from 'development' to 'production' mode. This modification will prevent that debugging traces be printed in the front-end when something goes wrong. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in index 369f2c3..ed0270d 100644 --- a/src/kimchi.conf.in +++ b/src/kimchi.conf.in @@ -24,7 +24,7 @@ #ssl_key = # Running environment of the server -#environment = development +#environment = production [logging] # Log directory diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 68c8a4d..fca32ee 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -253,7 +253,7 @@ def _get_config(): config.set("server", "cherrypy_port", "8010") config.set("server", "ssl_cert", "") config.set("server", "ssl_key", "") - config.set("server", "environment", "development") + config.set("server", "environment", "production") config.add_section("logging") config.set("logging", "log_dir", paths.log_dir) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) -- 1.8.3.1

3 4

[PATCH] Reject cdrom update when protocol is not supported by libvirt
by lvroyce＠linux.vnet.ibm.com 12 Aug '14

12 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Based on Christy's patchset: [Kimchi-devel] [PATCH v3 1/3] Fix Key Error when editing CD ROM path When remote iso protocol is not supported by libvirt, even if we work around by qemu command, it will mess up device list logic. So reject this use case. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 5 ++++- tests/test_model.py | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..f5ef275 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -255,6 +255,7 @@ messages = { "KCHVMSTOR0015E": _("Cannot lookup disk path information by given pool/volume: %(error)s"), "KCHVMSTOR0016E": _("Volume already been used by other vm"), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), + "KCHVMSTOR0018E": _("Remote ISO update/attach is not supported by your libvirt version"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index e5be17c..7dc8800 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError from kimchi.exception import OperationFailed +from kimchi.model.config import CapabilitiesModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag @@ -38,7 +39,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] - +caps = CapabilitiesModel() def _get_device_bus(dev_type, dom): try: @@ -69,6 +70,8 @@ def _get_storage_xml(params, ignore_source=False): output = urlparse.urlparse(params.get('path')) port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) + if output.scheme not in caps.libvirt_stream_protocols: + raise InvalidOperation("KCHVMSTOR0018E") source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) diff --git a/tests/test_model.py b/tests/test_model.py index 7fd0f00..dc56676 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -29,6 +29,7 @@ import tempfile import threading import time import unittest +import urlparse import uuid @@ -38,6 +39,7 @@ import utils from kimchi import netinfo from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.featuretests import FeatureTests from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext @@ -397,11 +399,22 @@ class ModelTests(unittest.TestCase): valid_remote_iso_path = utils.get_remote_iso_path() cdrom_args = {"type": "cdrom", "path": valid_remote_iso_path} + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorages_create, + vm_name, cdrom_args) + return + cdrom_dev = inst.vmstorages_create(vm_name, cdrom_args) storage_list = inst.vmstorages_get_list(vm_name) self.assertEquals(prev_count + 1, len(storage_list)) # Update remote-backed cdrom with the same ISO + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorage_update, + vm_name, cdrom_dev, {'path': valid_remote_iso_path}) + return inst.vmstorage_update(vm_name, cdrom_dev, {'path': valid_remote_iso_path}) cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev) -- 1.8.3.2

3 3

[PATCH] Nit: refactor vm xml format
by lvroyce＠linux.vnet.ibm.com 12 Aug '14

12 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Move qemu namespace from xml top level to cdrom generation, so that future cdrom update can just modify this part without affect top level xml. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..c2101db 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -150,7 +150,7 @@ class VMTemplate(object): """ qemu_stream_cmdline = """ - <qemu:commandline> + <qemu:commandline %(ns)s> <qemu:arg value='-drive'/> <qemu:arg value='file=%(url)s,if=none,id=drive-%(bus)s0-1-0,\ readonly=on,format=raw'/> @@ -179,7 +179,7 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> url = protocol + "://" + hostname + ":" + str(port) + url_path if protocol not in libvirt_stream_protocols: - return qemu_stream_cmdline % {'url': url, 'bus': bus} + return qemu_stream_cmdline % {'url': url, 'bus': bus, 'ns': QEMU_NAMESPACE} params = {'protocol': protocol, 'url_path': url_path, 'hostname': hostname, 'port': port, 'dev': dev, 'bus': bus} @@ -365,7 +365,6 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> params['uuid'] = vm_uuid params['networks'] = self._get_networks_xml() params['input_output'] = self._get_input_output_xml() - params['qemu-namespace'] = '' params['cdroms'] = '' params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') @@ -389,13 +388,12 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> if not urlparse.urlparse(self.info.get('cdrom', "")).scheme in \ libvirt_stream_protocols and \ params.get('iso_stream', False): - params['qemu-namespace'] = QEMU_NAMESPACE params['qemu-stream-cmdline'] = cdrom_xml else: params['cdroms'] = cdrom_xml xml = """ - <domain type='%(domain)s' %(qemu-namespace)s> + <domain type='%(domain)s'> %(qemu-stream-cmdline)s <name>%(name)s</name> <uuid>%(uuid)s</uuid> -- 1.8.3.2

2 1