August 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Added util method for formatting timestamp as per locale.
by pkulkark＠linux.vnet.ibm.com 20 Oct '16

20 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index dcec823..121a51f 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -258,6 +258,13 @@ wok.numberLocaleConverter = function numberConverter(number, locale){ return number; } +wok.timestampConverter = function timestampconverter(timestamp, locale){ + var dte = new Date(timestamp) + var options = { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', + minute: 'numeric', second: 'numeric', timeZoneName: 'short'}; + return dte.toLocaleString(locale, options); +} + wok.localeConverters = { "date-locale-converter": { to: function(date){ -- 2.1.0

3 2

[PATCH v2][Kimchi 0/2] Do not delete storage pool with storage volumes assigned to guests
by Ramon Medeiros 06 Sep '16

06 Sep '16

Changes: v2: Use path to determine if volume comes from storage pool Do not use "get_disk_used_by". It will be usefull if we start querying by volumes. Since, we cannot list volumes with inactivate storage pools. Ramon Medeiros (2): Do not remove storagepools linked to guests Update tests i18n.py | 1 + model/storagepools.py | 22 ++++++++++++++++++++++ tests/test_rest.py | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) -- 2.5.5

3 6

[PATCH] [Kimchi] Storagebuttons not behaving properly
by Socorro Stoppler 06 Sep '16

06 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch fixes the behavior of the actions - Deactivate and Undefine - taken on the storage pools listed in the Storage tab. Prior to the patch, even if the menu item was disabled, the user is still able to click on it and perform the action. Now clicking on those disabled menu items does not do anything which is the intended behavior. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..ea58012 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,6 +310,14 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var in_use = $pool.data('inuse'); + if ('active' === $pool.data('stat') || in_use) { + $pool.parent().addClass('disabled'); + return false; + } else { + $pool.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6001M'], @@ -339,6 +347,15 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var $poolDeactivate = $(this); + var in_use = $poolDeactivate.data('inuse'); + if (in_use) { + $poolDeactivate.parent().addClass('disabled'); + return false; + } else { + $poolDeactivate.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6012M'], -- 2.7.4

2 2

[PATCH] [Wok] Removing Kimchi Peers dropdown from Wok navbar
by sguimaraes943＠gmail.com 06 Sep '16

06 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch removes Peers dropdown from Wok navbar Samuel Guimarães (1): Removing Kimchi Peers dropdown from Wok navbar ui/js/src/wok.main.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) -- 2.5.5

2 3

[PATCH v3][Kimchi 0/2] Allow vm update graphics type
by Ramon Medeiros 06 Sep '16

06 Sep '16

Changes: v3: Tested patch on Fedora, RHEL, Ubuntu and Opensuse - working correctly Add rest test v2: Fix typos Add tests Ramon Medeiros (2): Issue #836: Allow user change guest graphics type Create test to verify graphics type change API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 2 +- model/vms.py | 10 ++++++++++ tests/test_model.py | 18 +++++++----------- tests/test_rest.py | 10 ++++++++++ 6 files changed, 35 insertions(+), 12 deletions(-) -- 2.5.5

3 6

[PATCH] [Kimchi] Issue #921: Peers button disappears
by sguimaraes943＠gmail.com 05 Sep '16

05 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Additional patches are necessary (Wok and Gingerbase). Samuel Guimarães (1): Issue #921: Peers button disappears root.py | 6 ++++ ui/js/src/kimchi.peers.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 ui/js/src/kimchi.peers.js -- 2.5.5

2 3

[PATCH V1] [Kimchi] For s390x architecture, serial type is not validated in vm xml as as not supported on s390x.
by archus＠linux.vnet.ibm.com 05 Sep '16

05 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> This changes ensure that in vm xml serial type is not validated for s390x as not supported in s390x architecture and only console type is validated in _vm_check_serial. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- model/vms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 7f607f5..d3d2cb1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1486,7 +1486,8 @@ class VMModel(object): xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) expr = "/domain/devices/serial/@type" - if not xpath_get_text(xml, expr): + # on s390x serial is not supported + if platform.machine() != 's390x' and not xpath_get_text(xml, expr): return False expr = "/domain/devices/console/@type" -- 2.7.4

3 6

[PATCH V1] [Kimchi 0/2] Support for VM ifaces on s390x/s390 architecture.
by archus＠linux.vnet.ibm.com 05 Sep '16

05 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes to support additional parameters 'source' of type 'macvtap' or 'ovs' for VM ifaces only on s390x/s390 architecture. 2) Corresponding API.md changes. *** BLURB HERE *** Archana Singh (2): Updated code to support VM ifaces on s390x/s390 architecture. Updated API.md for addition paramters support for VM ifaces API on s390x/s390 architecture. API.json | 16 +++++++++++--- docs/API.md | 14 ++++++++++-- i18n.py | 9 +++++++- model/vmifaces.py | 60 +++++++++++++++++++++++++++++++++++++++++++++------ xmlutils/interface.py | 8 +++++++ 5 files changed, 94 insertions(+), 13 deletions(-) -- 2.7.4

3 5

[PATCH V2] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 35 +++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 ++++++++++ i18n.py | 6 +++++ model/templates.py | 17 ++++++++++++++ vmtemplate.py | 20 ++++++++++++++++ xmlutils/interface.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 1 deletion(-) -- 2.7.4

4 7

[PATCH V2] [Wok 0/7] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 01 Sep '16

01 Sep '16

V2: rebase with master to fix conflict Lucio Correia (7): Create log_request() method for code simplification Improve plugin lookup by request Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Put failure details into parenthesis Change location of User Requests Log src/wok/asynctask.py | 46 +++++++++++++-- src/wok/config.py.in | 4 ++ src/wok/control/base.py | 75 +++++++++++++----------- src/wok/i18n.py | 2 + src/wok/message.py | 2 +- src/wok/reqlogger.py | 150 +++++++++++++++++++++++++++--------------------- src/wok/root.py | 41 ++----------- src/wok/utils.py | 14 +++-- 8 files changed, 187 insertions(+), 147 deletions(-) -- 1.9.1

2 29

[PATCH v2] [Kimchi] Issue #921: Peers button disappears
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Samuel Guimarães (1): Issue #921: Peers button disappears root.py | 6 ++ ui/js/kimchi.peers.js | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.api.js | 14 ----- ui/pages/i18n.json.tmpl | 4 +- 4 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 ui/js/kimchi.peers.js -- 2.5.5

2 3

[PATCH] [Kimchi 0/2] Kimchi Issues #606 and #939
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> -Issue #939 requires patch "Minor fixes in form fields" applied in Wok -Issue #606 requires patch "Icons for Kimchi issue #606" applied in Wok Samuel Guimarães (2): Issue #939: [UI] Guest tab is not rendered correctly if guests are not in 'running' or ''shutoff' state Issue #606: Change icon to distinguish image generated template and iso generated template ui/css/kimchi.css | 169 +++++++++++--------- ui/css/src/modules/_guests.scss | 147 ++++++++++-------- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_templates.scss | 62 +++++--- ui/js/src/kimchi.template_add_main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 206 +++++++++++++------------ ui/pages/guest.html.tmpl | 6 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 272 +++++++++++++++++---------------- 9 files changed, 485 insertions(+), 386 deletions(-) -- 2.5.5

2 3

[PATCH v2] [Wok] Removing Kimchi Peers dropdown from Wok navbar
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Additional patches are necessary (Kimchi and Gingerbase). Samuel Guimarães (1): Removing Kimchi Peers dropdown from Wok navbar ui/js/src/wok.main.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) -- 2.5.5

2 2

[PATCH 0/2] [Wok] Minor fixes in form fields
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Patches required for issues #606 and #939 Samuel Guimarães (2): Minor fixes in form fields Icons for Kimchi issue #606 ui/css/src/modules/_wok-forms.scss | 11 +++ ui/css/wok.css | 11 +++ ui/images/theme-default/file-o-img.svg | 149 +++++++++++++++++++++++++++++++++ ui/images/theme-default/file-o-iso.svg | 149 +++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+) create mode 100644 ui/images/theme-default/file-o-img.svg create mode 100644 ui/images/theme-default/file-o-iso.svg -- 2.5.5

2 5

[PATCH] [Kimchi] /plugins/kimchi/ovsbridges API
by sureshab＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> As Per RFC: [Kimchi-devel] [RFC] listing of ovs bridges this patch adds new API /plugins/kimchi/ovsbridges to list ovsbridges Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- control/ovsbridges.py | 29 +++++++++++++++++++++++++++++ docs/API.md | 8 ++++++++ model/ovsbridges.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 control/ovsbridges.py create mode 100644 model/ovsbridges.py diff --git a/control/ovsbridges.py b/control/ovsbridges.py new file mode 100644 index 0000000..974e954 --- /dev/null +++ b/control/ovsbridges.py @@ -0,0 +1,29 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import SimpleCollection +from wok.control.utils import UrlSubNode + + +@UrlSubNode("ovsbridges", True) +class OVSBridges(SimpleCollection): + def __init__(self, model): + super(OVSBridges, self).__init__(model) + self.role_key = 'ovsbridges' + self.admin_methods = ['GET'] diff --git a/docs/API.md b/docs/API.md index 7bd677f..49540b9 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1028,3 +1028,11 @@ List of available groups. * **GET**: Return the list of Kimchi peers in the same network (It uses openSLP for discovering) + +### Simple Collection: OVSBridges + +**URI:** /plugins/kimchi/ovsbridges + +**Methods:** + +* **GET**: Return list of OVS bridges of the host. diff --git a/model/ovsbridges.py b/model/ovsbridges.py new file mode 100644 index 0000000..212520f --- /dev/null +++ b/model/ovsbridges.py @@ -0,0 +1,31 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.plugins.gingerbase.netinfo import ovs_bridges + + +class OVSBridgesModel(object): + + def get_list(self): + """ + + Returns: list of ovs bridge names + + """ + return ovs_bridges() -- 1.8.3.1

4 5

