April 2016 - Kimchi-devel - oVirt List Archives

[PATCH V3] [Kimchi 0/4] Issue #817 - PCI attach/detach improvements.
by pvital＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V3: * Fixed copyright line of new files. V2: This is the backend part of the solution to Issue #817. In this solution the support for handle Libvirt events is added, as well, the attach and detach functions were modified to return AsyncTasks (then frontend can be informed when a device is really attached/detached). Patch "Add support to Libvirt Events." is the third version of previous submitted patch. Patch "Make detach device return an AsyncTask" needs submitted Wok patch "Update AsyncResource class with delete method." to work. Paulo Vital (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

2 5

[PATCH V2] [Kimchi 0/4] Issue #817 - PCI attach/detach improvements.
by pvital＠linux.vnet.ibm.com 18 Apr '16

18 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This is the backend part of the solution to Issue #817. In this solution the support for handle Libvirt events is added, as well, the attach and detach functions were modified to return AsyncTasks (then frontend can be informed when a device is really attached/detached). Patch "Add support to Libvirt Events." is the third version of previous submitted patch. Patch "Make detach device return an AsyncTask" needs submitted Wok patch "Update AsyncResource class with delete method." to work. Paulo Vital (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

3 10

[PATCH v2] [Kimchi] Issue #920: Template is removed if an ISO doesn't exist
by Jose Ricardo Ziviani 15 Apr '16

15 Apr '16

