Update the model and the mock model to generate proper JSON. Update the automated tests to validate against the new data format. Signed-off-by: Adam King <rak@linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 11 +++++++---- src/kimchi/model/vms.py | 2 +- tests/test_mockmodel.py | 2 +- tests/test_model.py | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index ba9859b..6a44bf7 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -921,11 +921,14 @@ class MockVM(object): ifaces = [MockVMIface(net) for net in self.networks] self.storagedevices = {} self.ifaces = dict([(iface.info['mac'], iface) for iface in ifaces]) + + stats = {'cpu_utilization': 20, + 'net_throughput': 35, + 'net_throughput_peak': 100, + 'io_throughput': 45, + 'io_throughput_peak': 100} self.info = {'state': 'shutoff', - 'stats': "{'cpu_utilization': 20, 'net_throughput' : 35, \ - 'net_throughput_peak': 100, \ - 'io_throughput': 45, \ - 'io_throughput_peak': 100}", + 'stats': stats, 'uuid': self.uuid, 'memory': template_info['memory'], 'cpus': template_info['cpus'], diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index b482e80..9da6688 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -306,7 +306,7 @@ class VMModel(object): res['io_throughput_peak'] = vm_stats.get('max_disk_io', 100) return {'state': state, - 'stats': str(res), + 'stats': res, 'uuid': dom.UUIDString(), 'memory': info[2] >> 10, 'cpus': info[3], diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 4ac08dd..ab5eb59 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -149,7 +149,7 @@ class MockModelTests(unittest.TestCase): self.assertEquals(1024, info['memory']) self.assertEquals(1, info['cpus']) self.assertEquals('images/icon-vm.png', info['icon']) - self.assertEquals(stats_keys, set(eval(info['stats']).keys())) + self.assertEquals(stats_keys, set(info['stats'].keys())) self.assertEquals('vnc', info['graphics']['type']) self.assertEquals('0.0.0.0', info['graphics']['listen']) diff --git a/tests/test_model.py b/tests/test_model.py index 298a39e..d3315a0 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -67,7 +67,7 @@ class ModelTests(unittest.TestCase): self.assertEquals(2048, info['memory']) self.assertEquals(2, info['cpus']) self.assertEquals(None, info['icon']) - self.assertEquals(stats_keys, set(eval(info['stats']).keys())) + self.assertEquals(stats_keys, set(info['stats'].keys())) self.assertRaises(NotFoundError, inst.vm_lookup, 'nosuchvm') @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') -- 1.8.1.4

Create a reusable jQuery circleGauge widget to replace the circle previously used in the guests tab. Signed-off-by: Adam King <rak@linux.vnet.ibm.com> --- ui/css/theme-default/circle.css | 26 --------- ui/css/theme-default/circleGauge.css | 26 +++++++++ ui/js/src/kimchi.circle.js | 88 ----------------------------- ui/js/widgets/circleGauge.js | 104 +++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 114 deletions(-) delete mode 100644 ui/css/theme-default/circle.css create mode 100644 ui/css/theme-default/circleGauge.css delete mode 100644 ui/js/src/kimchi.circle.js create mode 100644 ui/js/widgets/circleGauge.js diff --git a/ui/css/theme-default/circle.css b/ui/css/theme-default/circle.css deleted file mode 100644 index 8008219..0000000 --- a/ui/css/theme-default/circle.css +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Project Kimchi - * - * Copyright IBM, Corp. 2013 - * - * Authors: - * Lise Noble <lwnoble@us.ibm.com> - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -.circle { - position: relative; - margin: 30px 10px 10px 10px; - width: 70px; - height: 70px; -} diff --git a/ui/css/theme-default/circleGauge.css b/ui/css/theme-default/circleGauge.css new file mode 100644 index 0000000..cf9970e --- /dev/null +++ b/ui/css/theme-default/circleGauge.css @@ -0,0 +1,26 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Lise Noble <lwnoble@us.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.circleGauge { + position: relative; + margin: 30px 10px 10px 10px; + width: 70px; + height: 70px; +} diff --git a/ui/js/src/kimchi.circle.js b/ui/js/src/kimchi.circle.js deleted file mode 100644 index 7b9ccc7..0000000 --- a/ui/js/src/kimchi.circle.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Project Kimchi - * - * Copyright IBM, Corp. 2013 - * - * Authors: - * Hongliang Wang <hlwanghl@cn.ibm.com> - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -(function($) { - $.fn.circle = function(options) { - var settings = $.extend({ - color : '#87C004', - fillColor : '#87C004', - fontFamily : 'Geneva, sans-serif', - fontSize : 13, - radius : 35, - lineWidth : 20 - }, options); - - $(this).each(function() { - var that = $(this); - var json = eval("(" + that.data('value') + ")"); - var parentNode = that.parent() - var type = ''; - var display = 0; - var circle = 0; - - if (parentNode.hasClass('guest-cpu')) { - display = parseInt(json['cpu_utilization']); - circle = display; - type = '%'; - } else if (parentNode.hasClass('guest-network')) { - display = parseInt(json['net_throughput']); - circle = (display * 100) / parseInt(json['net_throughput_peak']); - } else if (parentNode.hasClass('guest-storage')) { - display = parseInt(json['io_throughput']); - circle = (display * 100) / parseInt(json['io_throughput_peak']); - } - - that.empty(); - var canvas = document.createElement('canvas'); - that.append($(canvas)); - var ctx = canvas.getContext('2d'); - var lineWidth = settings['lineWidth']; - var radius = settings['radius']; - var fontSize = settings['fontSize']; - var shadowSize = 2; - var width = height = radius * 2; - $(canvas).attr('height', height); - $(canvas).attr('width', width); - $(canvas).css({ - 'boxShadow' : shadowSize + 'px ' + shadowSize + 'px ' + shadowSize + 'px #fff, -' + shadowSize + 'px -' + shadowSize + 'px ' + shadowSize + 'px #eaeaea', - borderRadius : radius + 'px' - }); - ctx.clearRect(0, 0, width, height); - - ctx.fillStyle = settings['fillColor']; - ctx.font = 'bold ' + fontSize + 'px ' + settings['fontFamily']; - ctx.textAlign = 'center'; - var originPos = radius; - ctx.textBaseline = 'middle'; - ctx.fillText(display + type, originPos, originPos); - ctx.strokeStyle = settings['color']; - ctx.lineWidth = lineWidth; - ctx.beginPath(); - ctx.arc(originPos, originPos, radius, -.5 * Math.PI, (circle / 50 - .5) * Math.PI); - ctx.stroke(); - }); - - return this; - }; -}(jQuery)); - -kimchi.circle = function(selector) { - $(selector).circle(); -}; diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js new file mode 100644 index 0000000..d0887fd --- /dev/null +++ b/ui/js/widgets/circleGauge.js @@ -0,0 +1,104 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Hongliang Wang <hlwanghl@cn.ibm.com> + * Adam King <rak@linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + (function($) { + $.widget('kimchi.circleGauge', { + + options : { + color : '#87C004', + fillColor : '#87C004', + lineWidth : 20, + shadowSize : '2px', + font : 'bold 13px Geneva, sans-serif', + textAlign : 'center', + radius : 35, + peakRate : 100, + display : 0, + circle : 0, + label : '' + }, + + _create : function() { + //valuesAttr="{" + this.element.data('value')+ "}"; + //console.info(valuesAttr); + //values=eval("(" + valuesAttr + ")"); + //$.extend(this.options, values); + this.options.display=this.element.data('display'); + this.options.percentage=this.element.data('percentage'); + this._fixupPeakRate(); + this._draw(); + }, + + setValues : function(values) { + $.extend(this.options, values); + this._fixupPeakRate(); + this._draw(); + }, + + _fixupPeakRate : function() { + if (this.options.circle>this.options.peakRate) { + this.options.peakRate=this.options.circle; + } + }, + + _draw : function() { + this.element.empty(); + var canvas = document.createElement('canvas'); + //this.element.append($(canvas)); //I don't quite understand this line so trying the one below... + this.element.append(canvas); + + var ctx = canvas.getContext('2d'); + var radius = this.options.radius; + + var shadowSize = 2; + var width = height = radius * 2; + $(canvas).attr('height', height); + $(canvas).attr('width', width); + + $(canvas).css({ + 'boxShadow' : shadowSize + 'px ' + shadowSize + 'px ' + shadowSize + 'px #fff, -' + shadowSize + 'px -' + shadowSize + 'px ' + shadowSize + 'px #eaeaea', + borderRadius : radius + 'px' + }); + + ctx.clearRect(0, 0, width, height); + ctx.fillStyle = this.options.fillColor; + ctx.font = this.options.font; + ctx.textAlign = 'center'; + var originPos = radius; + ctx.textBaseline = 'middle'; + ctx.fillText(this.options.display, originPos, originPos); + ctx.strokeStyle = this.options.color; + ctx.lineWidth = this.options.lineWidth; + ctx.beginPath(); + ctx.arc(originPos, originPos, radius, -.5 * Math.PI, (this.options.percentage / 50 - .5) * Math.PI); + ctx.stroke(); + }, + + destroy : function() { + this.element.empty(); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); + +kimchi.circleGauge = function(selector) { + $(selector).circleGauge(); +}; -- 1.8.1.4

Just a minor comment below On 02/21/2014 06:06 AM, Adam King wrote:

Update mockmodel.py to be pep8 compliant, and update makekefile whitelist

Signed-off-by: Adam King <rak@linux.vnet.ibm.com> --- Makefile.am | 1 + src/kimchi/mockmodel.py | 69 ++++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/Makefile.am b/Makefile.am index 378036e..47ba154 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ PEP8_WHITELIST = \ src/kimchi/featuretests.py \ src/kimchi/iscsi.py \ src/kimchi/isoinfo.py \ + src/kimchi/mockmodel.py \ src/kimchi/model/*.py \ src/kimchi/repositories.py \ src/kimchi/rollbackcontext.py \ diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 8ef4431..ba9859b 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -17,8 +17,10 @@ # 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 +# License along with this library; if not, write to the +# Free Software Foundation, Inc. +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA

import cherrypy import copy @@ -41,7 +43,6 @@ except ImportError: import ImageDraw

- from kimchi import config from kimchi.asynctask import AsyncTask from kimchi.config import config as kconfig @@ -53,7 +54,8 @@ from kimchi.model.utils import get_vm_name from kimchi.model.vms import VM_STATIC_UPDATE_PARAMS from kimchi.objectstore import ObjectStore from kimchi.screenshot import VMScreenshot -from kimchi.utils import pool_name_from_uri, run_command, template_name_from_uri +from kimchi.utils import pool_name_from_uri, run_command +from kimchi.utils import template_name_from_uri from kimchi.vmtemplate import VMTemplate

@@ -64,7 +66,8 @@ class MockModel(object): self.distros = self._get_distros()

def capabilities_lookup(self, *ident): - return {'libvirt_stream_protocols': ['http', 'https', 'ftp', 'ftps', 'tftp'], + return {'libvirt_stream_protocols': + ['http', 'https', 'ftp', 'ftps', 'tftp'], 'qemu_stream': True, 'screenshot': True, 'system_report_tool': True} @@ -135,8 +138,7 @@ class MockModel(object):

def vms_create(self, params): t_name = template_name_from_uri(params['template']) - name = get_vm_name(params.get('name'), t_name, - self._mock_vms.keys()) + name = get_vm_name(params.get('name'), t_name, self._mock_vms.keys()) if name in self._mock_vms: raise InvalidOperation("KCHVM0001E", {'name': name})

@@ -350,15 +352,16 @@ class MockModel(object): pool.info['source'] = params['source'] if not pool.info['source'].get('adapter_name'): raise MissingParameter('KCHPOOL0004E', - {'item': 'adapter_name', 'name': name}) - for vol in ['unit:0:0:1','unit:0:0:2', - 'unit:0:0:3','unit:0:0:4']: + {'item': 'adapter_name', + 'name': name}) + for vol in ['unit:0:0:1', 'unit:0:0:2', + 'unit:0:0:3', 'unit:0:0:4']: mockvol = MockStorageVolume(name, vol, - dict([('type','lun')])) + dict([('type', 'lun')])) pool._volumes[vol] = mockvol else: pool.info['path'] = params['path'] - if params['type'] in ['dir','scsi']: + if params['type'] in ['dir', 'scsi']: pool.info['autostart'] = True else: pool.info['autostart'] = False @@ -436,7 +439,7 @@ class MockModel(object): def storagevolume_lookup(self, pool, name): if self._get_storagepool(pool).info['state'] != 'active': raise InvalidOperation("KCHVOL0005E", {'pool': pool, - 'volume': name}) + 'volume': name})

storagevolume = self._get_storagevolume(pool, name) return storagevolume.info @@ -461,7 +464,7 @@ class MockModel(object): return res._volumes.keys()

def devices_get_list(self, _cap=None): - return ['scsi_host3', 'scsi_host4','scsi_host5'] + return ['scsi_host3', 'scsi_host4', 'scsi_host5']

def device_lookup(self, nodedev_name): return { @@ -493,7 +496,7 @@ class MockModel(object): return iso_volumes

def storageservers_get_list(self, _target_type=None): - # FIXME: When added new storage server support, this needs to be updated + # FIXME: This needs to be updted when adding new storage server support target_type = STORAGE_SOURCES.keys() \ if not _target_type else [_target_type] pools = self.storagepools_get_list() @@ -514,10 +517,12 @@ class MockModel(object): for pool in pools: try: pool_info = self.storagepool_lookup(pool) - if pool_info['source'] and pool_info['source']['addr'] == server: + if pool_info['source'] and \ + pool_info['source']['addr'] == server: return dict(host=server) except NotFoundError: - # Avoid inconsistent pool result because of lease between list and lookup + # Avoid inconsistent pool result because + # of lease between list and lookup pass

raise NotFoundError("KCHSR0001E", {'server': server}) @@ -562,7 +567,7 @@ class MockModel(object): try: net = ipaddr.IPNetwork(subnet) except ValueError: - msg_args = {'subnet':subnet, 'network': name} + msg_args = {'subnet': subnet, 'network': name} raise InvalidParameter("KCHNET0003E", msg_args)

network.info['dhcp'] = { @@ -581,8 +586,8 @@ class MockModel(object): def _get_vms_attach_to_a_network(self, network): vms = [] for name, dom in self._mock_vms.iteritems(): - if network in dom.networks: - vms.append(name) + if network in dom.networks: + vms.append(name) return vms

def network_lookup(self, name): @@ -650,7 +655,7 @@ class MockModel(object):

def vmifaces_create(self, vm, params): if (params["type"] == "network" and - params["network"] not in self.networks_get_list()): + params["network"] not in self.networks_get_list()): msg_args = {'network': params["network"], 'name': vm} raise InvalidParameter("KCHVMIF0002E", msg_args)

@@ -679,7 +684,7 @@ class MockModel(object): def vmiface_delete(self, vm, mac): dom = self._get_vm(vm) try: - del dom.ifaces[mac] + del dom.ifaces[mac] except KeyError: raise NotFoundError("KCHVMIF0001E", {'iface': mac, 'name': vm})

@@ -835,7 +840,7 @@ class MockModel(object): raise OperationFailed("KCHREPOS0007E", {'repo_id': repo_id})

def repository_disable(self, repo_id): - if not self._mock_host_repositories.disableRepository(repo_id): + if not self._mock_host_repositories.disableRepository(repo_id): raise OperationFailed("KCHREPOS0008E", {'repo_id': repo_id})

def repository_update(self, repo_id, params): @@ -895,7 +900,8 @@ class MockVMIface(object): self.__class__.counter += 1 self.info = {'type': 'network', 'model': 'virtio', - 'network': network if network else "net-%s" % self.counter, + 'network': network if network + else "net-%s" % self.counter, 'mac': self.get_mac() }

@@ -917,13 +923,15 @@ class MockVM(object): self.ifaces = dict([(iface.info['mac'], iface) for iface in ifaces]) self.info = {'state': 'shutoff', 'stats': "{'cpu_utilization': 20, 'net_throughput' : 35, \ - 'net_throughput_peak': 100, 'io_throughput': 45, \ + 'net_throughput_peak': 100, \ + 'io_throughput': 45, \ "\" is OK here. but usually, for brackets, Parentheses and braces, we can remove "\".

'io_throughput_peak': 100}", 'uuid': self.uuid, 'memory': template_info['memory'], 'cpus': template_info['cpus'], 'icon': None, - 'graphics': {'type': 'vnc', 'listen': '0.0.0.0', 'port': None} + 'graphics': {'type': 'vnc', 'listen': '0.0.0.0', + 'port': None} } self.info['graphics'].update(template_info['graphics'])

@@ -974,6 +982,7 @@ class MockTask(object): def __init__(self, id): self.id = id

+ class MockStorageVolume(object): def __init__(self, pool, name, params={}): self.name = name @@ -983,9 +992,9 @@ class MockStorageVolume(object): params = self._def_lun(name) fmt = params.get('format', 'raw') capacity = params.get('capacity', 1024) - self.info = {'type': params.get('type','disk'), + self.info = {'type': params.get('type', 'disk'), 'capacity': capacity << 20, - 'allocation': params.get('allocation','512'), + 'allocation': params.get('allocation', '512'), 'path': params.get('path'), 'format': fmt} if fmt == 'iso': @@ -1000,10 +1009,10 @@ class MockStorageVolume(object): return { "capacity": capacity, "name": name, - "format": random.choice(['dos','unknown']), + "format": random.choice(['dos', 'unknown']), "allocation": capacity, "path": path + name[-1], - "type": "block" } + "type": "block"}

class MockVMScreenshot(VMScreenshot):

-- Thanks and best regards! Sheldon Feng(冯少合)<shaohef@linux.vnet.ibm.com> IBM Linux Technology Center

Update the edit VM form to use the new form extensions. Enable the cpu and memory fields to be edited. Signed-off-by: Adam King <rak@linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 10 ++-------- ui/pages/guest-edit.html.tmpl | 12 +++++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9375c51..4758dc0 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -80,9 +80,7 @@ kimchi.guest_edit_main = function() { var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; - for ( var prop in guest) { - $('input[name="' + prop + '"]', guestEditForm).val(guest[prop]); - } + $('#form-guest-edit-general').fillWithObject(guest); refreshCDROMs(); @@ -116,11 +114,7 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { $(saveButton).prop('disabled', true); - var editableFields = [ 'name' ]; - var data = {}; - $.each(editableFields, function(i, field) { - data[field] = $('#form-guest-edit [name="' + field + '"]').val(); - }); + var data=$('#form-guest-edit-general').serializeObject(); kimchi.updateVM(kimchi.selectedGuest, data, function() { kimchi.listVmsAuto(); kimchi.window.close(); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 804fc39..bf7ea56 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -59,8 +59,7 @@ <input id="guest-edit-cores-textbox" name="cpus" - type="text" - disabled="disabled" /> + type="text" /> </div> </div> <div> @@ -72,8 +71,7 @@ <div class="guest-edit-wrapper-controls"> <input id="guest-edit-memory-textbox" name="memory" - type="text" - disabled="disabled" /> + type="text" /> </div> </div> <div> @@ -98,7 +96,7 @@ <div> <button id="guest-edit-attach-cdrom-button" class="guest-edit-cdrom-button attach" - title="$_("Attach")"> + title='$_("Attach")'> </button> </div> </fieldset> @@ -124,11 +122,11 @@ value="{path}" readonly="readonly" /> <button class="guest-edit-cdrom-button replace" data-vm="{vm}" data-dev="{dev}" - title="$_("Replace")"> + title='$_("Replace")'> </button> <button class="guest-edit-cdrom-button detach" data-vm="{vm}" data-dev="{dev}" - title="$_("Detach")"> + title='$_("Detach")'> </button> </div> </div> -- 1.8.1.4