August 2016 - Kimchi-devel - oVirt List Archives

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

26 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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

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

26 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 | 5 +++-- model/storagepools.py | 5 +++-- model/storagevolumes.py | 7 ++++--- model/vmhostdevs.py | 12 ++++++------ model/vms.py | 12 ++++++------ model/vmsnapshots.py | 4 ++-- tests/test_model.py | 15 +++++++-------- tests/test_rest.py | 11 ++++------- 8 files changed, 35 insertions(+), 36 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index cd06ee3..eed2e7f 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 add_task 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 @@ -418,7 +419,7 @@ class MockModel(Model): 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) + params) return self.task_lookup(taskid) def _vmsnapshots_create_task(self, cb, params): diff --git a/model/storagepools.py b/model/storagepools.py index a2dbaec..95e3858 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 add_task 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 @@ -253,7 +254,7 @@ 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) + self.scanner.start_scan, scan_params) # 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..958af3e 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 add_task 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 = add_task(targeturi, create_func, params) return self.task.lookup(taskid) def _create_volume_with_capacity(self, cb, params): @@ -442,7 +443,7 @@ class StorageVolumeModel(object): '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) + params) return self.task.lookup(taskid) def _clone_task(self, cb, params): diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index ef39de3..c92decd 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 add_task 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 @@ -94,7 +95,7 @@ class VMHostDevsModel(object): 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, + self._attach_pci_device, {'vmid': vmid, 'dev_info': dev_info, 'lock': threading.RLock()}) return self.task.lookup(taskid) @@ -113,8 +114,8 @@ class VMHostDevsModel(object): 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()}) + {'vmid': vmid, 'dev_info': dev_info, + 'lock': threading.RLock()}) 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 = add_task(task_uri, self._detach_device, task_params) 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..518378f 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 add_task 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 @@ -145,7 +146,7 @@ class VMsModel(object): "title": params.get("title", ""), "description": params.get("description", "")} taskid = add_task(u'/plugins/kimchi/vms/%s' % name, self._create_task, - self.objstore, data) + data) return self.task.lookup(taskid) @@ -350,8 +351,8 @@ class VMModel(object): # 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}) + self._clone_task, {'name': name, + 'new_name': new_name}) return self.task.lookup(taskid) @@ -1899,8 +1900,7 @@ class VMModel(object): 'remote_host': remote_host, 'user': user} task_id = add_task('/plugins/kimchi/vms/%s/migrate' % name, - self._migrate_task, - self.objstore, params) + self._migrate_task, params) return self.task.lookup(task_id) diff --git a/model/vmsnapshots.py b/model/vmsnapshots.py index 6f2483c..520623e 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 add_task 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 @@ -75,7 +75,7 @@ class VMSnapshotsModel(object): 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) + name), self._create_task, task_params) 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..0a5d343 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 add_task 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, get_task_id from wok.xmlutils.utils import xpath_get_text from wok.plugins.gingerbase import netinfo @@ -1401,15 +1402,14 @@ class ModelTests(unittest.TestCase): inst = model.Model('test:///default', objstore_loc=self.tmp_store) - taskid = add_task('', quick_op, inst.objstore, 'Hello') + taskid = add_task('', quick_op, 'Hello') 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'}) + taskid = add_task('', long_op, {'delay': 3, 'result': False, + 'message': 'It was not meant to be'}) self.assertEquals(get_task_id(), taskid) self.assertEquals('running', inst.task_lookup(taskid)['status']) self.assertEquals('OK', inst.task_lookup(taskid)['message']) @@ -1417,14 +1417,13 @@ class ModelTests(unittest.TestCase): 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 = add_task('', abnormal_op, {}) 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 = add_task('', continuous_ops, {'result': True}) 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..483e5ff 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 add_task 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,12 +1305,9 @@ 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 = add_task('/plugins/kimchi/tasks/1', self._async_op) + id2 = add_task('/plugins/kimchi/tasks/2', self._except_op) + id3 = add_task('/plugins/kimchi/tasks/3', self._intermid_op) target_uri = urllib2.quote('^/plugins/kimchi/tasks/*', safe="") filter_data = 'status=running&target_uri=%s' % target_uri -- 2.7.4

3 3