[PATCH V2] Issue #992 : Create template on s390x without libvirt storage
by harshalp＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 17 ++++++-- model/storagevolumes.py | 1 - model/templates.py | 27 +++++++++---- model/vms.py | 9 ++++- osinfo.py | 47 ++++++++++++++++++++-- utils.py | 34 ++++++++++++++++ vmtemplate.py | 105 ++++++++++++++++++++++++++++++------------------ 9 files changed, 189 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 7bd677f..d8d191a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -427,6 +427,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path : Storage path to store virtual disks without libvirt * networks *(optional)*: list of networks will be assigned to the new VM. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): @@ -481,6 +482,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path (optional): Either pool or path to store the virtual disks should be specified * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index ea2c4ab..7e60079 100644 --- a/i18n.py +++ b/i18n.py @@ -190,6 +190,9 @@ messages = { "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), + "KCHTMPL0034E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0035E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0036E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..08e6426 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,13 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if 'disks' not in tmpl_defaults or len(tmpl_defaults['disks']) == 0 \ + or (not tmpl_defaults.get('disks')[0].get( + 'pool') and is_s390x()): + # Since libvirt pools are not supported on s390x + # No need to check for default pools on s390x + return + tmpl_defaults.get('disks') default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +445,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 4708674..d721d3b 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -44,7 +44,6 @@ from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 8df8c3b..c749f4b 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -400,15 +402,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index 7f607f5..3ad722e 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1395,6 +1395,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 528cf14..d60cc15 100644 --- a/osinfo.py +++ b/osinfo.py @@ -158,6 +158,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -165,7 +171,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -186,11 +197,39 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + pool_exists = False + path_exists = False + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + path_exists = True + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + pool_exists = True + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + + # If both pool and path don't exist, pick the defaults + if index == len(storage_section.keys()) - 1 and \ + (not pool_exists and not path_exists): + if is_on_s390x: # Special handling for s390x + data['path'] = tmpl_defaults['storage']['disk.0']['path'] + else: + data['pool'] = {"name": '/plugins/kimchi/storagepools/default'} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..0fca191 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0035E", {'err': err}) + + return \ No newline at end of file diff --git a/vmtemplate.py b/vmtemplate.py index babf050..3b9eb32 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,49 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != basic_path_disk)): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0036E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0034E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +233,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +243,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +258,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -447,8 +472,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -499,10 +525,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 1.9.1

3 2

[PATCH] [Kimchi] Storagebuttons not behaving properly
by Socorro Stoppler 01 Sep '16

01 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..ea58012 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,6 +310,14 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var in_use = $pool.data('inuse'); + if ('active' === $pool.data('stat') || in_use) { + $pool.parent().addClass('disabled'); + return false; + } else { + $pool.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6001M'], @@ -339,6 +347,15 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var $poolDeactivate = $(this); + var in_use = $poolDeactivate.data('inuse'); + if (in_use) { + $poolDeactivate.parent().addClass('disabled'); + return false; + } else { + $poolDeactivate.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6012M'], -- 2.7.4

1 1

[PATCH] [Kimchi] Issue #626: Snapshot revert does not release storage volume
by bianca＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited diskutils.py file to remove used_by verification in objstore, now this field will be only verified in the vm when get_disk_used_by is used by StorageVolumeModel lookup. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/diskutils.py | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/model/diskutils.py b/model/diskutils.py index 6faab7c..3b8f441 100644 --- a/model/diskutils.py +++ b/model/diskutils.py @@ -17,7 +17,7 @@ # 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 wok.exception import OperationFailed, NotFoundError +from wok.exception import OperationFailed from wok.utils import wok_log from wok.plugins.kimchi.config import get_kimchi_version @@ -34,34 +34,28 @@ from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks def get_disk_used_by(objstore, conn, path): try: with objstore as session: + used_by = [] + # try to find this volume in existing vm + vms_list = VMsModel.get_vms(conn) + for vm in vms_list: + dom = VMModel.get_vm(vm, conn) + storages = get_vm_disks(dom) + for disk in storages.keys(): + d_info = get_vm_disk_info(dom, disk) + if path == d_info['path']: + used_by.append(vm) try: - used_by = session.get('storagevolume', path)['used_by'] - except (KeyError, NotFoundError): - wok_log.info('Volume %s not found in obj store.' % path) - used_by = [] - # try to find this volume in existing vm - vms_list = VMsModel.get_vms(conn) - for vm in vms_list: - dom = VMModel.get_vm(vm, conn) - storages = get_vm_disks(dom) - for disk in storages.keys(): - d_info = get_vm_disk_info(dom, disk) - if path == d_info['path']: - used_by.append(vm) - try: - session.store('storagevolume', path, - {'used_by': used_by}, - get_kimchi_version()) - except Exception as e: - # Let the exception be raised. If we allow disks' - # used_by to be out of sync, data corruption could - # occour if a disk is added to two guests - # unknowingly. - wok_log.error('Unable to store storage volume id in' - ' objectstore due error: %s', - e.message) - raise OperationFailed('KCHVOL0017E', - {'err': e.message}) + session.store('storagevolume', path, {'used_by': used_by}, + get_kimchi_version()) + except Exception as e: + # Let the exception be raised. If we allow disks' + # used_by to be out of sync, data corruption could + # occour if a disk is added to two guests + # unknowingly. + wok_log.error('Unable to store storage volume id in' + ' objectstore due error: %s', + e.message) + raise OperationFailed('KCHVOL0017E', {'err': e.message}) except Exception as e: # This exception is going to catch errors returned by 'with', # specially ones generated by 'session.store'. It is outside -- 2.7.4

3 3

[PATCH] [Kimchi 0/2] Enhancement to /plugins/kimchi/interfaces
by sureshab＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> Suresh Babu Angadi (2): Enhancement to /plugins/kimchi/interfaces Per RFC: [Kimchi-devel] [RFC] changes to /plugins/kimchi/interfaces * this patch includes backend changes to add '_inuse' filter * Updated API.md to include '_inuse' filter for /interfaces Collection * modified api call to plugins/kimchi/interfaces?_inuse=false in kimchi.api.js, since unused interfaces are used to create virtual network Enhancement to /plugins/kimchi/interfaces modified api calls to /plugins/kimchi/interfaces?_inuse=false in test cases which were referring /plugins/kimchi/interfaces to create virtual network docs/API.md | 3 +++ i18n.py | 1 + model/interfaces.py | 20 ++++++++++++++++---- tests/test_mock_network.py | 4 ++-- tests/test_model_network.py | 4 ++-- tests/test_template.py | 4 ++-- ui/js/src/kimchi.api.js | 2 +- 7 files changed, 27 insertions(+), 11 deletions(-) -- 1.8.3.1

4 8

[PATCH] [Wok 0/7] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 01 Sep '16

01 Sep '16

Lucio Correia (7): Create log_request() method for code simplification Improve plugin lookup by request Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Put failure details into parenthesis Change location of User Requests Log src/wok/asynctask.py | 46 +++++++++++++-- src/wok/config.py.in | 4 ++ src/wok/control/base.py | 75 +++++++++++++----------- src/wok/i18n.py | 2 + src/wok/message.py | 2 +- src/wok/reqlogger.py | 150 +++++++++++++++++++++++++++--------------------- src/wok/root.py | 41 ++----------- src/wok/utils.py | 14 +++-- 8 files changed, 189 insertions(+), 145 deletions(-) -- 1.9.1

1 8

[PATCH v4] [Kimchi] Feature request (#860): Support Guest Autostart
by bianca＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Include 'autostart' option in API.json and vms.py (lookup and update) using libvirt dom.setAutostart to set as true or false. Also edit test_model.py to include those changes and updated API.md file. Also included API tests to test_rest.py in test_edit_vm function. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- API.json | 4 ++++ docs/API.md | 3 +++ model/vms.py | 11 ++++++++--- tests/test_model.py | 6 ++++++ tests/test_rest.py | 18 ++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/API.json b/API.json index a3af02d..8592f3a 100644 --- a/API.json +++ b/API.json @@ -342,6 +342,10 @@ "error": "KCHVM0053E", "type": "boolean" }, + "autostart": { + "description": "Enable/Disable guest autostart", + "type": "boolean" + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/docs/API.md b/docs/API.md index 7bd677f..7c29f04 100644 --- a/docs/API.md +++ b/docs/API.md @@ -151,6 +151,8 @@ server. * bootorder: list of devices in boot order * description: VM description * title: VM title + * autostart: show if autostart is enabled. + * **DELETE**: Remove the Virtual Machine * **PUT**: update the parameters of existing VM * name: New name for this VM (only applied for shutoff VM) @@ -183,6 +185,7 @@ server. * bootmenu: prompts guest bootmenu. Bool type. * description: VM description * title: VM title + * autostart: enable/disable guest autostart (true or false params). * **POST**: *See Virtual Machine Actions* diff --git a/model/vms.py b/model/vms.py index 7f607f5..bb00c09 100644 --- a/model/vms.py +++ b/model/vms.py @@ -80,12 +80,13 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users', + 'autostart'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', 'name', 'users', 'bootorder', 'bootmenu', - 'description', 'title'] + 'description', 'title', 'autostart'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -270,6 +271,9 @@ class VMModel(object): with lock: dom = self.get_vm(name, self.conn) + if "autostart" in params: + dom.setAutostart(1 if params['autostart'] == True else 0) + # You can only change <maxMemory> offline, updating guest XML if ("memory" in params) and ('maxmemory' in params['memory']) and\ (DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): @@ -1314,7 +1318,8 @@ class VMModel(object): 'access': 'full', 'persistent': True if dom.isPersistent() else False, 'bootorder': boot, - 'bootmenu': bootmenu + 'bootmenu': bootmenu, + 'autostart': dom.autostart() } def _vm_get_disk_paths(self, dom): diff --git a/tests/test_model.py b/tests/test_model.py index d9ffd5e..8f3a578 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1362,6 +1362,12 @@ class ModelTests(unittest.TestCase): inst.vm_update(u'пeω-∨м', {"bootmenu": False}) self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['bootmenu']) + # enable/disable autostart + inst.vm_update(u'пeω-∨м', {"autostart": True}) + self.assertEquals("yes", inst.vm_lookup(u'пeω-∨м')['autostart']) + inst.vm_update(u'пeω-∨м', {"autostart": False}) + self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['autostart']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index b1b9f12..0ecf11b 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -301,6 +301,24 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') self.assertEquals(400, resp.status) + # set vm autostart tests (powered off) + resp = self.request('/plugins/kimchi/vms/vm-1/poweroff', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": True}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + + # set vm autostart tests (running) + resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": False}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + def test_vm_lifecycle(self): # Create a Template req = json.dumps({'name': 'test', -- 2.7.4

2 1

[PATCH V3] [Wok 0/2] Issue #122 - Make AsyncTask stoppable.
by pvital＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V3: - Updated exception code used - again V2: - Modified exception code used - Updated i18n messages V1: This patch-set gives to user a way to 'stop' a Task that is still running by setting the Task status to "killed". Since an AsyncTask is basic a thread running in the system and this thread can execute a pure Python method or a background command (by using run_command() from wok.utils), the developer must pass to AsyncTask constructor a method to be executed by the DELETE operation, called here as 'kill_cb'. If none kill_cb is passed, the task will not be able to stopped and an error message will be raised to user if DELETE operation is executed. Otherwise, the kill_cb method will be executed by kill() method (responsible to execute the DELETE operation) of AsyncTask class and its status set to 'killed'. The unit tests present how you can use it. Paulo Vital (2): Issue #122 - Make AsyncTask stoppable. Issue #122 - Add unit test to stop AsyncTask. docs/API/tasks.md | 2 ++ src/wok/asynctask.py | 18 +++++++++++++++++- src/wok/i18n.py | 2 ++ src/wok/model/tasks.py | 13 +++++++++++++ tests/test_api.py | 26 ++++++++++++++++++++++++-- tests/test_tasks.py | 19 ++++++++++++++++++- 6 files changed, 76 insertions(+), 4 deletions(-) -- 2.7.4

2 3

[PATCH v2] [Kimchi] Issue #626: Snapshot revert does not release storage volume
by bianca＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited function get_disk_used_by in diskutils.py file to remove used_by verification in objstore and edited all function calls. Also removed set_disk_used_by function from diskutils.py. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/diskutils.py | 61 ++++++++++--------------------------------------- model/storagevolumes.py | 14 ++---------- model/vms.py | 11 --------- model/vmstorages.py | 15 +++--------- 4 files changed, 17 insertions(+), 84 deletions(-) diff --git a/model/diskutils.py b/model/diskutils.py index 6faab7c..a3162d7 100644 --- a/model/diskutils.py +++ b/model/diskutils.py @@ -17,10 +17,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 -from wok.exception import OperationFailed, NotFoundError -from wok.utils import wok_log - -from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.model.vms import VMModel, VMsModel from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks @@ -31,49 +27,16 @@ from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks """ -def get_disk_used_by(objstore, conn, path): - try: - with objstore as session: - try: - used_by = session.get('storagevolume', path)['used_by'] - except (KeyError, NotFoundError): - wok_log.info('Volume %s not found in obj store.' % path) - used_by = [] - # try to find this volume in existing vm - vms_list = VMsModel.get_vms(conn) - for vm in vms_list: - dom = VMModel.get_vm(vm, conn) - storages = get_vm_disks(dom) - for disk in storages.keys(): - d_info = get_vm_disk_info(dom, disk) - if path == d_info['path']: - used_by.append(vm) - try: - session.store('storagevolume', path, - {'used_by': used_by}, - get_kimchi_version()) - except Exception as e: - # Let the exception be raised. If we allow disks' - # used_by to be out of sync, data corruption could - # occour if a disk is added to two guests - # unknowingly. - wok_log.error('Unable to store storage volume id in' - ' objectstore due error: %s', - e.message) - raise OperationFailed('KCHVOL0017E', - {'err': e.message}) - except Exception as e: - # This exception is going to catch errors returned by 'with', - # specially ones generated by 'session.store'. It is outside - # to avoid conflict with the __exit__ function of 'with' - raise OperationFailed('KCHVOL0017E', {'err': e.message}) - return used_by - +def get_disk_used_by(conn, path): + used_by = [] + # try to find this volume in existing vm + vms_list = VMsModel.get_vms(conn) + for vm in vms_list: + dom = VMModel.get_vm(vm, conn) + storages = get_vm_disks(dom) + for disk in storages.keys(): + d_info = get_vm_disk_info(dom, disk) + if path == d_info['path']: + used_by.append(vm) -def set_disk_used_by(objstore, path, new_used_by): - try: - with objstore as session: - session.store('storagevolume', path, {'used_by': new_used_by}, - get_kimchi_version()) - except Exception as e: - raise OperationFailed('KCHVOL0017E', {'err': e.message}) + return used_by diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 4708674..a6ce97b 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -40,7 +40,6 @@ from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.isoinfo import IsoImage from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.diskutils import get_disk_used_by -from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name @@ -163,9 +162,7 @@ class StorageVolumesModel(object): vol_info = StorageVolumeModel(conn=self.conn, objstore=self.objstore).lookup(pool_name, name) - vol_path = vol_info['path'] - set_disk_used_by(self.objstore, vol_info['path'], []) if params.get('upload', False): upload_volumes[vol_path] = {'lock': threading.Lock(), @@ -251,11 +248,6 @@ class StorageVolumesModel(object): finally: os.remove(file_path) - vol_info = StorageVolumeModel(conn=self.conn, - objstore=self.objstore).lookup(pool_name, - name) - set_disk_used_by(self.objstore, vol_info['path'], []) - cb('OK', True) def get_list(self, pool_name): @@ -335,7 +327,7 @@ class StorageVolumeModel(object): except UnicodeDecodeError: isvalid = False - used_by = get_disk_used_by(self.objstore, self.conn, path) + used_by = get_disk_used_by(self.conn, path) if (self.libvirt_user is None): self.libvirt_user = UserTests().probe_user() ret, _ = probe_file_permission_as_user(path, self.libvirt_user) @@ -493,9 +485,7 @@ class StorageVolumeModel(object): 'pool': orig_pool_name, 'err': e.get_error_message()}) - new_vol = self.lookup(new_pool_name, new_vol_name) - cb('adding volume to the object store') - set_disk_used_by(self.objstore, new_vol['path'], []) + self.lookup(new_pool_name, new_vol_name) cb('OK', True) diff --git a/model/vms.py b/model/vms.py index 7f607f5..b2ee122 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1398,17 +1398,6 @@ class VMModel(object): except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) - try: - with self.objstore as session: - if path in session.get_list('storagevolume'): - used_by = session.get('storagevolume', path)['used_by'] - used_by.remove(name) - session.store('storagevolume', path, - {'used_by': used_by}, - get_kimchi_version()) - except Exception as e: - raise OperationFailed('KCHVOL0017E', {'err': e.message}) - try: with self.objstore as session: session.delete('vm', dom.UUIDString(), ignore_missing=True) diff --git a/model/vmstorages.py b/model/vmstorages.py index b55b156..2e9f783 100644 --- a/model/vmstorages.py +++ b/model/vmstorages.py @@ -26,7 +26,6 @@ from wok.utils import wok_log from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.model.diskutils import get_disk_used_by -from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagevolumes import StorageVolumeModel from wok.plugins.kimchi.model.utils import get_vm_config_flag from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel @@ -151,7 +150,6 @@ class VMStoragesModel(object): if params.get('vol'): used_by = vol_info['used_by'] used_by.append(vm_name) - set_disk_used_by(self.objstore, params['path'], used_by) return dev @@ -191,7 +189,7 @@ class VMStorageModel(object): # in the obj store, its ref count would have been updated # by get_disk_used_by() if path is not None: - used_by = get_disk_used_by(self.objstore, self.conn, path) + used_by = get_disk_used_by(self.conn, path) else: wok_log.error("Unable to decrement volume used_by on" " delete because no path could be found.") @@ -202,7 +200,6 @@ class VMStorageModel(object): if used_by is not None and vm_name in used_by: used_by.remove(vm_name) - set_disk_used_by(self.objstore, path, used_by) else: wok_log.error("Unable to update %s:%s used_by on delete." % (vm_name, dev_name)) @@ -223,11 +220,9 @@ class VMStorageModel(object): if new_disk_path != old_disk_path: # An empty path means a CD-ROM was empty or ejected: if old_disk_path is not '': - old_disk_used_by = get_disk_used_by( - self.objstore, self.conn, old_disk_path) + old_disk_used_by = get_disk_used_by(self.conn, old_disk_path) if new_disk_path is not '': - new_disk_used_by = get_disk_used_by( - self.objstore, self.conn, new_disk_path) + new_disk_used_by = get_disk_used_by(self.conn, new_disk_path) dev_info.update(params) dev, xml = get_disk_xml(dev_info) @@ -241,12 +236,8 @@ class VMStorageModel(object): if old_disk_used_by is not None and \ vm_name in old_disk_used_by: old_disk_used_by.remove(vm_name) - set_disk_used_by(self.objstore, old_disk_path, - old_disk_used_by) if new_disk_used_by is not None: new_disk_used_by.append(vm_name) - set_disk_used_by(self.objstore, new_disk_path, - new_disk_used_by) except Exception as e: wok_log.error("Unable to update dev used_by on update due to" " %s:" % e.message) -- 2.7.4

2 1

[PATCH v3] [Kimchi] Feature request (#860): Support Guest Autostart
by bianca＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Include 'autostart' option in API.json and vms.py (lookup and update) using libvirt dom.setAutostart to set as true or false. Also edit test_model.py to include those changes and updated API.md file. Also included API tests to test_rest.py in test_edit_vm function. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- API.json | 4 ++++ docs/API.md | 2 ++ model/vms.py | 12 +++++++++--- tests/test_model.py | 6 ++++++ tests/test_rest.py | 18 ++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/API.json b/API.json index 4fdd522..4946069 100644 --- a/API.json +++ b/API.json @@ -322,6 +322,10 @@ "error": "KCHVM0053E", "type": "boolean" }, + "autostart": { + "description": "Enable/Disable guest autostart", + "type": "boolean" + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/docs/API.md b/docs/API.md index b07bf16..9f30666 100644 --- a/docs/API.md +++ b/docs/API.md @@ -147,6 +147,7 @@ server. * groups: A list of system groups whose users have permission to access the VM. Default is: empty (i.e. no groups given access). * bootorder: list of devices in boot order + * autostart: show if autostart is enabled. * **DELETE**: Remove the Virtual Machine * **PUT**: update the parameters of existing VM * name: New name for this VM (only applied for shutoff VM) @@ -177,6 +178,7 @@ server. * threads - The number of threads per core. * bootorder: guest bootorder, types accepted: hd, cdrom, network or fd * bootmenu: prompts guest bootmenu. Bool type. + * autostart: enable/disable guest autostart (true or false params). * **POST**: *See Virtual Machine Actions* diff --git a/model/vms.py b/model/vms.py index 433770a..cfe4c97 100644 --- a/model/vms.py +++ b/model/vms.py @@ -79,11 +79,13 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users', + 'autostart'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', - 'name', 'users', 'bootorder', 'bootmenu'] + 'name', 'users', 'bootorder', 'bootmenu', + 'autostart'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -261,6 +263,9 @@ class VMModel(object): with lock: dom = self.get_vm(name, self.conn) + if "autostart" in params: + dom.setAutostart(1 if params['autostart'] == True else 0) + # You can only change <maxMemory> offline, updating guest XML if ("memory" in params) and ('maxmemory' in params['memory']) and\ (DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): @@ -1285,7 +1290,8 @@ class VMModel(object): 'access': 'full', 'persistent': True if dom.isPersistent() else False, 'bootorder': boot, - 'bootmenu': bootmenu + 'bootmenu': bootmenu, + 'autostart': dom.autostart() } def _vm_get_disk_paths(self, dom): diff --git a/tests/test_model.py b/tests/test_model.py index 27225f8..7b1fbfe 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1369,6 +1369,12 @@ class ModelTests(unittest.TestCase): inst.vm_update(u'пeω-∨м', {"bootmenu": False}) self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['bootmenu']) + # enable/disable autostart + inst.vm_update(u'пeω-∨м', {"autostart": True}) + self.assertEquals("yes", inst.vm_lookup(u'пeω-∨м')['autostart']) + inst.vm_update(u'пeω-∨м', {"autostart": False}) + self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['autostart']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 80596c2..0516e7c 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -301,6 +301,24 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') self.assertEquals(400, resp.status) + # set vm autostart tests (powered) + resp = self.request('/plugins/kimchi/vms/vm-1/poweroff', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": True}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + + # set vm autostart tests (running) + resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": True}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + def test_vm_lifecycle(self): # Create a Template req = json.dumps({'name': 'test', -- 2.7.4

2 1

[PATCH V2] [Wok 0/2] Issue #122 - Make AsyncTask stoppable.
by pvital＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> v2: - Modified exception code used - Updated i18n messages V1: This patch-set gives to user a way to 'stop' a Task that is still running by setting the Task status to "killed". Since an AsyncTask is basic a thread running in the system and this thread can execute a pure Python method or a background command (by using run_command() from wok.utils), the developer must pass to AsyncTask constructor a method to be executed by the DELETE operation, called here as 'kill_cb'. If none kill_cb is passed, the task will not be able to stopped and an error message will be raised to user if DELETE operation is executed. Otherwise, the kill_cb method will be executed by kill() method (responsible to execute the DELETE operation) of AsyncTask class and its status set to 'killed'. The unit tests present how you can use it. Paulo Vital (2): Issue #122 - Make AsyncTask stoppable. Issue #122 - Add unit test to stop AsyncTask. docs/API/tasks.md | 2 ++ src/wok/asynctask.py | 18 +++++++++++++++++- src/wok/i18n.py | 2 ++ src/wok/model/tasks.py | 13 +++++++++++++ tests/test_api.py | 26 ++++++++++++++++++++++++-- tests/test_tasks.py | 19 ++++++++++++++++++- 6 files changed, 76 insertions(+), 4 deletions(-) -- 2.7.4

1 2

[PATCH] [Wok 0/2] Issue #122 - Make AsyncTask stoppable.
by pvital＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set gives to user a way to 'stop' a Task that is still running by setting the Task status to "killed". Since an AsyncTask is basic a thread running in the system and this thread can execute a pure Python method or a background command (by using run_command() from wok.utils), the developer must pass to AsyncTask constructor a method to be executed by the DELETE operation, called here as 'kill_cb'. If none kill_cb is passed, the task will not be able to stopped and an error message will be raised to user if DELETE operation is executed. Otherwise, the kill_cb method will be executed by kill() method (responsible to execute the DELETE operation) of AsyncTask class and its status set to 'killed'. The unit tests present how you can use it. Paulo Vital (2): Issue #122 - Make AsyncTask stoppable. Issue #122 - Add unit test to stop AsyncTask. docs/API/tasks.md | 2 ++ src/wok/asynctask.py | 18 +++++++++++++++++- src/wok/i18n.py | 1 + src/wok/model/tasks.py | 13 +++++++++++++ tests/test_api.py | 26 ++++++++++++++++++++++++-- tests/test_tasks.py | 19 ++++++++++++++++++- 6 files changed, 75 insertions(+), 4 deletions(-) -- 2.7.4

4 6

[RFC] Wok / Ginger sidebar
by Samuel Henrique De Oliveira Guimaraes 31 Aug '16

31 Aug '16

Hi team, We currently have an issue with Ginger/Gingerbase navigation bar in small screen resolutions and we also have huge tables in System Services page. Since working on the navigation bar involves editing Wok styles, I'm sending this e-mail to Wok mailing list instead of Ginger group. I looked for successful combinations of sidebar + horizontal navigation bars and so far I couldn't find any example that would exactly fit with Wok and its plugins. The majority of examples I'm listing below are very good with traditional pages with deep subcategories and the navigation bars can work as sitemaps and replace breadcrumbs: * http://www.worldwildlife.org/ - https://vimeo.com/166812605 * https://www.theguardian.com/us - https://vimeo.com/166812599 * https://next.ft.com/fastft - https://vimeo.com/166812597 Wok currently has two navigation levels. Kimchi doesn't have multiple sections but Ginger and Gingerbase uses collapsible panel groups to separate sections that could be third level elements on a sidebar. This was already discussed when we moved some features from Ginger to Gingerbase but I think we could achieve a functional sidebar with up to three levels without using a "landing page" for second-level elements. In the attached screenshots ginger_sidebar1 and ginger_sidebar2 are mockups for an off-canvas menu that would slide the main content and hide itself once an option is clicked. It would also hide the other panel accordions. Here are two off-canvas menu in action: * http://codepen.io/SitePoint/full/uIemr/ * https://codepen.io/benske/full/cxrta/ Since this would require a change in Wok tabs and ginger/gingerbase tab-ext.xml, I think we could implement something entirely different that would with Wok and all plugins. This site menu only have first-level options on the sidebar but I think we could add collapsible links like a tree-table menu: https://www.sitepoint.com/ In addition to the sidebar, we could put a search/filter input on the top that would allow the user to type the desired option and show its position on the menu. Please take a look at the remaining attached screenshots. I did one variation with the content aligned to the center and another one aligned to the left. Regards, Samuel

4 17

Re: [Kimchi-devel] [ginger-dev-list] Re: Fwd: [RFC] listing of ovs bridges
by Suresh Babu Angadi 31 Aug '16

31 Aug '16

On 08/30/2016 04:49 PM, Daniel Henrique Barboza wrote: > Hi Suresh, > > Do you need only the listing of ovsbridges? Because there is a Gingerbase > function that does that: > Hi Daniel, I think we can go with this approach. Currently kimchi requires only ovs bridge names. So the API would remain the same, however backend implementation will use ovs_bridges() method of netinfo.py. > netinfo.py 183: > > def ovs_bridges(): > """Get the OVS Bridges of the host. > > In some distributions, like Fedora, the files bridge and brif are > not created under /sys/class/net/<ovsbridge> for OVS bridges. > These specific functions allows one to differentiate OVS bridges > from other types of bridges. > > Returns: > List[str]: a list with the OVS bridges found. > > """ > > > > On 08/30/2016 03:18 AM, Suresh Babu Angadi wrote: >> Hi All, >> If there are no comments, I would go ahead and send patches. >> >> On 08/30/2016 11:46 AM, Suresh Babu Angadi wrote: >>> >>> Adding ginger mailing list, since it requires modifications in >>> Ginger code. >>> >>> -------- Forwarded Message -------- >>> Subject: [Kimchi-devel] [RFC] listing of ovs bridges >>> Date: Thu, 25 Aug 2016 16:33:39 +0530 >>> From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> >>> To: Kimchi Devel <kimchi-devel(a)ovirt.org> >>> >>> >>> >>> New API: >>> SimpleCollection: OVSBridges >>> >>> URI: /plugins/kimchi/ovsbridges >>> >>> Methods: >>> >>> GET: Retrieve list of OVS bridges of the host >>> >>> >>> Back end changes: >>> Currently ginger plugin has full fledged ovs functionality. So best bet >>> would be to have listing of ovs bridges to gingerbase which can be used >>> by kimchi and ginger apis. >>> >>> -- >>> Regards, >>> Suresh Babu Angadi >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>> >>> >>> >> >> -- >> Regards, >> Suresh Babu Angadi >> -- >> You received this message because you are subscribed to the Google >> Groups "Ginger Development Mailing List" group. >> To unsubscribe from this group and stop receiving emails from it, >> send an email to ginger-dev-list+unsubscribe(a)googlegroups.com >> <mailto:ginger-dev-list+unsubscribe@googlegroups.com>. >> For more options, visit https://groups.google.com/d/optout. > > -- > You received this message because you are subscribed to the Google > Groups "Ginger Development Mailing List" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to ginger-dev-list+unsubscribe(a)googlegroups.com > <mailto:ginger-dev-list+unsubscribe@googlegroups.com>. > For more options, visit https://groups.google.com/d/optout. -- Regards, Suresh Babu Angadi

1 0

[PATCH V2] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 31 Aug '16

31 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 35 +++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 ++++++++++ i18n.py | 6 +++++ model/templates.py | 17 ++++++++++++++ vmtemplate.py | 20 ++++++++++++++++ xmlutils/interface.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 1 deletion(-) -- 2.7.4

2 3

[PATCH] [Kimchi] mockmodel.py: fixing virtviewerfile_tmp path
by dhbarboza82＠gmail.com 30 Aug '16

30 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Instead of using relative path, use the path provided by kimchi config. Otherwise, when running WoK tests, the 'wok/data/virtviewerfiles/' dir will be wrongly created and used by the mockmodel. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- mockmodel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mockmodel.py b/mockmodel.py index cd06ee3..61e5ee1 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -33,6 +33,7 @@ from wok.objectstore import ObjectStore from wok.utils import add_task, convert_data_size from wok.xmlutils.utils import xml_item_update +from wok.plugins.kimchi import config as kimchi_config from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.model import cpuinfo @@ -141,7 +142,7 @@ class MockModel(Model): cherrypy.engine.subscribe('exit', self.virtviewertmpfile_cleanup) def _create_virt_viewer_tmp_file(self): - path = '../data/virtviewerfiles/' + path = kimchi_config.get_virtviewerfiles_path() if not os.path.isdir(path): os.makedirs(path) -- 2.5.5

2 1

[PATCH V1] [Kimchi] Updated API.md to reflect the changes related to host network interfaces in template.
by archus＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Updated API.md to reflect the changes done in previous patch for adding, removing, listing host network interfaces in template GET and PUT APIs implementations. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- docs/API.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/API.md b/docs/API.md index 7bd677f..3808054 100644 --- a/docs/API.md +++ b/docs/API.md @@ -428,6 +428,12 @@ A interface represents available network interface on VM. * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. * networks *(optional)*: list of networks will be assigned to the new VM. + * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. + * type: Type of host network interface. Type should be 'macvtap' for host network interface(Ethernet, Bond, VLAN) to be connected as direct MacVTap or type should be ovs for openvswitch host network interface to be connected as virtual switch to a VM. + * name: The host network interface. It should be host network interface(Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type ovs. + * mode *(optional)*: Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). + * bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. + * vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): * index: The device index @@ -473,6 +479,12 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * networks *(optional)*: list of networks will be assigned to the new VM. + * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. + * type: Type of host network interface. Type should be 'macvtap' for host network interface(Ethernet, Bond, VLAN) to be connected as direct MacVTap or type should be ovs for openvswitch host network interface to be connected as virtual switch to a VM. + * name: The host network interface. It should be host network interface(Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type ovs. + * mode *(optional)*: Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). + * bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. + * vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): * index: The device index -- 2.7.4

2 1

[PATCH V1] [Kimchi] Updated code to support add, remove and list host network interface(s) to exiting template.
by archus＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> interfaces is an additional optional attribute and hence exiting functionalities to add, remove and list networks from/to template are not changed. Below are the changes: 1) Added i18n error codes. 2) Added interface as new kimchitype in API.json. And ref added in update template. -Interface expects an object with parameters: 'name', 'type' and 'mode'. -Name should be name of host network interface(Ethernet, Bond, VLAN) for type 'macvtap' or name should be name of host openvswitch bridge interface for type ovs. -Mode only applicable for interface type macvtap to indicates whether packets has to be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). -Mode is Optional. 3) Added interfaces as optional attribute in template control. -This attribute returns to be list of host interface attached to template, each interface will have above attribute. -Empty list if no host network interface is attached to template. 4) Added method to generate valid interface xml from the interface based on above attribute. -This will use below method to generate interface xml based on type and other attribute. -Update vm xml generate method to add generated interfaces xml to vm xml. 5) Modified xmlutils which generates interface xml based on interface type and attributes. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- API.json | 29 ++++++++++++++++++++- control/templates.py | 1 + i18n.py | 2 ++ vmtemplate.py | 24 +++++++++++++++++ xmlutils/interface.py | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 1 deletion(-) diff --git a/API.json b/API.json index a3af02d..e323649 100644 --- a/API.json +++ b/API.json @@ -89,7 +89,29 @@ }, "additionalProperties": false, "error": "KCHTMPL0030E" - } + }, + "interface": { + "description": "Host network interface, this indicates whether to configure the host network interface(Ethernet, Bond, VLAN) as direct MacVTap or to configure interface(OVS) as virtual switch to a VM", + "type": "object", + "properties": { + "type": { + "description": "Type of host network interface. Type should be 'macvtap' for host network interface(Ethernet, Bond, VLAN) to be connected as direct MacVTap and type ovs for openvswitch host network interface to be connected as virtual switch to a VM.", + "type": "string", + "pattern": "^(macvtap|ovs)$" + }, + "name": { + "description": "The host network interface. It should be name of host network interface(Ethernet, Bond, VLAN) for type 'macvtap' and name of host openvswitch bridge interface for type ovs", + "type": "string" + }, + "mode": { + "description": "Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). Optional.", + "type": "string", + "pattern": "^(bridge|vepa)$" + } + }, + "additionalProperties": false, + "error": "KCHTMPL0033E" + } }, "properties": { "storagepools_create": { @@ -783,6 +805,11 @@ "items": { "type": "string" }, "error": "KCHTMPL0017E" }, + "interfaces": { + "description": "list of host interfaces to be assigned to new VM", + "type": "array", + "items": { "ref": "#/kimchitype/interface" } + }, "folder": { "description": "Folder", "type": "array", diff --git a/control/templates.py b/control/templates.py index bb2e068..d81398a 100644 --- a/control/templates.py +++ b/control/templates.py @@ -68,6 +68,7 @@ class Template(Resource): 'cdrom': self.info.get('cdrom', None), 'disks': self.info['disks'], 'networks': self.info['networks'], + 'interfaces': self.info.get('interfaces', []), 'folder': self.info.get('folder', []), 'graphics': self.info['graphics'], 'cpu_info': self.info.get('cpu_info') diff --git a/i18n.py b/i18n.py index e8d9c05..7cda46d 100644 --- a/i18n.py +++ b/i18n.py @@ -159,6 +159,7 @@ messages = { "KCHVMIF0009E": _("MAC Address %(mac)s already exists in virtual machine %(name)s"), "KCHVMIF0010E": _("Invalid MAC Address"), "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"), + "KCHVMIF0012E": _("Invalid host network interface type (%(type)s). Type should be 'macvtap' for host network interface(Ethernet, Bond, VLAN) to be connected as direct MacVTap and type 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM."), "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Source media %(path)s not found"), @@ -190,6 +191,7 @@ messages = { "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), + "KCHTMPL0033E": _("Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface(Ethernet, Bond, VLAN) for type 'macvtap' and name of host openvswitch bridge interface for type ovs. Mode only applicable for interface type macvtap to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge) and is Optional."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/vmtemplate.py b/vmtemplate.py index 7ac0541..fed6d28 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -22,6 +22,7 @@ import stat import time import urlparse import uuid + from lxml import etree from lxml.builder import E @@ -295,6 +296,27 @@ class VMTemplate(object): self.info['os_version']) return unicode(networks, 'utf-8') + def _get_interfaces_xml(self): + interfaces = "" + params = {'model': self.info['nic_model']} + for interface in self.info.get('interfaces', []): + typ = interface['type'] + if typ == 'macvtap': + params['type'] = 'direct' + params['mode'] = interface.get('mode', None) + elif typ == 'ovs': + params['type'] = 'bridge' + params['virtualport_type'] = 'openvswitch' + else: + raise InvalidParameter('KCHVMIF0012E', {'type': + params['type']}) + + params['name'] = interface['name'] + interfaces += get_iface_xml(params, self.info['arch'], + self.info['os_distro'], + self.info['os_version']) + return unicode(interfaces, 'utf-8') + def _get_input_output_xml(self): sound = """ <sound model='%(sound_model)s' /> @@ -341,6 +363,7 @@ class VMTemplate(object): params['name'] = vm_name params['uuid'] = vm_uuid params['networks'] = self._get_networks_xml() + params['interfaces'] = self._get_interfaces_xml() params['input_output'] = self._get_input_output_xml() params['qemu-namespace'] = '' params['cdroms'] = '' @@ -432,6 +455,7 @@ class VMTemplate(object): %(disks)s %(cdroms)s %(networks)s + %(interfaces)s %(graphics)s %(input_output)s %(serial)s diff --git a/xmlutils/interface.py b/xmlutils/interface.py index 677ed81..255d491 100644 --- a/xmlutils/interface.py +++ b/xmlutils/interface.py @@ -24,6 +24,16 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): + typ = params.get('type', 'network') + if typ == 'network': + return get_iface_network_xml(params, arch, os_distro, os_version) + elif typ == 'bridge': + return get_iface_ovs_xml(params, arch, os_distro, os_version) + elif typ == 'direct': + return get_iface_macvtap_xml(params, arch, os_distro, os_version) + + +def get_iface_network_xml(params, arch=None, os_distro=None, os_version=None): """ <interface type='network' name='ethX'> <start mode='onboot'/> @@ -62,3 +72,65 @@ def get_iface_xml(params, arch=None, os_distro=None, os_version=None): interface.append(E.mac(address=mac)) return ET.tostring(interface, encoding='utf-8', pretty_print=True) + + +def get_iface_macvtap_xml(params, arch=None, os_distro=None, os_version=None): + """ + <interface type="direct"> + <source dev="bondX" mode="bridge"/> + <model type="virtio"/> + </interface> + """ + device = params['name'] + interface = E.interface(type=params['type']) + mode = params.get('mode', None) + if mode is not None: + interface.append(E.source(dev=device, mode=mode)) + else: + interface.append(E.source(dev=device)) + + model = params.get('model', None) + # no model specified; let's try querying osinfo + if model is None: + # if os_distro and os_version are invalid, nic_model will also be None + model = osinfo.lookup(os_distro, os_version).get('nic_model') + + # only append 'model' to the XML if it's been specified as a parameter or + # returned by osinfo.lookup; otherwise let libvirt use its default value + if model is not None: + interface.append(E.model(type=model)) + + interface.append(E.model(type=model)) + + return ET.tostring(interface, encoding='utf-8', pretty_print=True) + + +def get_iface_ovs_xml(params, arch=None, os_distro=None, os_version=None): + """ + <interface type="bridge"> + <source bridge="vswitchX"/> + <virtualport type="openvswitch"/> + <model type="virtio"/> + </interface> + """ + device = params['name'] + interface = E.interface(type=params['type']) + interface.append(E.source(bridge=device)) + virtualport_type = params.get('virtualport_type', 'openvswitch') + interface.append(E.virtualport(type=virtualport_type)) + + model = params.get('model', None) + # no model specified; let's try querying osinfo + if model is None: + # if os_distro and os_version are invalid, nic_model will also be None + model = osinfo.lookup(os_distro, os_version).get('nic_model') + + # only append 'model' to the XML if it's been specified as a parameter or + # returned by osinfo.lookup; otherwise let libvirt use its default value + + if model is not None: + interface.append(E.model(type=model)) + + interface.append(E.model(type=model)) + + return ET.tostring(interface, encoding='utf-8', pretty_print=True) -- 2.7.4

2 2

[PATCH] Issue #992 : Create template on s390x without libvirt storage
by harshalp＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> This patch adds support for creating templates on s390x arch without using libvirt related storage calls Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 2 + model/storagepools.py | 15 +++++-- model/storagevolumes.py | 10 +++-- model/templates.py | 56 +++++++++++++++++++++----- model/vms.py | 38 ++++++++++++------ osinfo.py | 47 ++++++++++++++++++++-- utils.py | 13 ++++++ vmtemplate.py | 105 ++++++++++++++++++++++++++++++------------------ 9 files changed, 213 insertions(+), 75 deletions(-) diff --git a/docs/API.md b/docs/API.md index 7bd677f..d8d191a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -427,6 +427,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path : Storage path to store virtual disks without libvirt * networks *(optional)*: list of networks will be assigned to the new VM. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): @@ -481,6 +482,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path (optional): Either pool or path to store the virtual disks should be specified * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index e8d9c05..8e55e01 100644 --- a/i18n.py +++ b/i18n.py @@ -190,6 +190,8 @@ messages = { "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), + "KCHTMPL0034E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0035E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index a2dbaec..cbd756b 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -32,7 +32,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -56,6 +56,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -71,6 +72,11 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if 'disks' not in tmpl_defaults or len(tmpl_defaults['disks']) == 0 \ + or (not tmpl_defaults.get('disks')[0].get( + 'pool') and is_s390x()): # s390x specific handling + return + tmpl_defaults.get('disks') default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -436,9 +442,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 7b2272b..1e4a2af 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -41,8 +41,7 @@ from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel -from wok.plugins.kimchi.utils import get_next_clone_name - +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x VOLUME_TYPE_MAP = {0: 'file', 1: 'block', @@ -275,8 +274,11 @@ class StorageVolumeModel(object): self.task = TaskModel(**kargs) self.storagevolumes = StorageVolumesModel(**kargs) self.storagepool = StoragePoolModel(**kargs) - if self.conn.get() is not None: - self.libvirt_user = UserTests().probe_user() + if is_s390x(): # s390x specific handling + if self.conn.get() is not None: + self.libvirt_user = UserTests().probe_user() + else: + self.libvirt_user = None else: self.libvirt_user = None diff --git a/model/templates.py b/model/templates.py index a299c85..4edd98e 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,7 +28,8 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user, run_command +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version @@ -47,6 +48,7 @@ if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: class TemplatesModel(object): + def __init__(self, **kargs): self.objstore = kargs['objstore'] self.conn = kargs['conn'] @@ -142,7 +144,7 @@ class TemplatesModel(object): get_kimchi_version()) except InvalidOperation: raise - except Exception, e: + except Exception as e: raise OperationFailed('KCHTMPL0020E', {'err': e.message}) return name @@ -171,6 +173,7 @@ class TemplatesModel(object): class TemplateModel(object): + def __init__(self, **kargs): self.objstore = kargs['objstore'] self.conn = kargs['conn'] @@ -198,10 +201,9 @@ class TemplateModel(object): # set default name subfixs = [v[len(name):] for v in self.templates.get_list() if v.startswith(name)] - indexs = [int(v.lstrip("-clone")) for v in subfixs - if v.startswith("-clone") and - v.lstrip("-clone").isdigit()] - indexs.sort() + indexs = sorted([int(v.lstrip("-clone")) for v in subfixs + if v.startswith("-clone") and + v.lstrip("-clone").isdigit()]) index = "1" if not indexs else str(indexs[-1] + 1) clone_name = name + "-clone" + index @@ -267,7 +269,7 @@ class TemplateModel(object): except InvalidOperation: raise - except Exception, e: + except Exception as e: raise OperationFailed('KCHTMPL0032E', {'err': e.message}) return params['name'] @@ -290,7 +292,7 @@ def validate_memory(memory): # memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): raise InvalidParameter("KCHVM0079E", - {'value': str(MAX_MEM_LIM / (1024**3))}) + {'value': str(MAX_MEM_LIM / (1024 ** 3))}) if (current > host_memory) or (maxmem > host_memory): raise InvalidParameter("KCHVM0078E", {'memHost': host_memory}) @@ -316,6 +318,7 @@ def validate_memory(memory): class LibvirtVMTemplate(VMTemplate): + def __init__(self, args, scan=False, conn=None): self.conn = conn netboot = True if 'netboot' in args.keys() else False @@ -398,16 +401,47 @@ class LibvirtVMTemplate(VMTemplate): raise NotFoundError("KCHVOL0002E", {'name': vol, 'pool': pool}) + def _create_disk_image(self, format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, str(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0035E", {'err': err}) + + return + def fork_vm_storage(self, vm_uuid): # Provision storages: vol_list = self.to_volume_list(vm_uuid) try: for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + self._create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) + return vol_list def set_cpu_info(self): diff --git a/model/vms.py b/model/vms.py index 3380278..5d1eebb 100644 --- a/model/vms.py +++ b/model/vms.py @@ -60,13 +60,13 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node from wok.plugins.kimchi.xmlutils.cpu import get_topology_xml from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks -from utils import has_cpu_numa, set_numa_memory +from .utils import has_cpu_numa, set_numa_memory DOM_STATE_MAP = {0: 'nostate', @@ -114,6 +114,7 @@ vm_locks = {} class VMsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -231,6 +232,7 @@ class VMsModel(object): class VMModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -373,7 +375,7 @@ class VMModel(object): vir_dom = self.get_vm(name, self.conn) flags = libvirt.VIR_DOMAIN_XML_SECURE xml = vir_dom.XMLDesc(flags).decode('utf-8') - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: raise OperationFailed('KCHVM0035E', {'name': name, 'err': e.message}) @@ -407,7 +409,7 @@ class VMModel(object): vir_conn = self.conn.get() dom = vir_conn.defineXML(xml) self._update_metadata_name(dom, nonascii_name) - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: raise OperationFailed('KCHVM0035E', {'name': name, 'err': e.message}) @@ -480,7 +482,7 @@ class VMModel(object): orig_pool_name = vir_pool.name().decode('utf-8') orig_vol_name = vir_orig_vol.name().decode('utf-8') - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: raise OperationFailed('KCHVM0035E', {'name': domain_name, 'err': e.message}) @@ -1366,7 +1368,7 @@ class VMModel(object): # "OperationFailed" in that case. try: snapshot_names = self.vmsnapshots.get_list(name) - except OperationFailed, e: + except OperationFailed as e: wok_log.error('cannot list snapshots: %s; ' 'skipping snapshot deleting...' % e.message) else: @@ -1394,6 +1396,14 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x(): # s390x specific handling + if os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) @@ -1538,7 +1548,7 @@ class VMModel(object): raise OperationFailed("KCHVM0081E", {'dir': serialconsole.BASE_DIRECTORY}) - websocket.add_proxy_token(name.encode('utf-8')+'-console', + websocket.add_proxy_token(name.encode('utf-8') + '-console', os.path.join(serialconsole.BASE_DIRECTORY, name.encode('utf-8')), True) @@ -1596,7 +1606,7 @@ class VMModel(object): try: vir_dom.suspend() - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: raise OperationFailed('KCHVM0038E', {'name': name, 'err': e.message}) @@ -1617,7 +1627,7 @@ class VMModel(object): try: vir_dom.resume() - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: raise OperationFailed('KCHVM0040E', {'name': name, 'err': e.message}) @@ -1657,7 +1667,7 @@ class VMModel(object): 'destarch': dest_arch } ) - except Exception, e: + except Exception as e: raise OperationFailed("KCHVM0066E", {'error': e.message}) finally: @@ -1768,7 +1778,7 @@ class VMModel(object): ssh_client, id_rsa_data ) - except Exception, e: + except Exception as e: raise OperationFailed( "KCHVM0068E", {'host': remote_host, 'user': user, 'error': e.message} @@ -1833,7 +1843,7 @@ class VMModel(object): conn = self.conn.get() vol_obj = conn.storageVolLookupByPath(disk_path) return vol_obj.info()[1] - except Exception, e: + except Exception as e: raise OperationFailed( "KCHVM0062E", {'path': disk_path, 'error': e.message} @@ -1949,6 +1959,7 @@ class VMModel(object): class VMScreenshotModel(object): + def __init__(self, **kargs): self.objstore = kargs['objstore'] self.conn = kargs['conn'] @@ -1995,6 +2006,7 @@ class VMScreenshotModel(object): class LibvirtVMScreenshot(VMScreenshot): + def __init__(self, vm_uuid, conn): VMScreenshot.__init__(self, vm_uuid) self.conn = conn @@ -2004,7 +2016,7 @@ class LibvirtVMScreenshot(VMScreenshot): fd = opaque os.write(fd, buf) - fd = os.open(thumbnail, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, 0644) + fd = os.open(thumbnail, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, 0o644) try: conn = self.conn.get() dom = conn.lookupByUUIDString(self.vm_uuid) diff --git a/osinfo.py b/osinfo.py index 2c59312..524b3bd 100644 --- a/osinfo.py +++ b/osinfo.py @@ -146,6 +146,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -153,7 +159,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -174,11 +185,39 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + pool_exists = False + path_exists = False + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + path_exists = True + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + + if storage_section[disk].get('pool'): + pool_exists = True + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + + # If both pool and path don't exist, pick the defaults + if index == len(storage_section.keys()) - 1 and \ + (not pool_exists and not path_exists): + if is_on_s390x: # Special handling for s390x + data['path'] = tmpl_defaults['storage']['disk.0']['path'] + else: + data['pool'] = {"name": '/plugins/kimchi/storagepools/default'} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..b8f81ca 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -272,3 +273,15 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + + """ + if os.uname()[4] == 's390x': + return True + + return False diff --git a/vmtemplate.py b/vmtemplate.py index 7ac0541..c0d51a5 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,49 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != basic_path_disk)): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + if is_s390x(): # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0028E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0034E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +233,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +243,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +258,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if not is_s390x() and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -444,8 +469,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if not is_s390x(): # s390x specific handling + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -494,10 +520,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 1.9.1

