- Kimchi-devel - oVirt List Archives

[PATCH V3] UI: Adding widget of gauge
by Wen Wang 20 Jan '15

20 Jan '15

V2 -> V3: Adding Samples of gauge. V1 -> V2: Change the time of the copyright. New widget accept two options: "value" and "color". value varies from 0 to 100 and color contains "red", "blue", "yellow" and "purple". Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/gauge-flat.css | 45 +++++++++++++ ui/js/widgets/gauge-flat.js | 109 ++++++++++++++++++++++++++++++++ ui/js/widgets/samples/gauge-sample.html | 34 ++++++++++ 3 files changed, 188 insertions(+) create mode 100755 ui/css/theme-default/gauge-flat.css create mode 100755 ui/js/widgets/gauge-flat.js create mode 100644 ui/js/widgets/samples/gauge-sample.html diff --git a/ui/css/theme-default/gauge-flat.css b/ui/css/theme-default/gauge-flat.css new file mode 100755 index 0000000..535f0a8 --- /dev/null +++ b/ui/css/theme-default/gauge-flat.css @@ -0,0 +1,45 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * 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. + */ +.ui-gauge-flat { + height: 15px; + width: 100px; + text-align: left; + overflow: hidden; + background: #E6E7E8; +} + +.ui-gauge-flat .ui-gauge-flat-value { + margin: -1px; + height: 100%; +} + +.ui-gauge-flat .red { + background: #D9182D; +} + +.ui-gauge-flat .blue { + background: #008ABF; +} + +.ui-gauge-flat .yellow { + background: #FDB813; +} + +.ui-gauge-flat .purple { + background: #7F1C7D; +} \ No newline at end of file diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js new file mode 100755 index 0000000..a212223 --- /dev/null +++ b/ui/js/widgets/gauge-flat.js @@ -0,0 +1,109 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * 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( $ ) { + +return $.widget( "kimchi.gaugeFlat", { + version: "@VERSION", + options: { + max: 100, + value: 0, + color: "red" + }, + + min: 0, + + _create: function() { + this.oldValue = this.options.value = this._constrainedValue(); + + this.element + .addClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .attr({ + role: "gaugeflat", + "aria-valuemin": this.min + }); + + var color = this.options.color; + + this.valueDiv = $( "<div class='ui-gauge-flat-value " + color + " ui-widget-header ui-corner-left'></div>" ) + .appendTo( this.element ); + + this._refreshValue(); + }, + + _destroy: function() { + this.element + .removeClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) + .removeAttr( "role" ) + .removeAttr( "aria-valuemin" ) + .removeAttr( "aria-valuemax" ) + .removeAttr( "aria-valuenow" ); + + this.valueDiv.remove(); + }, + + value: function( newValue ) { + if ( newValue === undefined ) { + return this.options.value; + } + + this.options.value = this._constrainedValue( newValue ); + this._refreshValue(); + }, + + _constrainedValue: function( newValue ) { + if ( newValue === undefined ) { + newValue = this.options.value; + } + + this.indeterminate = newValue === false; + + if ( typeof newValue !== "number" ) { + newValue = 0; + } + + return this.indeterminate ? false : + Math.min( this.options.max, Math.max( this.min, newValue ) ); + }, + + _setOptions: function( options ) { + var value = options.value; + delete options.value; + + this._super( options ); + + this.options.value = this._constrainedValue( value ); + this._refreshValue(); + }, + + _percentage: function() { + return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min ); + }, + + _refreshValue: function() { + var value = this.options.value, + percentage = this._percentage(); + + this.valueDiv + .toggle( this.indeterminate || value > this.min ) + .toggleClass( "ui-corner-right", value === this.options.max ) + .width( percentage.toFixed(0) + "%" ); + } +}); + +})(jQuery); diff --git a/ui/js/widgets/samples/gauge-sample.html b/ui/js/widgets/samples/gauge-sample.html new file mode 100644 index 0000000..bc1dca6 --- /dev/null +++ b/ui/js/widgets/samples/gauge-sample.html @@ -0,0 +1,34 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Gauge Demo</title> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../gauge-flat.js"></script> + <link rel="stylesheet" href="../../../css/theme-default/gauge-flat.css"> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + </head> + <body> + <div class="gauge-demo"></div> + <script> + $(document).ready(function() { + console.log("test started1"); + var gauged = $(".gauge-demo"); + gauged.gaugeFlat({ + value: 25, + color: "red" + }); + var gaugeAdd = function() { + var gaugeValue = gauged.gaugeFlat("value"); + gauged.gaugeFlat("value", gaugeValue + 1); + if (gaugeValue < 99) { + setTimeout(gaugeAdd, 300); + } + } + gaugeAdd(); + }); + </script> + </body> +</html> \ No newline at end of file -- 2.1.0

2 2

[PATCH] Solve the snapshot revert problem, relate to issue #526
by gouzongmei＠ourfuture.cn 19 Jan '15

19 Jan '15

From: Zongmei Gou <gouzongmei(a)ourfuture.cn> This patch is partial for issue #526, in fact for another problem as Cristian mentioned: > There's still a known bug which happens when the user reverts a VM to a snapshot > when the VM's name has been changed since the snapshot was taken.In other words, > the following behavior will still cause a bug: > > - Create a VM named "foo". > - Create a snapshot of VM "foo" named "snap1". > - Rename VM "foo" to "bar". > - Revert VM "bar" to snapshot "snap1". > > The last step works correctly under the hood (i.e. the VM is reverted to that > snapshot) but Kimchi cannot return from its REST request because the VM > changed its name during the revert action. The added test case(test_vm_snapshots) will get passed once Cristian's patch for issue #526 is applied. Please ignore the patch sent by me last time, which contains Cristian's content. --- src/kimchi/control/base.py | 14 +++++++++++--- src/kimchi/model/vmsnapshots.py | 7 ++++++- tests/test_model.py | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 97e789f..484e9b9 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -57,10 +57,18 @@ class Resource(object): self.role_key = None self.admin_methods = [] - def _redirect(self, ident, code=303): - if ident is not None and ident != self.ident: + def _redirect(self, action_result, code=303): + if isinstance(action_result, list): + uri_params = [] + for arg in action_result: + if arg is None: + arg = '' + uri_params.append(urllib2.quote(arg.encode('utf-8'), safe="")) + raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) + elif action_result is not None and action_result != self.ident: uri_params = list(self.model_args[:-1]) - uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] + uri_params += [urllib2.quote(action_result.encode('utf-8'), + safe="")] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) def generate_action_handler(self, action_name, action_args=None): diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index 725770d..2c9345f 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -29,6 +29,7 @@ from kimchi.model.tasks import TaskModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel from kimchi.utils import add_task +from kimchi.xmlutils.utils import xpath_get_text class VMSnapshotsModel(object): @@ -155,7 +156,11 @@ class VMSnapshotModel(object): try: vir_dom = VMModel.get_vm(vm_name, self.conn) vir_snap = self.get_vmsnapshot(vm_name, name) - vir_dom.revertToSnapshot(vir_snap, 0) + result = vir_dom.revertToSnapshot(vir_snap, 0) + if result == 0: + xmlObj = vir_snap.getXMLDesc(0) + vm_new_name = xpath_get_text(xmlObj, 'domain/name')[0] + return [vm_new_name, name] except libvirt.libvirtError, e: raise OperationFailed('KCHSNAP0009E', {'name': name, 'vm': vm_name, diff --git a/tests/test_model.py b/tests/test_model.py index c956007..d528b45 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1074,6 +1074,44 @@ class ModelTests(unittest.TestCase): self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['users']) self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + def test_vm_snapshots(self): + config.set("authentication", "method", "pam") + inst = model.Model(None, + objstore_loc=self.tmp_store) + + orig_params = {'name': 'test', 'memory': '1024', 'cpus': '1', + 'cdrom': self.kimchi_iso} + inst.templates_create(orig_params) + + with RollbackContext() as rollback: + params = {'name': 'kimchi-vm', 'template': '/templates/test'} + inst.vms_create(params) + rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, + 'kimchi-vm') + + # create vm snapshot + params_snap = {'name': u'mysnap'} + task = inst.vmsnapshots_create(u'kimchi-vm', params_snap) + rollback.prependDefer(inst.vmsnapshot_delete, + u'kimchi-vm', params_snap['name']) + inst.task_wait(task['id']) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + + # update vm + params = {'name': u'kimchi-vm-new', 'cpus': 2, 'memory': 2048} + inst.vm_update('kimchi-vm', params) + + info = inst.vm_lookup('kimchi-vm-new') + self.assertEquals(2048, info['memory']) + self.assertEquals(2, info['cpus']) + + # snapshot revert + snap = inst.vmsnapshot_lookup(u'kimchi-vm-new', + params_snap['name']) + result = inst.vmsnapshot_revert(u'kimchi-vm-new', snap['name']) + self.assertEquals(result, [u'kimchi-vm', params_snap['name']]) + def test_multithreaded_connection(self): def worker(): for i in xrange(100): -- 1.8.3.1

2 1

[PATCH] Update Debian info on README.md based on previous changes.
by pvital＠gmail.com 19 Jan '15

19 Jan '15

From: Paulo Vital <pvital(a)gmail.com> Commit fcc38fd removed the support of create firewall rules, but firewalld is still listed as dependency package for Debian host machines. This patch removes firewalld package from apt-get command line for Debian on README file. Signed-off-by: Paulo Vital <pvital(a)gmail.com> --- docs/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 0d20b2b..0160ee5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -88,8 +88,7 @@ channel at RHN Classic or Red Hat Satellite. qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-ldap \ python-lxml nfs-common open-iscsi lvm2 xsltproc \ - python-parted nginx \ - firewalld python-guestfs libguestfs-tools \ + python-parted nginx python-guestfs libguestfs-tools \ websockify novnc spice-html5 Packages version requirement: -- 1.9.3 (Apple Git-50)

3 2

[PATCH] Handle transient VM requests differently
by Christy Perez 19 Jan '15

19 Jan '15

If a transient (or non-persistent) VM is created outside of Kimchi, it will (expectedly) be deleted when shutdown. However, Kimchi calls a GET after shutdown and other POST requests. When the GET fails because the VM has been deleted, a user will get an error. However, this is not an error condition. This patch checks to see if a VM is transient, and if so, does not call the subsequent GET on the VM. --- src/kimchi/control/base.py | 13 +++++++++---- src/kimchi/control/vms.py | 17 +++++++++++++---- src/kimchi/i18n.py | 1 + src/kimchi/model/vms.py | 9 ++++++++- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 97e789f..8048370 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -63,7 +63,8 @@ def _redirect(self, ident, code=303): uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) - def generate_action_handler(self, action_name, action_args=None): + def generate_action_handler(self, action_name, action_args=None, + ignore_not_found=False): def _render_element(self, ident): self._redirect(ident) uri_params = [] @@ -75,7 +76,7 @@ def _render_element(self, ident): raise internal_redirect(self.uri_fmt % tuple(uri_params)) return self._generate_action_handler_base(action_name, _render_element, - action_args) + ignore_not_found, action_args) def generate_action_handler_task(self, action_name, action_args=None): def _render_task(self, task): @@ -86,7 +87,7 @@ def _render_task(self, task): action_args) def _generate_action_handler_base(self, action_name, render_fn, - action_args=None): + ignore_not_found, action_args=None): def wrapper(*args, **kwargs): validate_method(('POST'), self.role_key, self.admin_methods) try: @@ -111,7 +112,11 @@ def wrapper(*args, **kwargs): except UnauthorizedError, e: raise cherrypy.HTTPError(403, e.message) except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) + if ignore_not_found is True: + # Should something be returned instead? + pass + else: + raise cherrypy.HTTPError(404, e.message) except OperationFailed, e: raise cherrypy.HTTPError(500, e.message) except KimchiException, e: diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 1a84b6c..82682af 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -21,7 +21,6 @@ from kimchi.control.utils import internal_redirect, UrlSubNode from kimchi.control.vm import sub_nodes - @UrlSubNode('vms', True) class VMs(Collection): def __init__(self, model): @@ -37,12 +36,22 @@ def __init__(self, model, ident): self.role_key = 'guests' self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' + _ignore_not_found = False + try: + # the test driver causes an exception in is_persistent() + _ignore_not_found = \ + not model.vm_is_persistent(self.ident.decode('utf-8')) + except: + pass for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') - self.poweroff = self.generate_action_handler('poweroff') - self.shutdown = self.generate_action_handler('shutdown') - self.reset = self.generate_action_handler('reset') + self.poweroff = self.generate_action_handler('poweroff', + ignore_not_found = _ignore_not_found) + self.shutdown = self.generate_action_handler('shutdown', + ignore_not_found = _ignore_not_found) + self.reset = self.generate_action_handler('reset', + ignore_not_found = _ignore_not_found) self.connect = self.generate_action_handler('connect') self.clone = self.generate_action_handler_task('clone') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 4eccc3e..4ab08d1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -106,6 +106,7 @@ "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Invalid operation for non-persistent virtual machine %(name)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index bae27c1..d3b4f1f 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -760,9 +760,13 @@ def lookup(self, name): 'users': users, 'groups': groups, 'access': 'full', - 'persistent': True if dom.isPersistent() else False + 'persistent': self.is_persistent(name) } + def is_persistent(self, name): + dom = self.get_vm(name, self.conn) + return True if dom.isPersistent() else False + def _vm_get_disk_paths(self, dom): xml = dom.XMLDesc(0) xpath = "/domain/devices/disk[@device='disk']/source/@file" @@ -784,6 +788,9 @@ def get_vm(name, conn): def delete(self, name): conn = self.conn.get() dom = self.get_vm(name, self.conn) + if not dom.isPersistent(): + raise InvalidOperation("KCHVM0036E", {'name': name}) + self._vmscreenshot_delete(dom.UUIDString()) paths = self._vm_get_disk_paths(dom) info = self.lookup(name) -- 1.9.3