- This commit changes the way the template update works. Now, it really updates the existing template instead of creating a new one (and deleting the old one) Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 3 +++ model/templates.py | 55 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/i18n.py b/i18n.py index 7cce796..e4656cb 100644 --- a/i18n.py +++ b/i18n.py @@ -155,8 +155,10 @@ messages = { "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"), "KCHTMPL0001E": _("Template %(name)s already exists"), + "KCHTMPL0002E": _("Source media %(path)s not found"), "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"), "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"), + "KCHTMPL0005E": _("Template %(name)s does not exist."), "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."), "KCHTMPL0007E": _("Network %(network)s specified for template %(template)s is not active"), "KCHTMPL0008E": _("Template name must be a string"), @@ -181,6 +183,7 @@ messages = { "KCHTMPL0029E": _("Disk format must be 'raw', for logical, iscsi, and scsi pools."), "KCHTMPL0030E": _("Memory expects an object with one or both parameters: 'current' and 'maxmemory'"), "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"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/templates.py b/model/templates.py index a02099c..e240317 100644 --- a/model/templates.py +++ b/model/templates.py @@ -51,7 +51,7 @@ class TemplatesModel(object): self.objstore = kargs['objstore'] self.conn = kargs['conn'] - def create(self, params): + def _validate_template_params(self, params): name = params.get('name', '').strip() conn = self.conn.get() @@ -72,8 +72,7 @@ class TemplatesModel(object): # image does not exists: raise error elif not os.path.exists(path): - raise InvalidParameter("Unable to find file %(path)s" % - {"path": path}) + raise InvalidParameter("KCHTMPL0002E", {'path': path}) # create magic object to discover file type file_type = magic.open(magic.MAGIC_NONE) @@ -119,16 +118,18 @@ class TemplatesModel(object): if 'volume' in disk.keys(): self.template_volume_validate(volume, disk['pool']) - # template with the same name already exists: raise exception - name = params['name'] - with self.objstore as session: - if name in session.get_list('template'): - raise InvalidOperation("KCHTMPL0001E", {'name': name}) + return t + + def create(self, params): + template = self._validate_template_params(params) # Store template on objectstore + name = params['name'] try: with self.objstore as session: - session.store('template', name, t.info, + if name in session.get_list('template'): + raise InvalidOperation("KCHTMPL0001E", {'name': name}) + session.store('template', name, template.info, get_kimchi_version()) except InvalidOperation: raise @@ -204,31 +205,33 @@ class TemplateModel(object): raise OperationFailed('KCHTMPL0021E', {'err': e.message}) def update(self, name, params): - old_t = self.lookup(name) - new_t = copy.copy(old_t) + edit_template = self.lookup(name) + + edit_template['source_media'] = edit_template.get( + 'base', edit_template['cdrom']) # Merge graphics settings graph_args = params.get('graphics') if graph_args: - graphics = dict(new_t['graphics']) + graphics = dict(edit_template['graphics']) graphics.update(graph_args) params['graphics'] = graphics # Merge cpu_info settings new_cpu_info = params.get('cpu_info') if new_cpu_info: - cpu_info = dict(new_t['cpu_info']) + cpu_info = dict(edit_template['cpu_info']) cpu_info.update(new_cpu_info) params['cpu_info'] = cpu_info # Fix memory values, because method update does not work recursively new_mem = params.get('memory') if new_mem is not None: - params['memory'] = copy.copy(old_t.get('memory')) + params['memory'] = copy.copy(edit_template.get('memory')) params['memory'].update(new_mem) validate_memory(params['memory']) - new_t.update(params) + edit_template.update(params) for net_name in params.get(u'networks', []): try: @@ -238,13 +241,25 @@ class TemplateModel(object): raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) - self.delete(name) + template = self.templates._validate_template_params(edit_template) + try: - ident = self.templates.save_template(new_t) - except: - ident = self.templates.save_template(old_t) + with self.objstore as session: + if name not in session.get_list('template'): + raise InvalidOperation("KCHTMPL0005E", {'name': name}) + + if template.info['name'] != name: + session.delete('template', name) + + session.store('template', template.info['name'], + template.info, get_kimchi_version()) + + except InvalidOperation: raise - return ident + except Exception, e: + raise OperationFailed('KCHTMPL0032E', {'err': e.message}) + + return template.info['name'] def validate_memory(memory): -- 1.9.1

2 2

[PATCH] [Kimchi 0/4] Issue #817 - PCI attach/detach improvements.
by pvital＠linux.vnet.ibm.com 14 Apr '16

14 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This is the backend part of the solution to Issue #817. In this solution the support for handle Libvirt events is added, as well, the attach and detach functions were modified to return AsyncTasks (then frontend can be informed when a device is really attached/detached). Patch "Add support to Libvirt Events." is the third version of previous submitted patch. Patch "Make detach device return an AsyncTask" needs submitted Wok patch "Update AsyncResource class with delete method." to work. Paulo Vital (4): Add support to Libvirt Events. Add Events support to VM's Devices attach/detach. Make attach device return an AsyncTask Make detach device return an AsyncTask control/vm/hostdevs.py | 6 +-- i18n.py | 4 ++ model/libvirtevents.py | 124 +++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- model/vmhostdevs.py | 135 ++++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 model/libvirtevents.py -- 2.5.5

2 5

[PATCH] [Wok] Wok utils method for converting String to Unicode and vice versa.
by archus＠linux.vnet.ibm.com 14 Apr '16

14 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added two utils methods which can be used to convert String to Unicode and Unicode to String. This method does the checking of instance of value passed and accordingly used the encode, decode, str methods. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 175cf25..0e8ec05 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -622,3 +622,27 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def encode_value(val): + """ + Convert the value to string. + If its unicode, use encode otherwise str. + """ + if isinstance(val, unicode): + return val.encode('utf-8') + return str(val) + + +def decode_value(val): + """ + Converts value to unicode, + if its not an instance of unicode. + For doing so convert the val to string, + if its not instance of basestring. + """ + if not isinstance(val, basestring): + val = str(val) + if not isinstance(val, unicode): + val = val.decode('utf-8') + return val -- 2.5.0

3 4

[PATCH] [Wok] Wok utils method for converting String to Unicode and vice versa.
by archus＠linux.vnet.ibm.com 14 Apr '16

14 Apr '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added two utils methods which can be used to convert String to Unicode and Unicode to String. This method does the checking of instance of value passed and accordingly used the encode, decode, str methods. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 175cf25..0e8ec05 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -622,3 +622,27 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def encode_value(val): + """ + Convert the value to string. + If its unicode, use encode otherwise str. + """ + if isinstance(val, unicode): + return val.encode('utf-8') + return str(val) + + +def decode_value(val): + """ + Converts value to unicode, + if its not an instance of unicode. + For doing so convert the val to string, + if its not instance of basestring. + """ + if not isinstance(val, basestring): + val = str(val) + if not isinstance(val, unicode): + val = val.decode('utf-8') + return val -- 2.5.0

3 2

[PATCH] [Kimchi] Create template (UI part) without specifying media type
by Socorro Stoppler 14 Apr '16

14 Apr '16

Rather than specifying whether local file is an img or an ISO, all the user has to do is to input the file including the path of its location. Kimchi will handle the rest on the backend. Rather than originally having 3 radio buttons, it is now 2 radio buttons -- one for local and the other for remote. This patch needs to work in conjunction w/Ramon's latest patch set sent today - Use a single field to create a template - (backend) Socorro Stoppler (1): Create template without specifying media type ui/css/kimchi.css | 2 +- ui/css/src/modules/_templates.scss | 2 +- ui/js/src/kimchi.template_add_main.js | 378 +++++----------------------------- ui/pages/template-add.html.tmpl | 73 +------ 4 files changed, 55 insertions(+), 400 deletions(-) -- 2.5.0

4 12

Duplicate Wok Modal windows
by Samuel Henrique De Oliveira Guimaraes 13 Apr '16

13 Apr '16

Hey team, I'm not sure if this is still happening randomly with Ginger, Gingerbase or Kimchi because after the latest changes to wok.window.js it was supposed to be fixed but I was able to reproduce it once again when developing Ginger OVS Bridge UI. The problem is not related to wok.window.js at all, but in majority if a function that builds the UI has a wok.window.open() line inside of any block and the same parent function is called again, the modal content is hidden from the DOM tree but not removed. This will create windows with different IDs but with the same content inside the modal dialog. The ideal fix would be isolating all click handlers in a different function. For instance, suppose we have a function like this: ginger.buildTableUi = function() { // Some lines $('button').on('click',function(){ wok.window.open('url'); }); // Some lines }; ginger.buildTableUi(); And then ginger.buildTableUi() is called again once a new element is added or removed from/to a table or list, this will make the modal content append inside the modal window at N times that this function was called. Instead we have to isolate the click events like this: ginger.someTabclickHandler = function() { $('container').on('click','button',function(){ wok.window.open('url'); }); } And then we can call it like this: ginger.buildTableUi(); ginger.someTabclickHandler(); Call ginger.buildTableUi() many times as you want and it won't duplicate the click handlers :) Please pay attention the changes in the click event differences from the examples above. Since the UI will dynamically generate the buttons or links that we'll bind new events, we have to add a static container that is not generated by JS or ensure that the container, button or link element was in the DOM tree before someTabclickHandler() was called. If you find any duplicate modal windows, please let me know or follow the instructions above and send a patch :) Regards, Samuel