2 1

[PATCH v2][Kimchi 0/2] Allow vm update graphics type
by Ramon Medeiros 30 Aug '16

30 Aug '16

Changes: v2: Fix typos Add tests Ramon Medeiros (2): Issue #836: Allow user change guest graphics type Create test to verify graphics type change API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 2 +- model/vms.py | 10 ++++++++++ tests/test_model.py | 18 +++++++----------- 5 files changed, 25 insertions(+), 12 deletions(-) -- 2.5.5

3 8

[PATCH v3] [Kimchi] Issue #585: 'make clean' does not revert its changes from 'make rpm'
by bianca＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited Makefile.am to check if there is any file to be stashed or commited before run 'make rpm' to avoid losing any changes. Also included 'git clean -df & git reset --hard' command to remove untracked files from the working tree and to revert changes made by 'make rpm' command. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9bebb65..9917dcc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,17 +135,30 @@ kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse /bin/false ; \ fi -rpm: dist kimchi.spec +check_files: + @if [ -d '.git' ]; then \ + if [ `git status --porcelain --untracked-files=no | wc -l` -gt 0 ]; then \ + echo "***** Aborting 'make rpm' command *****"; \ + echo "There are some changes not commited in your working \ +directory. To avoid losing them, please commit or stage before run 'make rpm' command."; \ + exit 1; \ + fi \ + fi + +rpm: check_files dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + @if [ -d '.git' ]; then \ + git reset --hard; \ + fi -fedora-rpm: contrib/kimchi.spec.fedora +fedora-rpm: check_files contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec $(MAKE) rpm -suse-rpm: contrib/kimchi.spec.suse +suse-rpm: check_files contrib/kimchi.spec.suse ln -sf contrib/kimchi.spec.suse kimchi.spec $(MAKE) rpm -- 2.7.4