2 6

[PATCH] UI: Customize jQuery UI Tabs Widget
by huoyuxin＠linux.vnet.ibm.com 19 Jan '15

19 Jan '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/tabs.css | 28 ++++++++++++++++++++++++++++ ui/css/theme-default/theme.css | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/tabs.css create mode 100644 ui/css/theme-default/theme.css diff --git a/ui/css/theme-default/tabs.css b/ui/css/theme-default/tabs.css new file mode 100644 index 0000000..7d7dd6c --- /dev/null +++ b/ui/css/theme-default/tabs.css @@ -0,0 +1,28 @@ +.ui-tabs { + border: 0 none !important; + padding: 0; + position: relative; +} + +.ui-tabs .ui-tabs-nav { + background: none; + border-color: #ededed; + border-width: 0 0 2px; +} + +.ui-tabs .ui-tabs-nav li { + background: none; + border-width: 0; + padding: 0 0px 1px; +} + +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + border-bottom: 2px solid #008abf; + margin-bottom: -2px; + font-weight: bold; +} + +.ui-tabs .ui-tabs-nav .ui-tabs-anchor { + line-height: 1; + padding: 10px 20px 5px; +} diff --git a/ui/css/theme-default/theme.css b/ui/css/theme-default/theme.css new file mode 100644 index 0000000..48df973 --- /dev/null +++ b/ui/css/theme-default/theme.css @@ -0,0 +1,32 @@ +/* + * Customize jQuery UI default theme + */ + +.ui-widget { + font-family: 'Helvetica Neue', Helvetica, Arial; +} + +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: 'Helvetica Neue', Helvetica, Arial; +} + +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #222222; +} + +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #222222; +} + +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + font-weight: normal; +} -- 1.7.1