2 1

[PATCH] [Kimchi] Fixed some issues with SCSS after adding compact() mixin to Wok
by sguimaraes943＠gmail.com 13 Apr '16

13 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Patch "Added compact Sass function that was removed from libsass" is required in order to compile the correct CSS output from kimchi.scss. Samuel Guimarães (1): Fixed some issues with SCSS after adding compact() mixin to Wok ui/css/kimchi.css | 38 ++++++++++++++++++------------------ ui/css/src/kimchi.scss | 2 ++ ui/css/src/modules/_edit-guests.scss | 25 +++++++++++++++--------- 3 files changed, 37 insertions(+), 28 deletions(-) -- 1.9.3

2 2

[WOK][PATCH] Added method to validate ASCII value
by pkulkark＠linux.vnet.ibm.com 13 Apr '16

13 Apr '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> Added a method to utils to check if a given field value is ASCII Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index e5701e6..d7dd8a3 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -193,3 +193,7 @@ wok.urlSafeB64Decode = function(str) { wok.urlSafeB64Encode = function(str) { return $.base64.btoa(str, true).replace(/\+/g, '-').replace(/\//g, '_'); } + +wok.isASCII = function(field) { + return /^[\x00-\x7F]*$/.test(field); +} -- 2.1.0

2 1

[PATCH] [Wok 0/2] SCSS and CSS updates
by sguimaraes943＠gmail.com 13 Apr '16