4 6

[PATCH] [Kimchi] Issue #982 - Fix broken testcases.
by pvital＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Several testcases started to fail in Fedora 24 after commit 24cc635 added a solution to create a temporary file to represent the Virt Viewer script contents in mockmodel.py. The solution is not able to create the directory in where this temporary file will be created and is failing. This patch adds a control to make sure the directory exists. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- mockmodel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mockmodel.py b/mockmodel.py index 2f55af7..cd06ee3 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -141,8 +141,12 @@ class MockModel(Model): cherrypy.engine.subscribe('exit', self.virtviewertmpfile_cleanup) def _create_virt_viewer_tmp_file(self): + path = '../data/virtviewerfiles/' + if not os.path.isdir(path): + os.makedirs(path) + self.virtviewerfile_tmp = tempfile.NamedTemporaryFile( - dir='../data/virtviewerfiles/', + dir=path, delete=False ) file_content = "[virt-viewer]\ntype=vnc\nhost=127.0.0.1\nport=5999\n" -- 2.7.4

4 3

[PATCH V2] [Kimchi] Added s390x architecture support in osinfo params.
by archus＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Added s390x in SUPPORTED_ARCHS. 2) Added memory devices slot limits for s390x. 3) Added template_spec for s390x. 4) Added arch check to add old template spec in params and no need to do modern_version_bases check as for s390x as template specs are same for all version. Archana Singh (1): Added s390x architecture support in osinfo params. osinfo.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -- 2.7.4