[PATCH] [Wok 0/3] Multiple UI patches for DataTables redesigned panels
by sguimaraes943＠gmail.com 26 Aug '16

26 Aug '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patchtset contains some updates that are required for the new redesigned panels in Ginger Samuel Guimarães (3): Minor change in Wok Drop-Downs to fix text alignment with different icons and locales Fixed minor issue with sortable icons on Datatables.net CSS and with default DOM in JS Added IP Address sorting plugin for Datatables.net configure.ac | 2 + ui/css/datatables.bootstrap.css | 9 ++ ui/css/src/datatables.bootstrap.scss | 8 ++ ui/css/src/modules/_buttons.scss | 9 ++ ui/css/src/modules/_menu-flat.scss | 44 +++++++-- ui/css/wok.css | 102 ++++++++++++++++++-- ui/js/src/wok.datatables.js | 2 +- ui/libs/datatables/js/Makefile.am | 2 + ui/libs/datatables/js/plugins/Makefile.am | 19 ++++ ui/libs/datatables/js/plugins/ip-address/LICENSE | 20 ++++ .../datatables/js/plugins/ip-address/Makefile.am | 21 +++++ .../datatables/js/plugins/ip-address/ip-address.js | 103 +++++++++++++++++++++ ui/pages/wok-ui.html.tmpl | 1 + 13 files changed, 327 insertions(+), 15 deletions(-) create mode 100644 ui/libs/datatables/js/plugins/Makefile.am create mode 100644 ui/libs/datatables/js/plugins/ip-address/LICENSE create mode 100644 ui/libs/datatables/js/plugins/ip-address/Makefile.am create mode 100644 ui/libs/datatables/js/plugins/ip-address/ip-address.js -- 2.5.5

2 4

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

26 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 | 58 +++++++++++++++-------- 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, 177 insertions(+), 55 deletions(-) create mode 100644 tests/test_tasks.py -- 2.7.4

3 8

[PATCH] [Kimchi] Check if VM is off before detaching multifn PCI
by Jose Ricardo Ziviani 26 Aug '16

26 Aug '16

- this commit fix a bug when detaching multifunction pci devices because hotplug/coldplug need a different approach with libvirt upstream. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index ef39de3..e2299e2 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -686,6 +686,9 @@ class VMHostDevModel(object): return devices def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + return False + domain, bus, slot, _ = dev_name.split('_')[1:] # get all devices attached to the guest in the same domain+bus+slot # that the one we are going to detach because they must be detached -- 2.7.4

3 2

[PATCH] [Kimchi] Github #986: create '/data/virtviewerfiles' dir automatically
by dhbarboza82＠gmail.com 26 Aug '16

26 Aug '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch makes the '/data/virtviewerfiles' dir behave the same as '/data/screenshots', being created automatically at Kimchi startup if it doesn't exists. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- root.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root.py b/root.py index a88f97d..90680b4 100644 --- a/root.py +++ b/root.py @@ -37,7 +37,8 @@ class Kimchi(WokRoot): make_dirs = [ os.path.dirname(os.path.abspath(config.get_object_store())), os.path.abspath(config.get_distros_store()), - os.path.abspath(config.get_screenshot_path()) + os.path.abspath(config.get_screenshot_path()), + os.path.abspath(config.get_virtviewerfiles_path()) ] for directory in make_dirs: if not os.path.isdir(directory): -- 2.5.5

4 3

[PATCH] [Kimchi] Revert "Fix frontend vcpu hotplug"
by Jose Ricardo Ziviani 26 Aug '16

26 Aug '16