13 Apr '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patchset includes two commits that are required for existing and new features. -First patch adds compact() function to our mixins since it was removed from python-libsass. This was generating wrong CSS outputs from different distros and rendering wrong styles (specially box-shadow effects). -Second patch adds support for .wok-mask class with a relative position inside a panel-group, allowing us to display a "loading" text with spinning icon inside collapsible panels seen in Ginger and Gingerbase. Both patches are required for "OVS Bridges front-end" support in Ginger and "Delete multiple Debug Reports at once" in Gingerbase. Samuel Guimarães (2): Added compact Sass function that was removed from libsass Fixed .wok-mask class and loaders inside collapsable panels ui/css/src/modules/_compact.scss | 46 ++++++++++++++++++++++++++++++++++++++++ ui/css/src/modules/_loaders.scss | 4 ++++ ui/css/src/wok.scss | 6 ++++++ ui/css/wok.css | 8 +++++++ 4 files changed, 64 insertions(+) create mode 100644 ui/css/src/modules/_compact.scss -- 1.9.3

2 3

[PATCH] [Kimchi] Issue #919: Deactivate a storagepool makes the list of templates blank
by Jose Ricardo Ziviani 13 Apr '16

13 Apr '16

- This commit fixes cases when a storage pools is deativated or removed. Instead of let a blank interface it displays all templates filling the javascript field 'invalid' with the name of the invalid storage. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 1 - model/templates.py | 29 ++++++++++++++++++++--------- vmtemplate.py | 9 ++++++--- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/i18n.py b/i18n.py index 6214687..1061aeb 100644 --- a/i18n.py +++ b/i18n.py @@ -157,7 +157,6 @@ messages = { "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"), "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"), - "KCHTMPL0005E": _("Storage pool %(pool)s specified for template %(template)s is not active"), "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."), "KCHTMPL0007E": _("Network %(network)s specified for template %(template)s is not active"), "KCHTMPL0008E": _("Template name must be a string"), diff --git a/model/templates.py b/model/templates.py index 92705b6..9294be2 100644 --- a/model/templates.py +++ b/model/templates.py @@ -271,19 +271,16 @@ class LibvirtVMTemplate(VMTemplate): # validate CPU info values - will raise appropriate exceptions cpu_model.check_cpu_info(self.info['cpu_info']) - def _storage_validate(self, pool_uri): + def _get_storage_pool(self, pool_uri): pool_name = pool_name_from_uri(pool_uri) try: conn = self.conn.get() pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) + except libvirt.libvirtError: raise InvalidParameter("KCHTMPL0004E", {'pool': pool_uri, 'template': self.name}) - if not pool.isActive(): - raise InvalidParameter("KCHTMPL0005E", {'pool': pool_name, - 'template': self.name}) - return pool def _get_all_networks_name(self): @@ -295,6 +292,11 @@ class LibvirtVMTemplate(VMTemplate): names = conn.listStoragePools() + conn.listDefinedStoragePools() return sorted(map(lambda x: x.decode('utf-8'), names)) + def _get_active_storagepools_name(self): + conn = self.conn.get() + names = conn.listStoragePools() + return sorted(map(lambda x: x.decode('utf-8'), names)) + def _network_validate(self): names = self.info['networks'] for name in names: @@ -310,17 +312,26 @@ class LibvirtVMTemplate(VMTemplate): 'template': self.name}) def _get_storage_path(self, pool_uri=None): - pool = self._storage_validate(pool_uri) + try: + pool = self._get_storage_pool(pool_uri) + + except: + return '' + xml = pool.XMLDesc(0) return xpath_get_text(xml, "/pool/target/path")[0] def _get_storage_type(self, pool_uri=None): - pool = self._storage_validate(pool_uri) + try: + pool = self._get_storage_pool(pool_uri) + + except: + return '' xml = pool.XMLDesc(0) return xpath_get_text(xml, "/pool/@type")[0] def _get_volume_path(self, pool, vol): - pool = self._storage_validate(pool) + pool = self._get_storage_pool(pool) try: return pool.storageVolLookupByName(vol).path() except: @@ -332,7 +343,7 @@ class LibvirtVMTemplate(VMTemplate): vol_list = self.to_volume_list(vm_uuid) try: for v in vol_list: - pool = self._storage_validate(v['pool']) + pool = self._get_storage_pool(v['pool']) # outgoing text to libvirt, encode('utf-8') pool.createXML(v['xml'].encode('utf-8'), 0) except libvirt.libvirtError as e: diff --git a/vmtemplate.py b/vmtemplate.py index b71cf23..4470be4 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -441,7 +441,7 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): pool_uri = disk.get('pool', {}).get('name') - self._storage_validate(pool_uri) + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -456,7 +456,7 @@ class VMTemplate(object): def _network_validate(self): pass - def _storage_validate(self): + def _get_storage_pool(self): pass def fork_vm_storage(self, vm_uuid): @@ -477,6 +477,9 @@ class VMTemplate(object): def _get_all_storagepools_name(self): return [] + def _get_active_storagepools_name(self): + return [] + def validate_integrity(self): invalid = {} # validate networks integrity @@ -489,7 +492,7 @@ class VMTemplate(object): 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_all_storagepools_name(): + if pool_name not in self._get_active_storagepools_name(): invalid['storagepools'] = [pool_name] # validate iso integrity -- 1.9.1