3 4

[PATCH V1] [Kimchi] Only on s390x add default networks to template if template.conf has default network configuration uncommented.
by archus＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Below are the changes done for s390x architecture to only add default networks to template if template.conf has network configuration uncommented otherwise do not add any network by default. 1) Only on s390x, osinfo._get_tmpl_defaults() does not add default network in case template.conf has commented out network configuration. 2) Only on s390x, NetworksModel._check_default_networks() does not throw key error if networks not found in tmpl_defaults. 3) Only on s390x, VMTemplate.validate_integrity() does not throw key error if networks not found in the template. 4) Only on s390x, LibvirtVMTemplate._network_validate() does not throw key error on s390x if networks not found in tmpl_default, as on s390x networks is optional. 5) Only on s390x, VMTemplate._get_network_xml() does return empty string and does not throw key error if networks not found in template object. 6) Only on s390x, control/templates.py gets networks as [] if not found self.info. Archana Singh (1): Only on s390x add default networks to template if template.conf has default network configuration. control/templates.py | 2 +- model/networks.py | 7 ++++++- model/templates.py | 5 ++++- osinfo.py | 14 +++++++++++++- vmtemplate.py | 15 +++++++++++++-- 5 files changed, 37 insertions(+), 6 deletions(-) -- 2.7.4