This reverts commit 7cc96b592191b521effac1a6bb98a2b4dbf29474, this commit must be available only in HostOS repository for now. --- ui/js/src/kimchi.guest_edit_main.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9b6eab6..dcaafb8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -815,13 +815,12 @@ kimchi.guest_edit_main = function() { for (var key in data) { valueFromUI = data[key]; if (valueFromUI instanceof Object) { - // Compare if Objects of original and data are identical. - // Handle special case when key is memory and guest is - // running as valueFromUI will return a null for max mem - // since it is disabled. + // Compare if Objects of original and data are identical + // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem + // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { if (key === 'cpu_info') { - data['cpu_info']['maxvcpus'] = org.cpu_info.maxvcpus; + continue; } if (key === 'memory') { // Replace valueFromUI of max mem with one from original as otherwise the value is undefined -- 2.7.4

3 2

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

26 Aug '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 | 25 ++------- src/wok/i18n.py | 3 +- src/wok/model/tasks.py | 22 ++++---- src/wok/objectstore.py | 6 --- src/wok/utils.py | 31 ++++++++--- tests/test_tasks.py | 136 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 178 insertions(+), 45 deletions(-) create mode 100644 tests/test_tasks.py -- 2.7.4

4 13

[RFC] Issue# 979 Create UI to change boot order
by Socorro Stoppler 25 Aug '16

25 Aug '16

Per discussion w/Samuel, here is what the proposed UI looks like. A menu item - 'Change boot order' - in Actions for each guest will be added to invoke this. Dragging the entries will cause the order to change. Thoughts? Thanks! -Socorro

3 5

[RFC] Should not be allowed to remove "default" storagepool and network
by Ramon Medeiros 25 Aug '16

25 Aug '16

Propose: avoid to delete default network and storage pool: files affected: Create a error message at i18n.py Check at delete() method on model to verify Doubt: Where is defined the default pool and network? I did not see it in kimchi.conf Should i create a entry to deal it? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 0

[RFC] listing of ovs bridges
by Suresh Babu Angadi 25 Aug '16

25 Aug '16

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

1 0

[WIP][Wok 0/2] Use javascript libraries from rpms, not hardcoded
by Ramon Medeiros 24 Aug '16

24 Aug '16

This isn't a patch yet since the commit "Change configuration files" are not working well. I need to change ui/libs/Makefile.am to set SUBDIRS variable (that trigger javascript hardcoded libs build) and change ui/pages/Makefile.am, to copy the template according to distro. Can you guys help me on makefile syntax? Ramon Medeiros (2): Use javascript libraries from rpms Change configuration files configure.ac | 11 ++ docs/fedora-deps.md | 4 +- docs/ubuntu-deps.md | 3 +- src/wok/config.py.in | 22 +++ ui/libs/Makefile.am | 10 +- ui/pages/Makefile.am | 9 ++ ui/pages/login.html.tmpl.fedora | 332 +++++++++++++++++++++++++++++++++++++++ ui/pages/login.html.tmpl.ubuntu | 332 +++++++++++++++++++++++++++++++++++++++ ui/pages/wok-ui.html.tmpl.fedora | 231 +++++++++++++++++++++++++++ ui/pages/wok-ui.html.tmpl.ubuntu | 231 +++++++++++++++++++++++++++ 10 files changed, 1182 insertions(+), 3 deletions(-) create mode 100644 ui/pages/login.html.tmpl.fedora create mode 100644 ui/pages/login.html.tmpl.ubuntu create mode 100644 ui/pages/wok-ui.html.tmpl.fedora create mode 100644 ui/pages/wok-ui.html.tmpl.ubuntu -- 2.5.5

4 9

[RFC] integrety: storage pool deactivate/undefine needs to consider vm usage #355
by Ramon Medeiros 24 Aug '16

24 Aug '16

Propose: do not deactive or undefine storage pool with vms being used. Avoid undefine storage pool was already discussed. Talking about deactive, we've got some questions: 1) Since the storage volume is available, the vm can run with storage poll on or off. So, we are going only to avoid deactive pools that can make storage volume unavailable, like nfs? 2) Or we are going to extend this rule to all storage pools? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 0

[PATCH] [Kimchi 0/2] Wok #141 - Adjust imports and wording
by Lucio Correia 24 Aug '16

24 Aug '16

Depends on: [Wok 0/7] #141 - Log async tasks status Lucio Correia (2): Fix imports for add_task module change Change wording of user log messages to reflect ongoing task i18n.py | 18 +++++++++--------- mockmodel.py | 3 ++- model/storagepools.py | 3 ++- model/storagevolumes.py | 7 ++++--- model/vmhostdevs.py | 3 ++- model/vms.py | 5 +++-- model/vmsnapshots.py | 2 +- tests/test_model.py | 7 ++++--- tests/test_rest.py | 2 +- 9 files changed, 28 insertions(+), 22 deletions(-) -- 1.9.1

1 3

[PATCH] [Wok 0/7] #141 - Log async tasks status
by Lucio Correia 24 Aug '16

24 Aug '16

IMPORTANT: This patchset requires its counterparts on all plugins to not break. Lucio Correia (7): Add get_plugin_from_uri() method to wok utils Move add_task to asynctask to avoid cyclic import Log AsyncTask start, success and failure Sort user log records by microsecond Put failure details into parenthesis Update UI to show TASK statuses and search for TASK entries Remove GET from advanced search form src/wok/asynctask.py | 74 ++++++++++++++++++++++++++++----- src/wok/i18n.py | 3 ++ src/wok/reqlogger.py | 27 ++++++++++-- src/wok/utils.py | 18 ++++---- ui/js/wok.user-log.js | 28 +++++++++---- ui/pages/tabs/settings-search.html.tmpl | 2 +- 6 files changed, 120 insertions(+), 32 deletions(-) -- 1.9.1

2 10

[Wok] [RFC] Issue #122: Make AsyncTask stoppable.
by Paulo Ricardo Paz Vital 24 Aug '16

24 Aug '16

This is an RFC for "Make AsyncTask stoppable" in Wok (and any other plugin). The main idea is give to user a way to stop a Task that is still running, cleaning all references and processes and setting the Task status to "killed". To do this, the Task API need to be modified, by implementing the DELETE method in Task Resource. Said that, the API will look like: ### Resource: Task **URI:** /tasks/*:id* A task represents an asynchronous operation that is being performed by the server. **Methods:** * **GET**: Retrieve the full description of the Task * id: The Task ID is used to identify this Task in the API. * status: The current status of the Task * running: The task is running * finished: The task has finished successfully * failed: The task failed + * killed: The task was killed by user * message: Human-readable details about the Task status * target_uri: Resource URI related to the Task +* **DELETE**: Delete the Task * **POST**: *See Task Actions* **Actions (POST):** *No actions defined* 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 as argument to the add_task() a method to be executed by the DELETE operation, called here as 'kill_cb'. With this idea, the add_task() method and also the AsyncTask constructor will be like: def add_task(target_uri, fn, objstore, kill_cb=None, opaque=None): class AsyncTask(object): def __init__(self, id, target_uri, fn, objstore, kill_cb=None, opaque=None): If none kill_cb is passed, the task will not be able to stopped and an error (or warning) 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'. If you have any comments or suggestions, please feel free to reply to ML. Thanks and bestr regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

3 5

[RFC] [Wok] Issue 141 - Track asynchronous tasks in user request log
by Lucio Correia 23 Aug '16

23 Aug '16

User Request Log needs to be improved to track some special requests of Kimchi, Ginger and Gingerbase which, when successful, generate an asynchronous task to do the actual job. Examples are cloning vms, upgrading software and creating volumes. Currently those requests are always logged as successful, even when the generated asynchronous task fails for some reason. My proposal to solve this issue is to: 1 - Change the wording of all existing user log messages for requests that generate asynchronous task. i.e.: change "Clone vm 'name'" to "Start to clone vm 'name'" 2 - Log a couple of additional entries in AsyncTask for each task executed: - "Started Kimchi task ID 100: /plugins/kimchi/vms/name/clone" when async task is started successfully - "Successfully completed Kimchi task ID 100: /plugins/kimchi/vms/name/clone" when async task works fine *or* "Failure on Kimchi task ID 100: /plugins/kimchi/vms/name/clone (KCHVM0001E failed to clone vm 'name')" when async task fails 3 - Backend/UI work to recognize the new type of entry: { "time": "11:49:55", "date": "2016-08-12" "zone": "BRT", timezone continues the same "req": "TASK", use a specific "request" type for differentiation, i.e. TASK "user": "", "ip": "", user and ip will be blank, since we are out of scope of the request "status": 1002, create 3 new status codes, say 1000 for "task started", 1001 for "task completed successfully", 1002 for "task failed" "app": "kimchi", app will be informed by each plugin (backend change) "msgCode": "WOKASYNC0002L", async task log message Id, based on status "detCode": "KCHVM00001E", failed task details: original exception } >>> {"target_uri": "/plugins/kimchi/vms/name/clone", "task_id": 100} msgCode params >>> {"vm": "name"} detCode params (optional) >>> Failure on Kimchi task ID 100: /plugins/kimchi/vms/name/clone (KCHVM0001E failed to blah blah) English log message A corresponding log entry in text file for this example would be: [2016-08-12 11:49:55 BRT] TASK 1002 kimchi Failure on Kimchi task ID 100: /plugins/kimchi/vms/name/clone (KCHVM0001E failed to clone vm 'name') With this implementation it will be possible for an admin to see: * how much time a task took/is taking to run * which other requests were done between task start and finish Thanks, -- Lucio Correia Software Engineer IBM LTC Brazil

3 6

RFC: Templates API changes for 'networks' attribute
by Suresh Babu Angadi 23 Aug '16

23 Aug '16

Hi All, To support, attaching a physical interface to guest as macvtap or attaching ovs bridge to guest without creating libvirt network, I propose following changes to 'networks' attribute of templates josn. current implementation: 'networks' attribute expects list of virtual network names changes: 'networks': list of dictionary type: can be direct, network or bridge interface: name of physical interface(type=direct) or ovs (type=bridge) or virtual network(type=direct) mode(required if type=direct): bridge or vepa for macvtap: type is direct and mode can be bridge or vepa for ovs: type is bridge and mode is not required for virtual network: type=network(current implementation) Examples of network xml for attaching macvtap and ovs to guest without libvirt: OVS: <interface type="bridge"> <source bridge="vswitch0"/> <virtualport type="openvswitch"/> <model type="virtio"/> </interface> macvtap with bridge mode: <interface type="direct"> <source dev="eth0" mode="bridge"/> <model type="virtio"/> </interface> macvtap with vepa mode: <interface type="direct"> <source dev="bond0" mode="vepa"/> <model type="virtio"/> </interface> -- Regards, Suresh Babu Angadi

5 14

[PATCH][Kimchi] Allow vm update graphics type
by Ramon Medeiros 23 Aug '16

23 Aug '16

Allow vm to choose between spice and vnc Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 2 +- model/vms.py | 10 ++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/API.json b/API.json index a3af02d..dca6840 100644 --- a/API.json +++ b/API.json @@ -377,6 +377,12 @@ "description": "Life time for the graphics password.", "type": "number", "error": "KCHVM0032E" + }, + "type": { + "description": "Graphics type", + "type": "string", + "enum": ["spice", "vnc"], + "error": "KCHVM0054E" } } }, diff --git a/docs/API.md b/docs/API.md index 7bd677f..bb8049b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -166,6 +166,7 @@ server. * passwdValidTo *(optional)*: lifetime for the console password. When omitted the password will be valid just for 30 seconds. + * type *(optional)*: graphics type. VNC os Spice. * cpu_info *(optional)*: CPU-specific information. * maxvcpus *(optional)*: The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a diff --git a/i18n.py b/i18n.py index e8d9c05..183329e 100644 --- a/i18n.py +++ b/i18n.py @@ -106,7 +106,7 @@ messages = { "KCHVM0051E": _("Cannot reset %(name)s. Virtual machine is already shut off."), "KCHVM0052E": _("Boot order must be a list. Devices accepted: hd, cdrom, fd or network."), "KCHVM0053E": _("Bootmenu must be boolean. Values accepted: true of false."), - + "KCHVM0054E": _("Graphics type. Values accepted: vnc or spice."), "KCHVM0055E": _("Migrate to localhost %(host)s is not allowed."), "KCHVM0056E": _("To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host."), "KCHVM0057E": _("Can not migrate virtual machine %(name)s when its in %(state)s state."), diff --git a/model/vms.py b/model/vms.py index 3380278..cdcb501 100644 --- a/model/vms.py +++ b/model/vms.py @@ -290,6 +290,12 @@ class VMModel(object): # GRAPHICS can be updated offline or online if 'graphics' in params: + + # some parameters cannot change while vm is running + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff': + if 'type' in params['graphics']: + raise InvalidParameter('KCHVM0074E', + {'params': 'graphics type'}) dom = self._update_graphics(dom, params) # Live updates @@ -701,6 +707,10 @@ class VMModel(object): valid_to = time.strftime('%Y-%m-%dT%H:%M:%S', expire_time) graphics.attrib['passwdValidTo'] = valid_to + gtype = params['graphics'].get('type') + if gtype is not None: + graphics.attrib['type'] = gtype + conn = self.conn.get() if not dom.isActive(): return conn.defineXML(ET.tostring(root, encoding="utf-8")) -- 2.5.5

2 1

[RFC] Changes to "disks" attribute of template creation API to support s390 architecture
by Pooja Kulkarni 22 Aug '16

22 Aug '16

Hi All, Since currently s390 does not support libvirt storage pools, we propose to provide an additional parameter "path" in disks section to specify the path for a default IMG file to be created in. if "path" attribute is specified, size parameter should be mandatory. Two possible ways to implement default values, keeping the current option of 'pool' as well: 1. If both path and pool options are found in default config file, path always takes higher precedence over pool irrespective of arch (incase of s390 pool is ignored) 2. Have a different config file if arch is s390 where only default path is found (no pool option). Let me know what you think. Regards, Pooja Kulkarni

4 3

[PATCH V3] [Wok 0/5] Fix issue #142
by Lucio Correia 22 Aug '16

22 Aug '16

Changes in V3: Added patch 5. Other patches are the same already reviewed. Lucio Correia (5): Add option to get untranslated message text Issue #142 - Translate request log at reading-time Fix issue with converting message to unicode Update tests Fix ascii_dict and utf8_dict src/wok/control/base.py | 13 ++++++------ src/wok/message.py | 32 ++++++++++++++++------------- src/wok/reqlogger.py | 53 ++++++++++++++++++++++++++++++++++++++++--------- src/wok/root.py | 12 +++++------ src/wok/stringutils.py | 6 ++---- tests/test_api.py | 2 +- 6 files changed, 77 insertions(+), 41 deletions(-) -- 1.9.1

3 12

[PATCH] [Wok] BugFix - session timeout dialog on login
by peterpnns＠gmail.com 22 Aug '16

22 Aug '16

From: peterpennings <peterpnns(a)gmail.com> This patch fixes the quickly appears of the session timeout dialog on successful login peterpennings (2): Wok BugFix - session message appearing on login ui/js/src/wok.api.js | 3 + 1 file changed, 23 insertions(+) -- 2.5.0

4 5

[PATCH V2] [Wok 0/2] Show error reason in log of failed user requests
by Lucio Correia 22 Aug '16

22 Aug '16

Changes in v2: * removed getCode and getParams from exception Lucio Correia (2): Fix issue #140 - Add original exception to user request log message Update tests src/wok/control/base.py | 9 +++++++++ src/wok/exception.py | 1 + src/wok/reqlogger.py | 33 ++++++++++++++++++++++++++++----- src/wok/root.py | 7 ++++++- tests/test_api.py | 4 ---- 5 files changed, 44 insertions(+), 10 deletions(-) -- 1.9.1

3 5

[PATCH] [Wok 0/3] Show error reason in log of failed user requests
by Lucio Correia 22 Aug '16

22 Aug '16

This patchset fixes issue #140. Lucio Correia (3): Update WokException to store code and args Fix issue #140 - Add original exception to user request log message Update tests src/wok/control/base.py | 9 +++++++++ src/wok/exception.py | 7 +++++++ src/wok/reqlogger.py | 34 +++++++++++++++++++++++++++++----- src/wok/root.py | 7 ++++++- tests/test_api.py | 4 ---- 5 files changed, 51 insertions(+), 10 deletions(-) -- 1.9.1

3 11

[RFC] Do not delete storage pool with storage volumes assigned to guests
by Ramon Medeiros 22 Aug '16

22 Aug '16

Propose: Return error when a storage pool is marked to be deleted, but it has a storage volume assigned to it. Issues: 1) Nowadays, to delete a storage pool, it must be inactive. To list storage volumes, the storage pool need to be active, so, kimchi must turn it on before querying. The issue is: The storage pool can be handle this way? Can we get trouble with network pools, like nfs? 2) Querying storagevolumes by XML can generate a lot of errors. I did the following algorithm: Get storage pool path -> list all domains -> Compare if storage volumes starts with storage pool path But, not all volumes inside the directory of storage pool belongs to it (there is a example of this case at unit tests). And, as kimchi will support creating volumes outside a pool, this checking will not work. How we can fix this? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 0