3 2

[PATCH] [Kimchi] Issue #924: Before deleting a storagepool, kimchi should check if any template is using that
by Jose Ricardo Ziviani 13 Apr '16

13 Apr '16

--- model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/storagepools.py b/model/storagepools.py index cf3ed21..4a0d34c 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,6 +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 ISO_POOL_NAME = u'kimchi_isos' @@ -437,7 +438,7 @@ class StoragePoolModel(object): t_info = session.get('template', tmpl) for disk in t_info['disks']: t_pool = disk['pool']['name'] - if t_pool == pool_name: + if pool_name_from_uri(t_pool) == pool_name: return True return False -- 1.9.1

4 6

[PATCH] [Kimchi] Adjust UI to create Template according to the lastest API changes
by Aline Manera 12 Apr '16

12 Apr '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 3146f49..fa5c847 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -313,7 +313,7 @@ kimchi.template_add_main = function() { return; } var data = { - "cdrom": isoFile + "source_media": isoFile }; addTemplate(data); }); @@ -531,9 +531,7 @@ kimchi.template_add_main = function() { $('#vm-image-local-box-button').text(i18n['KCHAPI6008M']); $('#vm-image-local-box-button').prop('disabled', true); addTemplate({ - disks: [{ - base: $('input', '#vm-image-local-box').val() - }] + source_media: $('input', '#vm-image-local-box').val() }, function() { $('input', '#vm-image-local-box').prop('disabled', false); $('#vm-image-local-box-button').text(i18n['KCHAPI6005M']); @@ -548,7 +546,7 @@ kimchi.template_add_main = function() { return; } var data = { - "cdrom": isoUrl + "source_media": isoUrl }; addTemplate(data); }); @@ -579,7 +577,7 @@ kimchi.template_add_main = function() { var data = { "os_distro": isoInfo.os_distro, "os_version": isoInfo.os_version, - "cdrom": isoInfo.path + "source_media": isoInfo.path }; kimchi.createTemplate(data, function() { successNum++; -- 2.5.5

3 3

[PATCH][Kimchi] Change "Memory Available" by "Memory Utilization"
by Rodrigo Trujillo 12 Apr '16

12 Apr '16

Guests gallery and list view were display different labels. Just fix it. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index c8f32a9..c89e450 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -92,7 +92,7 @@ <div class="progress-bar light-grey memory"></div> <div class="progress-bar memory-progress-bar"></div> </div><span class="item-hidden">$_("Memory Available")</span> + --><span class="item-hidden">$_("Memory Utilization")</span> </span><span class='column-storage'> <div class='measure-label storage-percentage'></div> -- 2.1.0

3 2

[PATCH] [Kimchi] Replace backing image by clone when using template based on existing img
by Jose Ricardo Ziviani 12 Apr '16

12 Apr '16

- This commit replaces the current backing image to a complete clone when using a template based on an existing template. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/templates.py | 17 ++++++++++++++++- vmtemplate.py | 8 -------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/model/templates.py b/model/templates.py index 1e6ad30..87173d1 100644 --- a/model/templates.py +++ b/model/templates.py @@ -361,7 +361,22 @@ class LibvirtVMTemplate(VMTemplate): 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 'base' in v and 'path' in v['base']: + conn = self.conn.get() + try: + volume_base = conn.storageVolLookupByPath( + v['base']['path']) + + except libvirt.libvirtError as e: + pool.createXML(v['xml'].encode('utf-8'), 0) + continue + + pool.createXMLFrom(v['xml'].encode('utf-8'), + volume_base, + 0) + else: + pool.createXML(v['xml'].encode('utf-8'), 0) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return vol_list diff --git a/vmtemplate.py b/vmtemplate.py index a223beb..4ce5d19 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -264,14 +264,6 @@ class VMTemplate(object): v_tree.append(E.capacity(str(info['capacity']), unit='G')) target_fmt = info['format'] - if 'base' in d: - # target must be qcow2 in order to use a backing file - target_fmt = 'qcow2' - - v_tree.append(E.backingStore( - E.path(info['base']['path']), - E.format(type=info['base']['format']))) - target = E.target( E.format(type=target_fmt), E.path(info['path'])) v_tree.append(target) -- 1.9.1