2 1

[PATCH] UI: Add Kimchi message widget for new kimchi UI
by Wen Wang 19 Jan '15

19 Jan '15

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/message-flat.css | 87 +++++++++++++++++++++++++++++++ ui/js/widgets/message-flat.js | 97 +++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 ui/css/theme-default/message-flat.css create mode 100644 ui/js/widgets/message-flat.js diff --git a/ui/css/theme-default/message-flat.css b/ui/css/theme-default/message-flat.css new file mode 100644 index 0000000..8281bff --- /dev/null +++ b/ui/css/theme-default/message-flat.css @@ -0,0 +1,87 @@ +/* +* Project Kimchi +* +* Copyright IBM, Corp. 2015 +* +* 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. +*/ + +.border-grey { + background-clip: border-box; + border: 6px solid rgba(170,170,170,0.3); + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 502px; + height: 202px; + border-radius: 5px; +} + +.message-dialog { + border: 3px solid #999999; + height: 198px; + width: 498px; + background: white; +} + +.message-dialog .message-inline { + display: inline-block; +} + +.message-dialog .message-type-icon { + position: absolute; + margin: 20px 20px; + color: #008ABF; + font-size: 50px; +} + +.message-dialog .message-main { + position: relative; + margin: 30px 0 0 110px; + width: 350px; +} + +.message-dialog .message-confirm-info { + margin: 20px 0 0 110px; + width: 350px; +} + +.message-dialog .message-footer { + position: absolute; + left: 3px; + right: 1px; + bottom: 1px; + height: 50px; + background-color: #008ABF; +} + +.message-dialog .message-footer .message-button { + display: inline-block; + background-color: white; + width: 75px; + height: 30px; + line-height: 30px; + position: relative; + margin-left: 10px; + margin-top: 10px; + text-align: center; + vertical-align: middle; +} + +.message-dialog .message-footer .message-button:hover{ + background-color: #EEEEEE; + cursor: pointer; +} \ No newline at end of file diff --git a/ui/js/widgets/message-flat.js b/ui/js/widgets/message-flat.js new file mode 100644 index 0000000..1ab6aa3 --- /dev/null +++ b/ui/js/widgets/message-flat.js @@ -0,0 +1,97 @@ +/* +* Project Kimchi +* +* Copyright IBM, Corp. 2015 +* +* 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. +*/ + +/* How to use: +* $(".selector").messageFlat({ +* contentMain: "This is a test", //Content you are going to add +* contentConfirm: "Sure?" //Content that inform user whether they want to continue. +* //Default value is: "Are you sure you want to go on?" +* confirm: function() { +* //Function after confirm +* } +* }); +*/ + +(function( $ ) { + $.widget("kimchi.messageFlat", { + options: { + autoOpen: true, + contentMain: null, + contentConfirm: "Are you sure you want to go on?", + confirm: null + }, + + _create: function() { + var that = this; + var msg = that.options.contentMain; + var cfm = that.options.contentConfirm; + $(".body").addClass("style:'opacity:0.5'"); + that._open(); + $(".message-type-icon").addClass("icon-help-circled-1"); + $(".message-dialog .message-content .message-main").text(msg); + $(".message-dialog .message-confirm-info").text(cfm); + $(".message-dialog .message-cancel").on("click", that.destroy); + $(".message-dialog .message-okay").on("click", function() { + that._trigger("confirm"); + that.destroy(); + }); + }, + + _open: function() { + var html = + "<div id='overlay'></div>" + + "<div class='border-grey'>" + + "<div class='message-dialog'>" + + "<div class='message-content'>" + + "<div class='message-inline message-type-icon'></div>" + + "<div class='message-inline message-main'></div>" + + "</div>" + + "<div class='message-confirm-info'></div>" + + "<div class='message-footer'>" + + "<div class='message-button message-okay'>Ok</div>" + + "<div class='message-button message-cancel'>Cancel</div>" + + "</div>" + + "</div>" + + "</div>"; + if (this.options.autoOpen) { + $(html).appendTo($("body")); + var pageWidth = window.screen.width; + var pageHeight = window.screen.height; + var pageLeft = document.screenLeft + var pageTop = document.screenTop; + var topOffset = "-" + pageHeight + "px"; + console.log(topOffset); + $("#overlay").css({ + "opacity": "0.5", + "Left": pageLeft, + "Top": pageTop, + "background-color": "white", + "width": pageWidth, + "height": pageHeight, + "margin-top": topOffset, + "overflow": "hidden" + }); + } + }, + + destroy: function() { + $(".border-grey").remove(); + $("#overlay").remove(); + } + }); +})(jQuery); \ No newline at end of file -- 2.1.0

2 1

[PATCH] UI: Grid Widget
by huoyuxin＠linux.vnet.ibm.com 19 Jan '15

19 Jan '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/datagrid.css | 45 ++++++++++++++++++ ui/js/widgets/grid.js | 93 +++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/datagrid.css create mode 100644 ui/js/widgets/grid.js diff --git a/ui/css/theme-default/datagrid.css b/ui/css/theme-default/datagrid.css new file mode 100644 index 0000000..635c818 --- /dev/null +++ b/ui/css/theme-default/datagrid.css @@ -0,0 +1,45 @@ +.grid span { + display: inline-block; +} + +.grid .header { + padding-bottom: 1px; + border-bottom: solid 2px #ededed; +} + +.grid .header span span { + vertical-align: middle; +} + +.grid .header .sort-up { + margin-bottom: -9px; + cursor: pointer; +} + +.grid .header .sort-down { + margin-top: -9px; + cursor: pointer; +} + +.grid .header > span:first-child, +.grid .body .row > span:first-child { + padding-left: 10px; +} + +.grid .body .row { + height: 46px; + line-height: 46px; + border-bottom: solid 1px #ededed; +} + +.grid .body .row[disabled] { + color: #999999; +} + +.grid .body .odd { + background-color: #fcfcfc; +} + +.grid .body .even { + background-color: #ffffff; +} diff --git a/ui/js/widgets/grid.js b/ui/js/widgets/grid.js new file mode 100644 index 0000000..565caed --- /dev/null +++ b/ui/js/widgets/grid.js @@ -0,0 +1,93 @@ +$(function(){ +$.widget("kimchi.grid", { + options: { + enableSorting: true + }, + _create: function() { + var that = this; + this.element.addClass('grid'); + var head = $(this.element.children().get(0)); + var body = $(this.element.children().get(1)); + head.addClass('header c1 bold grey'); + if(this.options.enableSorting){ + head.children().each(function(){ + var addSorting = "<span>"+$(this).html()+"</span>"; + addSorting += "<span><div class='icon-angle-up sort-up'></div><div class='icon-angle-down sort-down'></div></span>"; + $(this).empty().append(addSorting); + }); + } + $('.icon-angle-up', head).click(function(){ + that.sort(head.children().index($(this).parent().parent()), true); + }); + $('.icon-angle-down', head).click(function(){ + that.sort(head.children().index($(this).parent().parent()), false); + }); + body.addClass('body c1 normal dark-grey'); + body.children().addClass('row'); + this._setRowBackgroud(); + }, + _setRowBackgroud: function(){ + var i=0, classes=['odd', 'even']; + $(this.element.children().get(1)).children().each(function(){ + $(this).removeClass('odd'); + $(this).removeClass('even'); + $(this).addClass(classes[i]); + i = i==0?1:0; + }); + }, + sort: function(column, assending) { + var head = $(this.element.children().get(0)); + $('.icon-up-dir', head).removeClass('icon-up-dir').addClass('icon-angle-up'); + $('.icon-down-dir', head).removeClass('icon-down-dir').addClass('icon-angle-down'); + var columnCell = $(head.children().get(column)); + if(assending){ + $('.icon-angle-up', columnCell).removeClass('icon-angle-up').addClass('icon-up-dir'); + }else{ + $('.icon-angle-down', columnCell).removeClass('icon-angle-down').addClass('icon-down-dir'); + } + var container = $(this.element.children().get(1)); + var keys = [], map = {}; + container.children().each(function(){ + var key = $($(this).children().get(column)).attr('val'); + keys.push(key); + map[key] = $(this); + }); + keys.sort(); + if(!assending) keys.reverse(); + container.empty(); + for(var i=0;i<keys.length;i++){ + container.append(map[keys[i]]); + } + this._setRowBackgroud(); + }, + filter: function(keyword) { + keyword = keyword.toLowerCase(); + var container = $(this.element.children().get(1)); + container.children().each(function(){ + var hide = true; + $(this).children().each(function(){ + if($(this).attr('val').toLowerCase().indexOf(keyword)!=-1){ + hide = false; + return false; + } + }); + $(this).css('display', hide?'none':''); + }); + this._setRowBackgroud(); + }, + _destroy: function() { + this.element.removeClass('grid'); + var head = $(this.element.children().get(0)); + var body = $(this.element.children().get(1)); + head.removeClass('header c1 bold grey'); + if(this.options.enableSorting){ + head.children().each(function(){ + var oriContent = $($(this).children().get(0)).html() + $(this).empty().append(oriContent); + }); + } + body.removeClass('body c1 normal dark-grey'); + body.children().removeClass('row odd even'); + } +}); +}); -- 1.7.1

3 3

[PATCH 0/8] Storage pool tests and bug fixes
by Aline Manera 19 Jan '15

19 Jan '15

Aline Manera (8): Rename test_storagepool.py to test_storagepoolxml.py Storage Pools: Update docs/API.md Storage pool: Fix encoding/decoding while dealing with storage pools MockModel: Override storage pool validation MockModel: Add mock code to list partitions to /host/partitions API MockModel: Extend logical storage pool MockModel: Fix devices filter Storage pool tests docs/API.md | 5 +- src/kimchi/mockmodel.py | 45 ++++++++ src/kimchi/model/storagepools.py | 6 +- tests/test_mock_storagepool.py | 156 ++++++++++++++++++++++++++ tests/test_model.py | 70 ------------ tests/test_rest.py | 120 +------------------- tests/test_storagepool.py | 236 ++++++++++++++------------------------- tests/test_storagepoolxml.py | 171 ++++++++++++++++++++++++++++ tests/utils.py | 11 ++ 9 files changed, 476 insertions(+), 344 deletions(-) create mode 100644 tests/test_mock_storagepool.py create mode 100644 tests/test_storagepoolxml.py -- 2.1.0

2 12

[PATCH] UI: Add messagebar widget
by Wen Wang 19 Jan '15

19 Jan '15

1) Add sample for widget 2) Add messagebar as widget Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/messagebar-flat.css | 63 +++++++++++++++++++++++++++++ ui/js/widgets/messagebar-flat.js | 65 ++++++++++++++++++++++++++++++ ui/js/widgets/samples/messagebar-flat.html | 29 +++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 ui/css/theme-default/messagebar-flat.css create mode 100644 ui/js/widgets/messagebar-flat.js create mode 100644 ui/js/widgets/samples/messagebar-flat.html diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css new file mode 100644 index 0000000..86605cd --- /dev/null +++ b/ui/css/theme-default/messagebar-flat.css @@ -0,0 +1,63 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * 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. + */ +.messagebar { + height: 30px; +} + +.messagebar .messagebar-text { + padding-left: 5px; + text-align: left; + vertical-align: 50%; +} + +.messagebar .messageHead { + display: inline-block; + width: 5px; + height: 30px; +} + +.messagebar-close { + padding-top: 6px; + padding-right: 10px; + cursor: pointer; + float: right; +} + +.green { + background-color: #DAE6CB; +} + +.dark-green { + background-color: #89C53A; +} + +.yellow { + background-color: #F1E3C2; +} + +.dark-yellow { + background-color: #FDB60D; +} + +.red { + background-color: #EAC3C7; +} + +.dark-red { + background-color: #D81227; +} \ No newline at end of file diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js new file mode 100644 index 0000000..d72682d --- /dev/null +++ b/ui/js/widgets/messagebar-flat.js @@ -0,0 +1,65 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * 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. + */ + + /* + + $(".selector").messagebarFlat({ + content: "This is a test", //text that is going to be shown to user + color: "red" //color that we pre-defined, current are "red", "yellow" and "green" + }); + + */ +(function($) { + $.widget("kimchi.messagebarFlat", { + options : { + content : null, + color : "red", + }, + + _create: function() { + var now = this._getTime(); + var that = this; + $("<div class='messagebar'><span class='messageHead'></span>" + + "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") + .addClass(this.options.color) + .appendTo(that.element); + $(".messageHead").addClass("dark-" + this.options.color); + $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { + that.destroy(); + }).appendTo($(".messagebar")); + setTimeout(function() { + that.destroy() + }, 3000); + }, + + _getTime: function() { + var CT = new Date(); + var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); + var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); + var now = currentDate + " " + currentTime; + return now; + }, + + destroy: function() { + var that = this; + that.element.fadeOut("normal", function() { + that.element.remove(); + }); + } + }); +})(jQuery); \ No newline at end of file diff --git a/ui/js/widgets/samples/messagebar-flat.html b/ui/js/widgets/samples/messagebar-flat.html new file mode 100644 index 0000000..1b1ce0b --- /dev/null +++ b/ui/js/widgets/samples/messagebar-flat.html @@ -0,0 +1,29 @@ + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Kimchi</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../messagebar-flat.js"></script> + </head> + <body> + <div class="message"></div> + <script> + $(document).ready(function() { + $(".message").messagebarFlat({ + content: "This is a test", + color: "red" + }); + }); + </script> + </body> + +</html> -- 2.1.0

2 5

[PATCH] UI: Add a new folder that allows adding new kimchi UI design samples
by Wen Wang 19 Jan '15

19 Jan '15

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/widgets/samples/Readme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ui/js/widgets/samples/Readme.md diff --git a/ui/js/widgets/samples/Readme.md b/ui/js/widgets/samples/Readme.md new file mode 100644 index 0000000..9c8e425 --- /dev/null +++ b/ui/js/widgets/samples/Readme.md @@ -0,0 +1 @@ +This folder contains the usage of Kimchi new UI design widgets. \ No newline at end of file -- 2.1.0

2 1