5 6

[PATCH V3] [Kimchi] Only on s390x add default networks to template if template.conf has default network configuration uncommented.
by archus＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Below are the changes done for s390x architecture to only add default networks to template if template.conf has network configuration uncommented otherwise do not add any network by default. 1) Only on s390x, osinfo._get_tmpl_defaults() does not add default network in case template.conf has commented out network configuration. 2) NetworksModel._check_default_networks() does not throw key error if networks not found in tmpl_defaults. 3) VMTemplate.validate_integrity() does not throw key error if networks not found in the template. 4) LibvirtVMTemplate._network_validate() does not throw key error if networks not found in tmpl_default, as on s390x networks is optional. 5) VMTemplate._get_network_xml() does return empty string and does not throw key error if networks not found in template object. 6) control/templates.py gets empty networks list if not found in self.info. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- control/templates.py | 2 +- model/networks.py | 3 ++- model/templates.py | 2 +- osinfo.py | 14 +++++++++++++- vmtemplate.py | 11 ++++++++--- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/control/templates.py b/control/templates.py index bb2e068..2dd8601 100644 --- a/control/templates.py +++ b/control/templates.py @@ -67,7 +67,7 @@ class Template(Resource): 'memory': self.info['memory'], 'cdrom': self.info.get('cdrom', None), 'disks': self.info['disks'], - 'networks': self.info['networks'], + 'networks': self.info.get('networks', []), 'folder': self.info.get('folder', []), 'graphics': self.info['graphics'], 'cpu_info': self.info.get('cpu_info') diff --git a/model/networks.py b/model/networks.py index 35431d4..b9d363a 100644 --- a/model/networks.py +++ b/model/networks.py @@ -55,7 +55,8 @@ class NetworksModel(object): self.caps = CapabilitiesModel(**kargs) def _check_default_networks(self): - networks = list(set(tmpl_defaults['networks'])) + networks = list(set(tmpl_defaults.get('networks', []))) + conn = self.conn.get() for net_name in networks: diff --git a/model/templates.py b/model/templates.py index a299c85..8df8c3b 100644 --- a/model/templates.py +++ b/model/templates.py @@ -358,7 +358,7 @@ class LibvirtVMTemplate(VMTemplate): return sorted(map(lambda x: x.decode('utf-8'), names)) def _network_validate(self): - names = self.info['networks'] + names = self.info.get('networks', []) for name in names: try: conn = self.conn.get() diff --git a/osinfo.py b/osinfo.py index 2c59312..528cf14 100644 --- a/osinfo.py +++ b/osinfo.py @@ -138,10 +138,22 @@ def _get_tmpl_defaults(): 'pool': '/plugins/kimchi/storagepools/default'}}, 'processor': {'vcpus': '1', 'maxvcpus': 1}, 'graphics': {'type': 'spice', 'listen': '127.0.0.1'}} + + The default values on s390x architecture: + + {'memory': {'current': 1024, 'maxmemory': 1024}, + 'storage': { 'disk.0': {'format': 'qcow2', 'size': '10', + 'pool': '/plugins/kimchi/storagepools/default'}}, + 'processor': {'vcpus': '1', 'maxvcpus': 1}, + 'graphics': {'type': 'spice', 'listen': '127.0.0.1'}} """ # Create dict with default values tmpl_defaults = defaultdict(dict) - tmpl_defaults['main']['networks'] = ['default'] + + host_arch = _get_arch() + if host_arch != 's390x': + tmpl_defaults['main']['networks'] = ['default'] + tmpl_defaults['memory'] = {'current': _get_default_template_mem(), 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', diff --git a/vmtemplate.py b/vmtemplate.py index 7ac0541..babf050 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -288,7 +288,10 @@ class VMTemplate(object): networks = "" params = {'type': 'network', 'model': self.info['nic_model']} - for nw in self.info['networks']: + + info_networks = self.info.get('networks', []) + + for nw in info_networks: params['network'] = nw networks += get_iface_xml(params, self.info['arch'], self.info['os_distro'], @@ -353,7 +356,7 @@ class VMTemplate(object): graphics.update(kwargs.get('graphics', {})) # Graphics is not supported on s390x, this check will # not add graphics tag in domain xml. - if params['arch'] not in ['s390x']: + if params.get('arch') != 's390x': params['graphics'] = get_graphics_xml(graphics) libvirt_stream_protocols = kwargs.get('libvirt_stream_protocols', []) @@ -487,7 +490,9 @@ class VMTemplate(object): def validate_integrity(self): invalid = {} # validate networks integrity - invalid_networks = list(set(self.info['networks']) - + networks = self.info.get('networks', []) + + invalid_networks = list(set(networks) - set(self._get_all_networks_name())) if invalid_networks: invalid['networks'] = invalid_networks -- 2.7.4

2 1

[PATCHv2] [Kimchi] Issue# 973 Display resource name in confirmation dialog
by Socorro Stoppler 30 Aug '16

30 Aug '16

From: Socorro <socorro(a)linux.vnet.ibm.com> v2: Display resource name (with name in bold) in confirmation dialog v1: When confirmation dialogs are shown, also display the name of the resource being acted on (i.e. guest name, network, storage, template) as part of the message. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 16 +++++++++++----- ui/js/src/kimchi.network.js | 6 ++++-- ui/js/src/kimchi.storage_main.js | 8 +++++--- ui/js/src/kimchi.template_main.js | 5 +++-- ui/pages/i18n.json.tmpl | 20 ++++++++++---------- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 9c1aa54..696cf8f 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -127,8 +127,10 @@ kimchi.vmpoweroff = function(event) { var vm_id = vm.attr("id"); var vmObject = vm.data(); var vm_persistent = vmObject.persistent == true; - var content_msg = vm_persistent ? i18n['KCHVM6003M'] : - i18n['KCHVM6009M']; + var content_msg_1 = i18n['KCHVM6003M'].replace('%1', ''+vm_id+''); + var content_msg_2 = i18n['KCHVM6009M'].replace('%1', ''+vm_id+''); + var content_msg = vm_persistent ? content_msg_1 : + content_msg_2; var settings = { title: i18n['KCHVM6002M'], content: content_msg, @@ -153,9 +155,10 @@ kimchi.vmshutdown = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = vm.attr("id"); + var confirmMessage = i18n['KCHVM6007M'].replace('%1', ''+vm_id+''); var settings = { title: i18n['KCHVM6006M'], - content: i18n['KCHVM6007M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -174,9 +177,10 @@ kimchi.vmreset = function(event) { $(button).addClass('loading'); var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6005M'].replace('%1', ''+vm_id+''); var settings = { title: i18n['KCHVM6004M'], - content: i18n['KCHVM6005M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -204,9 +208,11 @@ kimchi.vmdelete = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6001M'].replace('%1', ''+vm_id+''); + var settings = { title: i18n['KCHVM6008M'], - content: i18n['KCHVM6001M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ac6bf74..7ce5b28 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -161,9 +161,10 @@ kimchi.addNetworkActions = function(network) { return false; } if (!network.persistent) { + var confirmMessage = i18n['KCHNET6004M'].replace('%1', ''+network.name+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHNET6004M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; @@ -180,9 +181,10 @@ kimchi.addNetworkActions = function(network) { if (network.state === "up" || network.in_use) { return false; } + var confirmMessage = i18n['KCHNET6002M'].replace('%1', ''+network.name+''); wok.confirm({ title : i18n['KCHAPI6006M'], - content : i18n['KCHNET6002M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..18e6eea 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,14 +310,15 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var poolName = $pool.data('name'); + var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', ''+poolName+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6001M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var poolName = $pool.data('name'); kimchi.deleteStoragePool(poolName, function() { kimchi.doListStoragePools(); }, function(err) { @@ -339,9 +340,10 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', ''+poolName+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6012M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 302d906..cf98a7b 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -124,14 +124,15 @@ kimchi.templateBindClick = function() { $('.template-delete a').on('click', function(event) { event.preventDefault(); var $template = $(this); + var templateName = $template.data('template'); + var confirmMessage = i18n['KCHTMPL6003M'].replace('%1', ''+templateName+''); var settings = { title: i18n['KCHAPI6001M'], - content: i18n['KCHTMPL6003M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var templateName = $template.data('template'); kimchi.deleteTemplate(templateName, function() { kimchi.doListTemplates(); }, function(err) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a5185b1..d29a206 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -47,24 +47,24 @@ "KCHTMPL6001W": "$_("No ISO found")", "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", - "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6003M": "$_("This will permanently delete the %1 template. Would you like to continue?")", "KCHTMPL6004M": "$_("View Table")", "KCHTMPL6005M": "$_("View Gallery")", "KCHTMPL6006M": "$_("Not Available")", "KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", - "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", + "KCHVM6001M": "$_("This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "KCHVM6002M": "$_("Power off Confirmation")", "KCHVM6003M": "$_("This action may produce undesirable results, " - "for example unflushed disk cache in the guest. " + "for example unflushed disk cache in the %1 guest. " "Would you like to continue?")", "KCHVM6004M": "$_("Reset Confirmation")", "KCHVM6005M": "$_("There is a risk of data loss caused by reset without" - " the guest OS shutdown. Would you like to continue?")", + " the %1 guest OS shutdown. Would you like to continue?")", "KCHVM6006M": "$_("Shut Down Confirmation")", - "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", + "KCHVM6007M": "$_("Note the %1 guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", - "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6009M": "$_("The %1 virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", @@ -89,11 +89,11 @@ "KCHVMED6012M": "$_("Following devices will be affected, confirm?")", "KCHNET6001M": "$_("unavailable")", - "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")", - "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", + "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")", + "KCHNET6004M": "$_("The %1 network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", "KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")", - "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")", + "KCHPOOL6001M": "$_("This will permanently delete the %1 storage pool. Would you like to continue?")", "KCHPOOL6002M": "$_("This storage pool is empty.")", "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", @@ -108,7 +108,7 @@ "KCHPOOL6006E": "$_("No logical device selected.")", "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6011M": "$_("No available partitions found.")", - "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", "KCHPOOL6014M": "$_("In progress...")", "KCHPOOL6015M": "$_("Failed!")", -- 2.7.4

4 10

[RFC]Listing storage devices to add to kimchi
by Pooja Kulkarni 30 Aug '16

30 Aug '16

New API: SimpleCollection: Storage Devices URI: /plugins/gingerbase/stgdevs Methods: GET: Retrieve list of block devices of the host Ginger provides the listing of all available block devices (plugins/ginger/stgdevs) on the host. The idea is to move the base functions of REST API plugins/ginger/stgdevs from ginger to gingerbase , so that kimchi APIs can also use them to list available block devices ( to be added to a template or a guest). Let me know what you think. Regards Pooja Kulkarni

1 0

Re: [Kimchi-devel] Fwd: [RFC] listing of ovs bridges
by Suresh Babu Angadi 30 Aug '16

30 Aug '16

Hi All, If there are no comments, I would go ahead and send patches. On 08/30/2016 11:46 AM, Suresh Babu Angadi wrote: > > Adding ginger mailing list, since it requires modifications in Ginger > code. > > -------- Forwarded Message -------- > Subject: [Kimchi-devel] [RFC] listing of ovs bridges > Date: Thu, 25 Aug 2016 16:33:39 +0530 > From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> > To: Kimchi Devel <kimchi-devel(a)ovirt.org> > > > > New API: > SimpleCollection: OVSBridges > > URI: /plugins/kimchi/ovsbridges > > Methods: > > GET: Retrieve list of OVS bridges of the host > > > Back end changes: > Currently ginger plugin has full fledged ovs functionality. So best bet > would be to have listing of ovs bridges to gingerbase which can be used > by kimchi and ginger apis. > > -- > Regards, > Suresh Babu Angadi > > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel > > > -- Regards, Suresh Babu Angadi

1 0

[RFC] changes to /plugins/kimchi/interfaces
by Suresh Babu Angadi 30 Aug '16

30 Aug '16

*Current Implementation:* URI: /plugins/kimchi/interfaces Methods: * GET: Retrieve a summarized list of current Interfaces Retrieves list of host interfaces, which are not in use by libvirt networks. *Proposal:* URI: /plugins/kimchi/interfaces *Methods:* * GET: Retrieve summarized list of *all host* Interfaces * Parameters: _inuse: true | false if no filter mentioned then API lists all host interfaces if inuse =“true" then API lists all host interfaces which are in use by libvirt networks if inuse=“false” then API lists available host interfaces, which are not in use by libvirt networks. *From UI point of view, current API call should be changed to /plugins/kimchi/interfaces?_inuse='false' to keep the current functionality unaffected.* -- Regards, Suresh Babu Angadi

1 1

[PATCH] [Kimchi] Github #991: unsubscribing from exit bus on cleanup
by dhbarboza82＠gmail.com 30 Aug '16

30 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> WoK tests are running the Cherrypy Exit bus multiple times without executing the __init__ from Mockmodel. causing the 'virtviewertmpfile_cleanup' callback to fail because there is no temp file created (it was cleaned in a previous callback). Unsubscribing from the 'exit' bus in the cleanup solves the issue, given that the subscription only happens in Mockmodel __init__ . Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- mockmodel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mockmodel.py b/mockmodel.py index cd06ee3..89f1187 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -33,6 +33,7 @@ from wok.objectstore import ObjectStore from wok.utils import add_task, convert_data_size from wok.xmlutils.utils import xml_item_update +from wok.plugins.kimchi import config as kimchi_config from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.model import cpuinfo @@ -141,7 +142,7 @@ class MockModel(Model): cherrypy.engine.subscribe('exit', self.virtviewertmpfile_cleanup) def _create_virt_viewer_tmp_file(self): - path = '../data/virtviewerfiles/' + path = kimchi_config.get_virtviewerfiles_path() if not os.path.isdir(path): os.makedirs(path) @@ -155,6 +156,7 @@ class MockModel(Model): def virtviewertmpfile_cleanup(self): os.unlink(self.virtviewerfile_tmp.name) + cherrypy.engine.unsubscribe('exit', self.virtviewertmpfile_cleanup) def reset(self): MockModel._mock_vms = defaultdict(list) -- 2.5.5

3 2

[PATCH V6] [Wok 0/3] Issue #158: Move AsyncTask information to memory
by pvital＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V6: - Fixed import order - Improved AsyncTask.remove() - Baked banana and cinnamon cupcakes V5: - Moved remove_tasks() to AsyncTask class. V4: - Fix usage of UUID to prevent "UUID Is not JSON Serializable" error V3: - Changes in how create AsyncTask V2: - moved all tasks_queue infrastructure to wok.asynctask - modified some user messages. V1: this patch-set moves AsyncTask information from objectstore to memory and it is dependency to solve Issue #122. Paulo Vital (3): Issue #158: Move AsyncTask information to memory Issue #158: Update model/tasks.py with AsyncTasks in memory. Issue #158: Add AsyncTasks testcases src/wok/asynctask.py | 48 +++++++++++-------- src/wok/i18n.py | 3 +- src/wok/model/tasks.py | 22 +++++---- src/wok/objectstore.py | 6 --- src/wok/utils.py | 19 -------- tests/test_tasks.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 166 insertions(+), 56 deletions(-) create mode 100644 tests/test_tasks.py -- 2.7.4

4 6

[PATCH V2] [Kimchi] Update usage of add_task() method.
by pvital＠linux.vnet.ibm.com 30 Aug '16

30 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> After move AsyncTask to memory, the call to add a new task has changed. This patch updates all add_task() calls to address the new way. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- mockmodel.py | 9 +++++---- model/storagepools.py | 7 ++++--- model/storagevolumes.py | 9 +++++---- model/vmhostdevs.py | 26 +++++++++++++------------- model/vms.py | 18 +++++++++--------- model/vmsnapshots.py | 6 +++--- tests/test_model.py | 21 ++++++++++----------- tests/test_rest.py | 15 ++++++--------- 8 files changed, 55 insertions(+), 56 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index cd06ee3..d0ba8bd 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -28,9 +28,10 @@ from collections import defaultdict from lxml import objectify from lxml.builder import E +from wok.asynctask import AsyncTask from wok.exception import NotFoundError, OperationFailed from wok.objectstore import ObjectStore -from wok.utils import add_task, convert_data_size +from wok.utils import convert_data_size from wok.xmlutils.utils import xml_item_update from wok.plugins.kimchi import imageinfo @@ -416,9 +417,9 @@ class MockModel(Model): def _mock_vmsnapshots_create(self, vm_name, params): name = params.get('name', unicode(int(time.time()))) params = {'vm_name': vm_name, 'name': name} - taskid = add_task(u'/plugins/kimchi/vms/%s/snapshots/%s' % - (vm_name, name), self._vmsnapshots_create_task, - self.objstore, params) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s/snapshots/%s' % + (vm_name, name), self._vmsnapshots_create_task, + params).id return self.task_lookup(taskid) def _vmsnapshots_create_task(self, cb, params): diff --git a/model/storagepools.py b/model/storagepools.py index a2dbaec..92d6436 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -21,9 +21,10 @@ import libvirt import lxml.etree as ET from lxml.builder import E +from wok.asynctask import AsyncTask from wok.exception import InvalidOperation, MissingParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import add_task, run_command, wok_log +from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import config, get_kimchi_version, kimchiPaths @@ -252,8 +253,8 @@ class StoragePoolsModel(object): params['path'] = self.scanner.scan_dir_prepare(params['name']) scan_params['pool_path'] = params['path'] - task_id = add_task('/plugins/kimchi/storagepools/%s' % ISO_POOL_NAME, - self.scanner.start_scan, self.objstore, scan_params) + task_id = AsyncTask('/plugins/kimchi/storagepools/%s' % ISO_POOL_NAME, + self.scanner.start_scan, scan_params).id # Record scanning-task/storagepool mapping for future querying try: with self.objstore as session: diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 7b2272b..4708674 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -28,9 +28,10 @@ import time import urllib2 from lxml.builder import E +from wok.asynctask import AsyncTask from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.utils import add_task, get_unique_file_name +from wok.utils import get_unique_file_name from wok.utils import probe_file_permission_as_user, wok_log from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel @@ -124,7 +125,7 @@ class StorageVolumesModel(object): params['pool'] = pool_name targeturi = '/plugins/kimchi/storagepools/%s/storagevolumes/%s' \ % (pool_name, name) - taskid = add_task(targeturi, create_func, self.objstore, params) + taskid = AsyncTask(targeturi, create_func, params).id return self.task.lookup(taskid) def _create_volume_with_capacity(self, cb, params): @@ -441,8 +442,8 @@ class StorageVolumeModel(object): 'new_pool': new_pool, 'new_name': new_name} target_uri = u'/plugins/kimchi/storagepools/%s/storagevolumes/%s/clone' - taskid = add_task(target_uri % (pool, new_name), self._clone_task, - self.objstore, params) + taskid = AsyncTask(target_uri % (pool, new_name), self._clone_task, + params).id return self.task.lookup(taskid) def _clone_task(self, cb, params): diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index e2299e2..0c89959 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -26,12 +26,13 @@ from lxml import etree, objectify from lxml.builder import E, ElementMaker from operator import itemgetter +from wok.asynctask import AsyncTask from wok.exception import InvalidOperation, InvalidParameter, NotFoundError from wok.exception import OperationFailed from wok.message import WokMessage from wok.model.tasks import TaskModel from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, run_command, wok_log +from wok.utils import run_command, wok_log from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.model.host import DeviceModel, DevicesModel @@ -92,11 +93,11 @@ class VMHostDevsModel(object): dev_info = self.dev_model.lookup(dev_name) if dev_info['device_type'] == 'pci': - taskid = add_task(u'/plugins/kimchi/vms/%s/hostdevs/' % - VMModel.get_vm(vmid, self.conn).name(), - self._attach_pci_device, self.objstore, - {'vmid': vmid, 'dev_info': dev_info, - 'lock': threading.RLock()}) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s/hostdevs/' % + VMModel.get_vm(vmid, self.conn).name(), + self._attach_pci_device, + {'vmid': vmid, 'dev_info': dev_info, + 'lock': threading.RLock()}).id return self.task.lookup(taskid) with RollbackContext() as rollback: @@ -110,11 +111,11 @@ class VMHostDevsModel(object): rollback.commitAll() - taskid = add_task(u'/plugins/kimchi/vms/%s/hostdevs/' % - VMModel.get_vm(vmid, self.conn).name(), - '_attach_%s_device' % dev_info['device_type'], - self.objstore, {'vmid': vmid, 'dev_info': dev_info, - 'lock': threading.RLock()}) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s/hostdevs/' % + VMModel.get_vm(vmid, self.conn).name(), + '_attach_%s_device' % dev_info['device_type'], + {'vmid': vmid, 'dev_info': dev_info, + 'lock': threading.RLock()}).id return self.task.lookup(taskid) @@ -604,8 +605,7 @@ class VMHostDevModel(object): 'lock': threading.RLock()} task_uri = u'/plugins/kimchi/vms/%s/hostdevs/%s' % \ (VMModel.get_vm(vmid, self.conn).name(), dev_name) - taskid = add_task(task_uri, self._detach_device, self.objstore, - task_params) + taskid = AsyncTask(task_uri, self._detach_device, task_params).id return self.task.lookup(taskid) def _event_devices(self, conn, dom, alias, opaque): diff --git a/model/vms.py b/model/vms.py index 3380278..7f607f5 100644 --- a/model/vms.py +++ b/model/vms.py @@ -34,12 +34,13 @@ from lxml import etree, objectify from lxml.builder import E from xml.etree import ElementTree +from wok.asynctask import AsyncTask from wok.config import config from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed from wok.model.tasks import TaskModel from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, convert_data_size +from wok.utils import convert_data_size from wok.utils import import_class, run_setfacl_set_attr, run_command, wok_log from wok.xmlutils.utils import dictize, xpath_get_text, xml_item_insert from wok.xmlutils.utils import xml_item_remove, xml_item_update @@ -144,8 +145,8 @@ class VMsModel(object): 'graphics': params.get('graphics', {}), "title": params.get("title", ""), "description": params.get("description", "")} - taskid = add_task(u'/plugins/kimchi/vms/%s' % name, self._create_task, - self.objstore, data) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s' % name, self._create_task, + data).id return self.task.lookup(taskid) @@ -349,9 +350,9 @@ class VMModel(object): new_name = get_next_clone_name(current_vm_names, name, ts=True) # create a task with the actual clone function - taskid = add_task(u'/plugins/kimchi/vms/%s/clone' % new_name, - self._clone_task, self.objstore, - {'name': name, 'new_name': new_name}) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s/clone' % new_name, + self._clone_task, {'name': name, + 'new_name': new_name}).id return self.task.lookup(taskid) @@ -1898,9 +1899,8 @@ class VMModel(object): 'non_shared': non_shared, 'remote_host': remote_host, 'user': user} - task_id = add_task('/plugins/kimchi/vms/%s/migrate' % name, - self._migrate_task, - self.objstore, params) + task_id = AsyncTask('/plugins/kimchi/vms/%s/migrate' % name, + self._migrate_task, params).id return self.task.lookup(task_id) diff --git a/model/vmsnapshots.py b/model/vmsnapshots.py index 6f2483c..6589306 100644 --- a/model/vmsnapshots.py +++ b/model/vmsnapshots.py @@ -23,8 +23,8 @@ import time from lxml import objectify from lxml.builder import E +from wok.asynctask import AsyncTask from wok.exception import InvalidOperation, NotFoundError, OperationFailed -from wok.utils import add_task from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel @@ -74,8 +74,8 @@ class VMSnapshotsModel(object): name = params.get('name', unicode(int(time.time()))) task_params = {'vm_name': vm_name, 'name': name} - taskid = add_task(u'/plugins/kimchi/vms/%s/snapshots/%s' % (vm_name, - name), self._create_task, self.objstore, task_params) + taskid = AsyncTask(u'/plugins/kimchi/vms/%s/snapshots/%s' % (vm_name, + name), self._create_task, task_params).id return self.task.lookup(taskid) def _create_task(self, cb, params): diff --git a/tests/test_model.py b/tests/test_model.py index e77d4fd..d9ffd5e 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -36,12 +36,13 @@ from mock import call, mock_open, patch import tests.utils as utils import wok.objectstore +from wok.asynctask import AsyncTask from wok.basemodel import Singleton from wok.config import config from wok.exception import InvalidOperation from wok.exception import InvalidParameter, NotFoundError, OperationFailed from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, convert_data_size, get_task_id +from wok.utils import convert_data_size from wok.xmlutils.utils import xpath_get_text from wok.plugins.gingerbase import netinfo @@ -1401,30 +1402,28 @@ class ModelTests(unittest.TestCase): inst = model.Model('test:///default', objstore_loc=self.tmp_store) - taskid = add_task('', quick_op, inst.objstore, 'Hello') + taskid = AsyncTask('', quick_op, 'Hello').id inst.task_wait(taskid) - self.assertEquals(get_task_id(), taskid) self.assertEquals('finished', inst.task_lookup(taskid)['status']) self.assertEquals('Hello', inst.task_lookup(taskid)['message']) - taskid = add_task('', long_op, inst.objstore, - {'delay': 3, 'result': False, - 'message': 'It was not meant to be'}) - self.assertEquals(get_task_id(), taskid) + params = {'delay': 3, 'result': False, + 'message': 'It was not meant to be'} + taskid = AsyncTask('', long_op, params).id self.assertEquals('running', inst.task_lookup(taskid)['status']) - self.assertEquals('OK', inst.task_lookup(taskid)['message']) + self.assertEquals('The request is being processing.', + inst.task_lookup(taskid)['message']) inst.task_wait(taskid) self.assertEquals('failed', inst.task_lookup(taskid)['status']) self.assertEquals('It was not meant to be', inst.task_lookup(taskid)['message']) - taskid = add_task('', abnormal_op, inst.objstore, {}) + taskid = AsyncTask('', abnormal_op, {}).id inst.task_wait(taskid) self.assertEquals('Exception raised', inst.task_lookup(taskid)['message']) self.assertEquals('failed', inst.task_lookup(taskid)['status']) - taskid = add_task('', continuous_ops, inst.objstore, - {'result': True}) + taskid = AsyncTask('', continuous_ops, {'result': True}).id self.assertEquals('running', inst.task_lookup(taskid)['status']) inst.task_wait(taskid, timeout=10) self.assertEquals('finished', inst.task_lookup(taskid)['status']) diff --git a/tests/test_rest.py b/tests/test_rest.py index 80596c2..90a808a 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -30,8 +30,8 @@ from functools import partial from tests.utils import get_free_port, patch_auth, request from tests.utils import run_server, wait_task +from wok.asynctask import AsyncTask from wok.rollbackcontext import RollbackContext -from wok.utils import add_task from wok.plugins.kimchi import mockmodel from wok.plugins.kimchi.osinfo import get_template_default @@ -1305,22 +1305,19 @@ class RestTests(unittest.TestCase): ) def test_tasks(self): - id1 = add_task('/plugins/kimchi/tasks/1', self._async_op, - model.objstore) - id2 = add_task('/plugins/kimchi/tasks/2', self._except_op, - model.objstore) - id3 = add_task('/plugins/kimchi/tasks/3', self._intermid_op, - model.objstore) + id1 = AsyncTask('/plugins/kimchi/tasks/1', self._async_op).id + id2 = AsyncTask('/plugins/kimchi/tasks/2', self._except_op).id + id3 = AsyncTask('/plugins/kimchi/tasks/3', self._intermid_op).id target_uri = urllib2.quote('^/plugins/kimchi/tasks/*', safe="") filter_data = 'status=running&target_uri=%s' % target_uri tasks = json.loads( self.request('/plugins/kimchi/tasks?%s' % filter_data).read() ) - self.assertEquals(3, len(tasks)) + self.assertLessEqual(3, len(tasks)) tasks = json.loads(self.request('/plugins/kimchi/tasks').read()) - tasks_ids = [int(t['id']) for t in tasks] + tasks_ids = [t['id'] for t in tasks] self.assertEquals(set([id1, id2, id3]) - set(tasks_ids), set([])) wait_task(self._task_lookup, id2) foo2 = json.loads( -- 2.7.4

2 2

[PATCH V5] [Wok 0/3] Issue #158: Move AsyncTask information to memory
by pvital＠linux.vnet.ibm.com 29 Aug '16

29 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V5: - Moved remove_tasks() to AsyncTask class. V4: - Fix usage of UUID to prevent "UUID Is not JSON Serializable" error V3: - Changes in how create AsyncTask V2: - moved all tasks_queue infrastructure to wok.asynctask - modified some user messages. V1: this patch-set moves AsyncTask information from objectstore to memory and it is dependency to solve Issue #122. Paulo Vital (3): Issue #158: Move AsyncTask information to memory Issue #158: Update model/tasks.py with AsyncTasks in memory. Issue #158: Add AsyncTasks testcases src/wok/asynctask.py | 48 +++++++++++-------- src/wok/i18n.py | 3 +- src/wok/model/tasks.py | 22 +++++---- src/wok/objectstore.py | 6 --- src/wok/utils.py | 19 -------- tests/test_tasks.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 166 insertions(+), 56 deletions(-) create mode 100644 tests/test_tasks.py -- 2.7.4

4 7

[PATCH v2] [Kimchi] Feature request (#860): Support Guest Autostart
by bianca＠linux.vnet.ibm.com 29 Aug '16

29 Aug '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Include 'autostart' option in API.json and vms.py (lookup and update) using libvirt dom.setAutostart to set as true or false. Also edit test_model.py to include those changes and updated API.md file. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- API.json | 4 ++++ docs/API.md | 2 ++ model/vms.py | 12 +++++++++--- tests/test_model.py | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/API.json b/API.json index 4fdd522..4946069 100644 --- a/API.json +++ b/API.json @@ -322,6 +322,10 @@ "error": "KCHVM0053E", "type": "boolean" }, + "autostart": { + "description": "Enable/Disable guest autostart", + "type": "boolean" + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/docs/API.md b/docs/API.md index b07bf16..9f30666 100644 --- a/docs/API.md +++ b/docs/API.md @@ -147,6 +147,7 @@ server. * groups: A list of system groups whose users have permission to access the VM. Default is: empty (i.e. no groups given access). * bootorder: list of devices in boot order + * autostart: show if autostart is enabled. * **DELETE**: Remove the Virtual Machine * **PUT**: update the parameters of existing VM * name: New name for this VM (only applied for shutoff VM) @@ -177,6 +178,7 @@ server. * threads - The number of threads per core. * bootorder: guest bootorder, types accepted: hd, cdrom, network or fd * bootmenu: prompts guest bootmenu. Bool type. + * autostart: enable/disable guest autostart (true or false params). * **POST**: *See Virtual Machine Actions* diff --git a/model/vms.py b/model/vms.py index 433770a..cfe4c97 100644 --- a/model/vms.py +++ b/model/vms.py @@ -79,11 +79,13 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users', + 'autostart'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', - 'name', 'users', 'bootorder', 'bootmenu'] + 'name', 'users', 'bootorder', 'bootmenu', + 'autostart'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -261,6 +263,9 @@ class VMModel(object): with lock: dom = self.get_vm(name, self.conn) + if "autostart" in params: + dom.setAutostart(1 if params['autostart'] == True else 0) + # You can only change <maxMemory> offline, updating guest XML if ("memory" in params) and ('maxmemory' in params['memory']) and\ (DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): @@ -1285,7 +1290,8 @@ class VMModel(object): 'access': 'full', 'persistent': True if dom.isPersistent() else False, 'bootorder': boot, - 'bootmenu': bootmenu + 'bootmenu': bootmenu, + 'autostart': dom.autostart() } def _vm_get_disk_paths(self, dom): diff --git a/tests/test_model.py b/tests/test_model.py index 27225f8..7b1fbfe 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1369,6 +1369,12 @@ class ModelTests(unittest.TestCase): inst.vm_update(u'пeω-∨м', {"bootmenu": False}) self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['bootmenu']) + # enable/disable autostart + inst.vm_update(u'пeω-∨м', {"autostart": True}) + self.assertEquals("yes", inst.vm_lookup(u'пeω-∨м')['autostart']) + inst.vm_update(u'пeω-∨м', {"autostart": False}) + self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['autostart']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) -- 2.7.4

3 2

[PATCH V2] [Kimchi] Only on s390x add default networks to template if template.conf has default network configuration uncommented.
by archus＠linux.vnet.ibm.com 29 Aug '16

29 Aug '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Below are the changes done for s390x architecture to only add default networks to template if template.conf has network configuration uncommented otherwise do not add any network by default. 1) Only on s390x, osinfo._get_tmpl_defaults() does not add default network in case template.conf has commented out network configuration. 2) Only on s390x, NetworksModel._check_default_networks() does not throw key error if networks not found in tmpl_defaults. 3) Only on s390x, VMTemplate.validate_integrity() does not throw key error if networks not found in the template. 4) Only on s390x, LibvirtVMTemplate._network_validate() does not throw key error on s390x if networks not found in tmpl_default, as on s390x networks is optional. 5) Only on s390x, VMTemplate._get_network_xml() does return empty string and does not throw key error if networks not found in template object. 6) Only on s390x, control/templates.py gets networks as [] if not found self.info. 7) Added method is_running_on_s390x in kimchi's utils. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- control/templates.py | 2 +- model/networks.py | 7 ++++++- model/templates.py | 6 +++++- osinfo.py | 14 +++++++++++++- utils.py | 11 +++++++++++ vmtemplate.py | 17 ++++++++++++++--- 6 files changed, 50 insertions(+), 7 deletions(-) diff --git a/control/templates.py b/control/templates.py index bb2e068..2dd8601 100644 --- a/control/templates.py +++ b/control/templates.py @@ -67,7 +67,7 @@ class Template(Resource): 'memory': self.info['memory'], 'cdrom': self.info.get('cdrom', None), 'disks': self.info['disks'], - 'networks': self.info['networks'], + 'networks': self.info.get('networks', []), 'folder': self.info.get('folder', []), 'graphics': self.info['graphics'], 'cpu_info': self.info.get('cpu_info') diff --git a/model/networks.py b/model/networks.py index 35431d4..603a31c 100644 --- a/model/networks.py +++ b/model/networks.py @@ -35,6 +35,7 @@ from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.config import kimchiPaths from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.utils import is_running_on_s390x from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml @@ -55,7 +56,11 @@ class NetworksModel(object): self.caps = CapabilitiesModel(**kargs) def _check_default_networks(self): - networks = list(set(tmpl_defaults['networks'])) + if is_running_on_s390x(): + networks = list(set(tmpl_defaults.get('networks', []))) + else: + networks = list(set(tmpl_defaults['networks'])) + conn = self.conn.get() for net_name in networks: diff --git a/model/templates.py b/model/templates.py index a299c85..387e4f1 100644 --- a/model/templates.py +++ b/model/templates.py @@ -35,6 +35,7 @@ from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import is_running_on_s390x from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -358,7 +359,10 @@ class LibvirtVMTemplate(VMTemplate): return sorted(map(lambda x: x.decode('utf-8'), names)) def _network_validate(self): - names = self.info['networks'] + if is_running_on_s390x(): + names = self.info.get('networks', []) + else: + names = self.info['networks'] for name in names: try: conn = self.conn.get() diff --git a/osinfo.py b/osinfo.py index 2c59312..af37c72 100644 --- a/osinfo.py +++ b/osinfo.py @@ -138,10 +138,22 @@ def _get_tmpl_defaults(): 'pool': '/plugins/kimchi/storagepools/default'}}, 'processor': {'vcpus': '1', 'maxvcpus': 1}, 'graphics': {'type': 'spice', 'listen': '127.0.0.1'}} + + The default values on s390x architecture: + + {'memory': {'current': 1024, 'maxmemory': 1024}, + 'storage': { 'disk.0': {'format': 'qcow2', 'size': '10', + 'pool': '/plugins/kimchi/storagepools/default'}}, + 'processor': {'vcpus': '1', 'maxvcpus': 1}, + 'graphics': {'type': 'spice', 'listen': '127.0.0.1'}} """ # Create dict with default values tmpl_defaults = defaultdict(dict) - tmpl_defaults['main']['networks'] = ['default'] + + host_arch = _get_arch() + if host_arch not in ['s390x']: + tmpl_defaults['main']['networks'] = ['default'] + tmpl_defaults['memory'] = {'current': _get_default_template_mem(), 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', diff --git a/utils.py b/utils.py index 26d3cf6..b88740a 100644 --- a/utils.py +++ b/utils.py @@ -20,6 +20,7 @@ import contextlib import json +import os import platform import re import sqlite3 @@ -272,3 +273,13 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_running_on_s390x(): + """ + Checks if running on s390x. + """ + if os.uname()[4] == 's390x': + return True + else: + return False diff --git a/vmtemplate.py b/vmtemplate.py index 7ac0541..f5405fa 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -288,7 +288,13 @@ class VMTemplate(object): networks = "" params = {'type': 'network', 'model': self.info['nic_model']} - for nw in self.info['networks']: + + if self.info.get('arch') == 's390x': + info_networks = self.info.get('networks', []) + else: + info_networks = self.info['networks'] + + for nw in info_networks: params['network'] = nw networks += get_iface_xml(params, self.info['arch'], self.info['os_distro'], @@ -353,7 +359,7 @@ class VMTemplate(object): graphics.update(kwargs.get('graphics', {})) # Graphics is not supported on s390x, this check will # not add graphics tag in domain xml. - if params['arch'] not in ['s390x']: + if params.get('arch') != 's390x': params['graphics'] = get_graphics_xml(graphics) libvirt_stream_protocols = kwargs.get('libvirt_stream_protocols', []) @@ -487,7 +493,12 @@ class VMTemplate(object): def validate_integrity(self): invalid = {} # validate networks integrity - invalid_networks = list(set(self.info['networks']) - + if self.info.get('arch') == 's390x': + networks = self.info.get('networks', []) + else: + networks = self.info['networks'] + + invalid_networks = list(set(networks) - set(self._get_all_networks_name())) if invalid_networks: invalid['networks'] = invalid_networks -- 2.7.4

4 3

[PATCH V4] [Wok 0/3] Issue #158: Move AsyncTask information to memory
by pvital＠linux.vnet.ibm.com 29 Aug '16

29 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V4: - Fix usage of UUID to prevent "UUID Is not JSON Serializable" error V3: - Changes in how create AsyncTask V2: - moved all tasks_queue infrastructure to wok.asynctask - modified some user messages. V1: this patch-set moves AsyncTask information from objectstore to memory and it is dependency to solve Issue #122. Paulo Vital (3): Issue #158: Move AsyncTask information to memory Issue #158: Update model/tasks.py with AsyncTasks in memory. Issue #158: Add AsyncTasks testcases src/wok/asynctask.py | 49 +++++++++++-------- src/wok/i18n.py | 3 +- src/wok/model/tasks.py | 22 +++++---- src/wok/objectstore.py | 6 --- src/wok/utils.py | 19 -------- tests/test_tasks.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 167 insertions(+), 56 deletions(-) create mode 100644 tests/test_tasks.py -- 2.7.4

2 4