3 3

[PATCH] [Kimchi 0/2] Fix issues 920 and 923
by Jose Ricardo Ziviani 12 Apr '16

12 Apr '16

This patchset fixes the issues 920 and 923. Depends on patches: Issue #919: Deactivate a storagepool makes the list of templates blank [Wok] Implement update methods for object store Jose Ricardo Ziviani (2): Issue #920: Template is removed if an ISO doesn't exist Issue #923: Template always shows VNC, even if I save Spice in my template i18n.py | 2 ++ model/templates.py | 42 +++++++++++++++++++++++----------- ui/js/src/kimchi.template_edit_main.js | 12 ++++++++-- 3 files changed, 41 insertions(+), 15 deletions(-) -- 1.9.1

3 6

[PATCH] [Wok 0/3] Implement Asynchronous Notifications frontend
by Lucio Correia 12 Apr '16

12 Apr '16

This patchset depends on Asynchronous Notification backend. Lucio Correia (3): Implement notifications JS API Implement wok.notification widget Implement notifications loop ui/js/src/wok.api.js | 18 ++++++++++++++++++ ui/js/src/wok.main.js | 5 +++++ ui/js/src/wok.notification.js | 36 ++++++++++++++++++++++++++++++++++++ ui/js/src/wok.utils.js | 19 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 ui/js/src/wok.notification.js -- 1.9.1

3 9

[PATCH] [Wok] wok.conf - comment update
by sureshab＠linux.vnet.ibm.com 12 Apr '16

12 Apr '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> updated wok.conf with more detailed comment for SSL certificate Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- src/wok.conf.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wok.conf.in b/src/wok.conf.in index 77a79b6..b55cd0b 100644 --- a/src/wok.conf.in +++ b/src/wok.conf.in @@ -22,8 +22,11 @@ # Port for websocket proxy to listen on #websockets_port = 64667 -# The full path to an SSL Certificate in PEM format. If left unspecified, -# Wok will generate a self-signed certificate automatically. +# The full path to an SSL Certificate, or chain of certificates in +# PEM format. When a chain is used, the server's certificate must be +# the first certificate in the file, with the chain concatenated onto +# the end of that certificate. If left unspecified, Wok will generate +# a self-signed certificate automatically. #ssl_cert = # The corresponding private key in PEM format for the SSL Certificate supplied -- 2.1.0

2 1

[PATCH V2] [Wok 0/3] Implement Asynchronous Notifications frontend
by Lucio Correia 12 Apr '16

12 Apr '16

Changes in V2: - replaced wok.notification by wok.message.notify Lucio Correia (3): Implement notifications JS API Implement wok.message.notify Implement notifications loop ui/js/src/wok.api.js | 18 ++++++++++++++++++ ui/js/src/wok.main.js | 5 +++++ ui/js/src/wok.message.js | 8 ++++++-- ui/js/src/wok.utils.js | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) -- 1.9.1

2 4

[PATCH v7][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 12 Apr '16

12 Apr '16

Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message v4: Remove cdrom verification on model Use disk info from osinfo when adding disk based template v6: Add all logic to model Create tests to verify source_media functionally Add source_media as required Update tests v7: Update tests Stop using osinfo on model/templates Change when template name duplication is verified Ramon Medeiros (4): Create a single field to pass the installation media Identify installation media while creating template Update tests Add new tests to verify source_media feature API.json | 16 ++++------ i18n.py | 2 +- model/templates.py | 72 +++++++++++++++++++++++++++++++-------------- tests/test_authorization.py | 4 +-- tests/test_livemigration.py | 7 +++-- tests/test_mockmodel.py | 13 ++++---- tests/test_model.py | 71 ++++++++++++++++++++++---------------------- tests/test_rest.py | 36 +++++++++++------------ tests/test_template.py | 39 ++++++++++++------------ tests/test_vmtemplate.py | 3 +- 10 files changed, 144 insertions(+), 119 deletions(-) -- 2.5.5

2 8

[PATCH] [Kimchi 0/3] Fixes on template issues
by Jose Ricardo Ziviani 08 Apr '16

08 Apr '16

This patchset fixes a problem to create a template from existing image plus more 2 issues: 919/920. Jose Ricardo Ziviani (3): Fix template creation from image file Issue #919: Deactivate a storagepool makes the list of templates blank Issue #920: Template is removed if an ISO doesn't exist anymore model/templates.py | 28 +++++++++++++++++++++++----- vmtemplate.py | 6 +++++- 2 files changed, 28 insertions(+), 6 deletions(-) -- 1.9.1

3 8

[PATCH v2] [Kimchi] Fix template creation from image file
by Jose Ricardo Ziviani 08 Apr '16

08 Apr '16

- When using an existing image as base for creating templates we cannot rely on its pool because it's undefined. This commit sets the default pool for this case. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- vmtemplate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 653ad02..3270749 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -96,7 +96,9 @@ class VMTemplate(object): for index, disk in enumerate(disks): disk_info = dict(default_disk) - pool_type = self._get_storage_type(disk['pool']['name']) + 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} -- 1.9.1

3 2

[PATCH v6][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 08 Apr '16

08 Apr '16

Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message v4: Remove cdrom verification on model Use disk info from osinfo when adding disk based template v6: Add all logic to model Create tests to verify source_media functionally Add source_media as required Update tests Ramon Medeiros (4): Create a single field to pass the installation media Identify installation media while creating template Update tests Add new tests to verify source_media feature API.json | 16 +++------- i18n.py | 2 +- model/templates.py | 75 ++++++++++++++++++++++++++++++++------------- tests/test_authorization.py | 4 +-- tests/test_livemigration.py | 7 +++-- tests/test_mockmodel.py | 13 ++++---- tests/test_model.py | 71 +++++++++++++++++++----------------------- tests/test_rest.py | 35 ++++++++++----------- tests/test_template.py | 41 ++++++++++++------------- tests/test_vmtemplate.py | 3 +- 10 files changed, 142 insertions(+), 125 deletions(-) -- 2.5.5

2 11

[PATCH][Kimchi] Test if CPU value is higher than Max CPU before request
by Rodrigo Trujillo 08 Apr '16

08 Apr '16

This patch does two modifications in Kimchi UI behavior: - Change "CPUs" by "Current CPUs" in Guest edit window in order to make it similar to other windows and widgets, like Template edit; - Add a CPU checking in the UI before send server request to update the guest. We know that CPU cannot be higher than Max CPU and backend is going to raise an error, so, to avoid waste of resources, warn the user when he/she clicks on Save button and do not perform the request. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 7 +++++++ ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 7a9c754..ef6d650 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -752,6 +752,13 @@ kimchi.guest_edit_main = function() { return; } + // Test CPU values before submit. Avoid requests we know are going to fail + if ($('#guest-edit-cores-textbox').val() > $('#guest-edit-max-processor-textbox').val()) { + wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + if (data['vcpus'] !== undefined) { var cpu = Number(data['vcpus']); var maxCpu = Number(data['max-processor']); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 05d0b14..5b7155a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -45,7 +45,7 @@ <input id="guest-edit-id-textbox" class="form-control" name="name" type="text" /> </div> <div class="form-group"> - <label for="guest-edit-cores-textbox">$_("CPUs")</label> + <label for="guest-edit-cores-textbox">$_("Current CPUs")</label> <div id="guest-processor"> <input id="guest-edit-cores-textbox" class="form-control" name="vcpus" type="number" min="1" /> <button id="guest-show-max-processor" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="cputext">$_("More")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 153d7c2..24abeb6 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -67,6 +67,7 @@ "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher then Max Memory value")", + "KCHVM0003E": "$_("Current CPUs value cannot be higher then Max CPU value")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6003M": "$_("Attaching...")", -- 2.1.0

3 2