May 2014 - Kimchi-devel - oVirt List Archives

[PATCH V2 0/7] Issue #342: load i18n.html of the plugin
by shaohef＠linux.vnet.ibm.com 22 May '14

22 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: The improvement concept here is to directly generate JSON on the server and assign it to the i18n variable, rather than inserting nodes into the DOM. Plugins would use a plugin1.i18n= structure to keep plugin strings from colliding with each other, or with the kimchi variables. ShaoHe Feng (5): Update root.py to make Cheetah render the JSON template. Update the i18n tmpl to produce JSON Add JS API for fetching i18n JSON add an optional to toggle the sample plugin generate the translation files for plugins/sample Zhou Zheng Sheng (2): Add Minimal UI Page for the Sample Plugin Issue #342: load i18n.html of the plugin configure.ac | 11 +++ plugins/sample/Makefile.am | 25 ++++- plugins/sample/__init__.py | 3 +- plugins/sample/config.status | 1 + plugins/sample/po/LINGUAS | 1 + plugins/sample/po/Makefile.in.in | 1 + plugins/sample/po/Makevars | 1 + plugins/sample/po/POTFILES.in | 2 + plugins/sample/po/en_US.po | 21 ++++ plugins/sample/po/gen-pot | 1 + plugins/sample/po/pt_BR.po | 24 +++++ plugins/sample/po/zh_CN.po | 24 +++++ plugins/sample/sample.conf | 7 -- plugins/sample/sample.conf.in | 12 +++ plugins/sample/ui/config/tab-ext.xml | 9 +- plugins/sample/ui/pages/i18n.json.tmpl | 9 ++ plugins/sample/ui/pages/tab.html.tmpl | 6 ++ src/kimchi/root.py | 5 + src/kimchi/template.py | 34 ++++--- ui/js/src/kimchi.api.js | 18 +++- ui/js/src/kimchi.main.js | 24 ++++- ui/pages/i18n.html.tmpl | 176 --------------------------------- ui/pages/i18n.json.tmpl | 163 ++++++++++++++++++++++++++++++ 23 files changed, 368 insertions(+), 210 deletions(-) create mode 120000 plugins/sample/config.status create mode 120000 plugins/sample/po/LINGUAS create mode 120000 plugins/sample/po/Makefile.in.in create mode 120000 plugins/sample/po/Makevars create mode 100644 plugins/sample/po/POTFILES.in create mode 100644 plugins/sample/po/en_US.po create mode 120000 plugins/sample/po/gen-pot create mode 100644 plugins/sample/po/pt_BR.po create mode 100644 plugins/sample/po/zh_CN.po delete mode 100644 plugins/sample/sample.conf create mode 100644 plugins/sample/sample.conf.in create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl create mode 100644 plugins/sample/ui/pages/tab.html.tmpl delete mode 100644 ui/pages/i18n.html.tmpl create mode 100644 ui/pages/i18n.json.tmpl -- 1.9.0

5 27

[PATCH 0/6] Debug Report Rename Feature
by Hongliang Wang 22 May '14

22 May '14

Enable debug report rename feature in this patch set. Hongliang Wang (6): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report Rename UI: Add API in kimchi.api.js Debug Report Rename UI: Add Rename Page Debug Report Rename UI: Enable Rename in Host Tab docs/API.md | 3 ++ src/kimchi/API.json | 11 +++++++ src/kimchi/control/debugreports.py | 4 ++- src/kimchi/model/debugreports.py | 13 +++++++++ ui/css/theme-default/report-rename.css | 22 ++++++++++++++ ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.host.js | 12 ++++++++ ui/js/src/kimchi.report_rename_main.js | 39 +++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 ++++++++++++++++++++++++++++++++++ 9 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 ui/css/theme-default/report-rename.css create mode 100644 ui/js/src/kimchi.report_rename_main.js create mode 100644 ui/pages/report-rename.html.tmpl -- 1.8.1.4

4 15

[PATCH v2 0/3] PCI passthrough: Summary
by Zhou Zheng Sheng 22 May '14

22 May '14

Hi, This patch series is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. Host devices form a tree. We can assign most of the devices in the tree to VM. By assigning a device, all the devices in its sub-tree are also assigned. It might not make sense to assign a USB controller, because the host may be using one of the devices connected to the controller. Instead, Kimchi just presents the "leaf" devices to assign to guest. In recent Linux kernel and KVM, it is able to recognize the IOMMU group of a PCI device. The "leaf" PCI devices in the same IOMMU group should be assigned and dismissed together. The IOMMU group is the actual smallest isolation granularity of the PCI devices. The first patch is to list all host devices information. It's useful on its own to show host devices information. The second patch is to list all eligible host devices to assign, as well as the "affected" devices in the same IOMMU group. The third patch creates a sub-collection "hostdevs" to the VM resource, and deals with assigning and dismissing devices. I'll update API and unit test once everyone is happy with the interface and logic. Zhou Zheng Sheng (3): PCI passthrough: list all types of host devices PCI passthrough: list eligible device to passthrough PCI passthrough: Directly assign and dissmis host device from VM docs/API.md | 11 +- src/kimchi/control/host.py | 9 ++ src/kimchi/control/vm/hostdevs.py | 44 ++++++ src/kimchi/featuretests.py | 10 +- src/kimchi/hostdev.py | 266 +++++++++++++++++++++++++++++++++ src/kimchi/i18n.py | 7 + src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 32 ++-- src/kimchi/model/libvirtstoragepool.py | 18 +-- src/kimchi/model/vmhostdevs.py | 259 ++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 +++- tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 668 insertions(+), 39 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.0

2 5

kimchi can not start for libvirt Connection error
by Sheldon 21 May '14

21 May '14

$ sudo PYTHONPATH=src ./src/kimchid *** Running feature tests *** [21/May/2014:19:41:48] ENGINE Error in 'start' listener <bound method CapabilitiesModel._set_capabilities of <kimchi.model.config.CapabilitiesModel object at 0x314ac10>> Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/cherrypy/process/wspbus.py", line 197, in publish output.append(listener(*args, **kwargs)) File "/home/shhfeng/work/workdir/kimchi/src/kimchi/model/config.py", line 69, in _set_capabilities self.metadata_support = FeatureTests.has_metadata_support() File "/home/shhfeng/work/workdir/kimchi/src/kimchi/featuretests.py", line 197, in has_metadata_support conn = libvirt.open('qemu:///system') File "/usr/lib64/python2.7/site-packages/libvirt.py", line 247, in open if ret is None:raise libvirtError('virConnectOpen() failed') libvirtError: Failed to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused [21/May/2014:19:41:48] ENGINE Shutting down due to error in start listener: [21/May/2014:19:41:48] ENGINE Bus STOPPING [21/May/2014:19:41:48] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8010)) shut down [21/May/2014:19:41:48] ENGINE Stopped thread '_TimeoutMonitor'. [21/May/2014:19:41:48] ENGINE Stopped thread 'Autoreloader'. [21/May/2014:19:41:48] ENGINE Bus STOPPED [21/May/2014:19:41:48] ENGINE Bus EXITING [21/May/2014:19:41:48] ENGINE Bus EXITED I do not find the root reason. but after I use LibvirtConnection to open a libvirt connection, kimchi can start. +from kimchi.model.libvirtconnection import LibvirtConnection @@ -104,7 +105,7 @@ def libvirt_supports_iso_stream(protocol): - conn = libvirt.open('qemu:///system') + conn = LibvirtConnection('qemu:///system').get() -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

1 0

[PATCHv2] Exception: fix exception details when not specified
by lvroyce＠linux.vnet.ibm.com 21 May '14

21 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Add a new type of error to cover general schema validation error. (per Sheldon's comments) Not every validation error needs to translate for user, we define user interested errors, other developer interested error should report directly by schema validator, and handled by developer directly. fix exception handling for this situation. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Signed-off-by: Zheng Sheng Zhou <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/control/utils.py | 6 ++++-- src/kimchi/exception.py | 2 +- src/kimchi/i18n.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/kimchi/control/utils.py b/src/kimchi/control/utils.py index 5e63816..611b1c0 100644 --- a/src/kimchi/control/utils.py +++ b/src/kimchi/control/utils.py @@ -98,8 +98,10 @@ def validate_params(params, instance, action): try: validator.validate(request) except ValidationError, e: - raise InvalidParameter(e.schema['error'], {'value': str(e.instance)}) - + if e.schema.get('error'): + raise InvalidParameter(e.schema['error'], {'value': str(e.instance)}) + else: + raise InvalidParameter("KCHAPI0008E", {"err": e.message}) class UrlSubNode(object): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..5a292e0 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -62,7 +62,7 @@ class KimchiException(Exception): # itself to a unicode string. args[key] = unicode(value) - return unicode(translation.gettext(text), 'utf-8') % args + return translation.gettext(text).encode('utf-8') % args class NotFoundError(KimchiException): diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 25b703f..4ed13fe 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -30,6 +30,7 @@ messages = { "KCHAPI0005E": _("Create is not allowed for %(resource)s"), "KCHAPI0006E": _("Unable to parse JSON request"), "KCHAPI0007E": _("This API only supports JSON"), + "KCHAPI0008E": _("Parameters does not match requirement in schema: %(err)s"), "KCHASYNC0001E": _("Datastore is not initiated in the model object."), "KCHASYNC0002E": _("Unable to start task due error: %(err)s"), -- 1.8.3.2

1 0

#296 improvement of ui when generating debug reports
by wenwang 20 May '14

20 May '14

According to #296, Dialogue window blocked ui when generating debug report. I have one proposal that added a process bar showing that it's working without blocking ui: I have two thoughts: 1. Dynamic dots during generating process indicate it's working. 2. Dynamic background(with the blue stripe moving forward) indicating it's working. Your comments on this design are highly valued and very important to me. Best regards Wang Wen

2 2

[PATCH] Issue#361:Bugfix as disable the action button content when creating network
by Wen Wang 16 May '14

16 May '14

Bugfix that disabled the content display of the action button for an exsiting network when creating a new network. --- ui/js/src/kimchi.network.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ca6d29b..7ff39ae 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -172,6 +172,9 @@ kimchi.addNetworkActions = function(network) { $(".menu-container", "#" + network.name).mouseleave(function() { $(".menu-container", "#" + network.name).toggle(false); }); + $("#networkAdd").on("click", function() { + $(".menu-container", "#" + network.name).toggle(false); + }); }; kimchi.initNetworkCreation = function() { -- 1.9.1

2 1

Re: [Kimchi-devel] [PATCH 3/3] Use action verb as the main button's label
by Hongliang Wang 16 May '14

16 May '14

On 05/16/2014 01:37 AM, Crístian Viana wrote: > On 15-05-2014 00:30, Hongliang Wang wrote: >> It's an interesting topic here. > I agree :-) I wish we had more discussions like this here. >> Take edit template for example. The flow is: >> List templates => >> Select a template to edit by clicking the "*Edit*" Button => >> Edit template window is open, and user changes some fields. => >> Click the "*Save*" (Or "Submit") Button to save (or submit) changes. >> >> Notice that "Edit" means the user is about to edit the template, so >> "Edit'" Button should trigger a pop-up window to allow user to change >> some fields. >> And "Save" Button is for saving user's changes to server. So I think >> it's reasonable to use these 2 labels for these 2 different purposes. > You're right, that's another way of labeling the buttons. But this is > also not used in throughout Kimchi and that's what concerns me. Some > windows have the "Save" button, some windows have the same label as > the button which triggered it; we need a consistency. Whichever way is > fine for me, as long as it looks consistent. I don't like the idea of > having each dialog of the same application designed differently, even > if subtly, which is how I feel it is now. > I also thought about always using "Save" as the buttons' labels, as > you said, and that sounds totally fine for me. If we think this > approach is better, I'll use this approach on the next version of this > patchset. Go ahead! Either "Save" or "Submit" is fine for me. >> Let me explain the naming rule of #guest-edit-button-save. It follows >> name space style like Java package mechanism. >> guest-: It's within the scope of guest page >> edit-: It's within the scope of guest edit window >> button-: It's a button within the scope of guest edit window >> save: It's a button named save >> >> So please remain the original ID string of the button. If we will >> introduce another button in the future, we can simply name it >> "#guest-edit-button-newid". > Thanks for the explanation, it makes total sense. I just blindly > removed the "save" string from the variable name, I should have left > "edit" instead, which is the new label I'm using. > But, again, this variable naming rule is also not consistent > throughout thel Kimchi code. For example, the submit button of the > dialog "Create Storage Pool" has an id="pool-doAdd". According to this > naming rule, it should be something like "storage-add-button-create". > In this patch, I was just trying to remove the reference to "save", > which was the label I removed. I agree I should have left the new > label on the ID, "edit". But I think this is a different discussion, > regarding coding consistency, which [definitely] needs to be addressed > in future patches. I'll use "guest-edit-button-edit" in the next > version of this patch to keep the style you mentioned. Agree. The naming rules is totally not consistent because we didn't propose one unified. I also think we need have a unified naming rule (as well as same user experience through out Kimchi, including windows, dialog s, buttons, operation behaviors, etc.). Maybe we need propose a coding/designing guideline documentation for future code. If we are planning to, I'm glad to be involved in.

1 0

[V3] Issue#305: Redesign bridged network UI section
by Wen Wang 16 May '14

16 May '14

Finished align vlan fields. Redesigned the pattern of the label positions V2 -> V3: Address to Hongliang Wang: Have the additional margin place removed. v1 -> v2: Address to Hongliang Wang: Have the unrelated lines removed & Have the display format changed from table to div. Address to Yuxin Huo: Have the unused IDs removed. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 21 ++++++++++++++++----- ui/js/src/kimchi.network.js | 8 ++++---- ui/pages/tabs/network.html.tmpl | 26 +++++++++++++++++--------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 67f2aa2..176b277 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -209,19 +209,30 @@ vertical-align: top; } -.network-config .destination { - margin-left: 28px; +.bridge-option-column { + display: inline-block; + margin-left: 56px; + vertical-align: middle; +} + +.bridge-option-column > div { + height: 25px; + line-height: 25px; } -.network-config .VLAN { - margin-left: 28px; +.bridge-option-column select { + height: 26px; } -.network-config .VLAN input[type="text"] { +.bridge-option-column input[type="text"] { height: 25px; width: 60px; } +#labelNetworkVlanID { + margin-left: 26px; +} + .network-config .input-hint-icon { margin: -1px 1px 0 0; display: inline-block; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7a331be..ca6d29b 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -275,13 +275,14 @@ kimchi.enableBridgeOptions = function(enable) { $("#networkVlanID").prop("disabled", true); $("#networkVlanID").val(""); $("#networkInterface").val(""); - $("#bridge-options").slideUp(100); + $("#bridgeOptions").slideUp(100); } else if (!$("#networkInterface").val()){ $("#networkInterface").prop("selectedIndex", 0); - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; + kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeBri").prop("checked", isInterfaceAvail); $("#networkTypeBri").prop("disabled", !isInterfaceAvail); @@ -289,7 +290,7 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); } else { - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; @@ -318,7 +319,6 @@ kimchi.cleanNetworkDialog = function() { $("#networkVlanID").prop("disabled", true); $("#enableVlan").prop("checked", false); }; - kimchi.setupNetworkFormEvent = function() { $("#networkName").on("keyup", function(event) { $("#networkName").toggleClass("invalid-field", !$("#networkName").val().match(/^[a-zA-Z0-9_]+$/)); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index e49b257..aacd2b6 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -68,16 +68,24 @@ <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> </div> - <div id="bridge-options"> - <div class="destination"> - <label for="networkInterface">$_("Destination"): </label> - <select id="networkInterface"></select> + <div id="bridgeOptions"> + <div class="bridge-option-column"> + <div> + <label for="networkInterface">$_("Destination"): </label> + </div> + <div> + <select id="networkInterface"></select> + </div> </div> - <div class="VLAN"> - <label for="enableVlan">$_("Enable VLAN"): </label> - <input id="enableVlan" type="checkbox" value=""/> - <label for="networkVlanID">$_("VLAN ID"): </label> - <input type="text" id="networkVlanID" disabled> + <div class="bridge-option-column"> + <div> + <input id="enableVlan" type="checkbox" value=""/> + <label for="enableVlan">$_("Enable VLAN"): </label> + </div> + <div> + <label id="labelNetworkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled> + </div> </div> </div> </div> -- 1.9.1

2 1

[PATCH v2] Issue#305: Redesign bridged network UI section
by Wen Wang 16 May '14

16 May '14

Finished align vlan fields. Redesigned the pattern of the label positions v1 -> v2: Address to Hongliang Wang: Have the unrelated lines removed & Have the display format changed from table to div. Address to Yuxin Huo: Have the unused IDs removed. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 18 +++++++++++++++--- ui/js/src/kimchi.network.js | 8 ++++---- ui/pages/tabs/network.html.tmpl | 26 +++++++++++++++++--------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 67f2aa2..5a06715 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -209,19 +209,31 @@ vertical-align: top; } -.network-config .destination { +.bridge-option-column { + display: inline-block; margin-left: 28px; + vertical-align: middle; } -.network-config .VLAN { +.bridge-option-column > div { margin-left: 28px; + height: 25px; + line-height: 25px; +} + +.bridge-option-column select { + height: 26px; } -.network-config .VLAN input[type="text"] { +.bridge-option-column input[type="text"] { height: 25px; width: 60px; } +#labelNetworkVlanID { + margin-left: 26px; +} + .network-config .input-hint-icon { margin: -1px 1px 0 0; display: inline-block; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7a331be..ca6d29b 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -275,13 +275,14 @@ kimchi.enableBridgeOptions = function(enable) { $("#networkVlanID").prop("disabled", true); $("#networkVlanID").val(""); $("#networkInterface").val(""); - $("#bridge-options").slideUp(100); + $("#bridgeOptions").slideUp(100); } else if (!$("#networkInterface").val()){ $("#networkInterface").prop("selectedIndex", 0); - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; + kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeBri").prop("checked", isInterfaceAvail); $("#networkTypeBri").prop("disabled", !isInterfaceAvail); @@ -289,7 +290,7 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); } else { - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; @@ -318,7 +319,6 @@ kimchi.cleanNetworkDialog = function() { $("#networkVlanID").prop("disabled", true); $("#enableVlan").prop("checked", false); }; - kimchi.setupNetworkFormEvent = function() { $("#networkName").on("keyup", function(event) { $("#networkName").toggleClass("invalid-field", !$("#networkName").val().match(/^[a-zA-Z0-9_]+$/)); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index e49b257..aacd2b6 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -68,16 +68,24 @@ <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> </div> - <div id="bridge-options"> - <div class="destination"> - <label for="networkInterface">$_("Destination"): </label> - <select id="networkInterface"></select> + <div id="bridgeOptions"> + <div class="bridge-option-column"> + <div> + <label for="networkInterface">$_("Destination"): </label> + </div> + <div> + <select id="networkInterface"></select> + </div> </div> - <div class="VLAN"> - <label for="enableVlan">$_("Enable VLAN"): </label> - <input id="enableVlan" type="checkbox" value=""/> - <label for="networkVlanID">$_("VLAN ID"): </label> - <input type="text" id="networkVlanID" disabled> + <div class="bridge-option-column"> + <div> + <input id="enableVlan" type="checkbox" value=""/> + <label for="enableVlan">$_("Enable VLAN"): </label> + </div> + <div> + <label id="labelNetworkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled> + </div> </div> </div> </div> -- 1.9.1

2 1

[PATCH] Issue #342: load i18n.html of the plugin
by shaohef＠linux.vnet.ibm.com 15 May '14

15 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Apparently, in plugin code there is no way to insert new entries into Kimchi ./ui/pages/i18n.html.tmpl, so every plugin should provide its own i18n.html.tmpl. each plugin provides a "plugins/plugin-name/ui/pages/i18n.html.tmpl", and maps it to the URI "plugins/plugin-name/i18n.html". This is already supported by the kimchi back-end. What we have to do is just to load "plugins/plugin-name/i18n.html" in the front-end code. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 3 ++- ui/js/src/kimchi.main.js | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 7d85fdf..d4d92d8 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -558,13 +558,14 @@ var kimchi = { }); }, - listPlugins : function(suc, err) { + listPlugins : function(suc, err, async) { kimchi.requestJSON({ url : kimchi.url + 'plugins', type : 'GET', contentType : 'application/json', dataType : 'json', resend: true, + async: async ? async : true, success : suc, error : err }); diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 86fed5b..82778cc 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -62,8 +62,19 @@ kimchi.main = function() { return tabs; }; + var retrieveI18ns = function(url) { + $.ajax({ + url : url, + async : false, + success : function(html) { + $('#main').append(html)}, + error: function(html) {} + }); + }; + var tabConfigUrl = '/config/ui/tabs.xml'; var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml'; + var pluginI18nUrl = 'plugins/{plugin}/i18n.html'; var DEFAULT_HASH; var buildTabs = function(callback) { var tabs = retrieveTabs(tabConfigUrl); @@ -72,6 +83,10 @@ kimchi.main = function() { var url = kimchi.template(pluginConfigUrl, { plugin: p }); + var i18nurl = kimchi.template(pluginI18nUrl, { + plugin: p + }); + retrieveI18ns(i18nurl); tabs.push.apply(tabs, retrieveTabs(url)); }); @@ -85,7 +100,9 @@ kimchi.main = function() { $('#nav-menu').append(genTabs(tabs)); callback && callback(); - }); + }, function(data) { + kimchi.message.error(data.responseJSON.reason); + }, true); }; var onLanguageChanged = function(lang) { -- 1.9.0

4 13

[PATCHv2 0/2] Extend storagepool support
by lvroyce＠linux.vnet.ibm.com 15 May '14

15 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Yu Xin Huo (1): StoragePool Edit: Add Disk to Logical Pool Royce Lv (2): StoragePool Edit: Add Disk to Logical Pool StoragePool Edit: Update json schema src/kimchi/API.json | 3 ++- ui/js/src/kimchi.api.js | 12 ++++++++++ ui/js/src/kimchi.storage_main.js | 41 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.html.tmpl | 1 + ui/pages/tabs/storage.html.tmpl | 10 ++++++++ 6 files changed, 67 insertions(+), 2 deletions(-) -- 1.8.3.2

4 5

[PATCH] VM template: add disk size error message
by Zhou Zheng Sheng 15 May '14

15 May '14

The schema checker needs to report an error message when the disk size is less than 1GB. Currently this message is missing, so it reports an KeyError. This patch adds the error message. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 6 ++++-- src/kimchi/i18n.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b9d371a..d2a834c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -384,7 +384,8 @@ } }, "minItems": 1, - "uniqueItems": true + "uniqueItems": true, + "error": "KCHTMPL0022E" }, "storagepool": { "description": "Location of the storage pool", @@ -554,7 +555,8 @@ } }, "minItems": 1, - "uniqueItems": true + "uniqueItems": true, + "error": "KCHTMPL0022E" }, "storagepool": { "description": "Location of the storage pool", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 25b703f..e105e50 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -119,6 +119,7 @@ messages = { "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"), "KCHTMPL0020E": _("Unable to create template due error: %(err)s"), "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"), + "KCHTMPL0022E": _("Disk size must be greater than 1GB."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), -- 1.9.0

1 1

[PATCH] Update README with the correct FF ESR version.
by Adam King 15 May '14

15 May '14

Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 63ac760..c658637 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ Desktop Browser Support: ----------------------- * **Internet Explorer:** IE9+ * **Chrome:** Current-1 version -* **Firefox:** Current-1 version Firefox 17ESR +* **Firefox:** Current-1 version Firefox 24ESR * **Safari:** Current-1 version * **Opera:** Current-1 version -- 1.9.0

3 3

[PATCH] Issue #342: load i18n.html of the plugin
by shaohef＠linux.vnet.ibm.com 14 May '14

14 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Apparently, in plugin code there is no way to insert new entries into Kimchi ./ui/pages/i18n.html.tmpl, so every plugin should provide its own i18n.html.tmpl. each plugin provides a "plugins/plugin-name/ui/pages/i18n.html.tmpl", and maps it to the URI "plugins/plugin-name/i18n.html". This is already supported by the kimchi back-end. What we have to do is just to load "plugins/plugin-name/i18n.html" in the front-end code. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 3 ++- ui/js/src/kimchi.main.js | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 7d85fdf..d4d92d8 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -558,13 +558,14 @@ var kimchi = { }); }, - listPlugins : function(suc, err) { + listPlugins : function(suc, err, async) { kimchi.requestJSON({ url : kimchi.url + 'plugins', type : 'GET', contentType : 'application/json', dataType : 'json', resend: true, + async: async ? async : true, success : suc, error : err }); diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 86fed5b..82778cc 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -62,8 +62,19 @@ kimchi.main = function() { return tabs; }; + var retrieveI18ns = function(url) { + $.ajax({ + url : url, + async : false, + success : function(html) { + $('#main').append(html)}, + error: function(html) {} + }); + }; + var tabConfigUrl = '/config/ui/tabs.xml'; var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml'; + var pluginI18nUrl = 'plugins/{plugin}/i18n.html'; var DEFAULT_HASH; var buildTabs = function(callback) { var tabs = retrieveTabs(tabConfigUrl); @@ -72,6 +83,10 @@ kimchi.main = function() { var url = kimchi.template(pluginConfigUrl, { plugin: p }); + var i18nurl = kimchi.template(pluginI18nUrl, { + plugin: p + }); + retrieveI18ns(i18nurl); tabs.push.apply(tabs, retrieveTabs(url)); }); @@ -85,7 +100,9 @@ kimchi.main = function() { $('#nav-menu').append(genTabs(tabs)); callback && callback(); - }); + }, function(data) { + kimchi.message.error(data.responseJSON.reason); + }, true); }; var onLanguageChanged = function(lang) { -- 1.9.0

1 0

[PATCH] Issue#305: Redesign bridged network UI section
by Wen Wang 14 May '14

14 May '14

Finished align vlan fields. Redesigned the pattern of the label positions Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 28 ++++++++++++++++++++++------ ui/js/src/kimchi.network.js | 10 +++++----- ui/pages/tabs/network.html.tmpl | 33 ++++++++++++++++++++++----------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 67f2aa2..98220ab 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -198,7 +198,7 @@ color: #666666; border: solid 1px; background-color: white; - padding: 3px 4px 3px 0; + padding: 3px 4px 3px 0;192.168.122.0/24 } .network-config .input-container { @@ -209,17 +209,33 @@ vertical-align: top; } -.network-config .destination { - margin-left: 28px; +.network-config .destination select { + margin-left: 48px; + +} + +.network-config .destination label { + vertical-align: middle; + margin-left: 48px; } -.network-config .VLAN { - margin-left: 28px; +.network-config .VLANID input[type="checkbox"] { + margin-left: 34px; + vertical-align: middle; } -.network-config .VLAN input[type="text"] { +.network-config .VLANID label { + vertical-align: middle; +} + +.network-config .labelVLAN label { + margin-left: 56px; + vertical-align: middle; +} +.network-config .labelVLAN input[type="text"] { height: 25px; width: 60px; + vertical-align: middle; } .network-config .input-hint-icon { diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7a331be..cfd7338 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -244,6 +244,7 @@ kimchi.openNetworkDialog = function(okCallback) { if (nics[$("#networkInterface").val()].type === "bridge") { $("#enableVlan").prop("checked", false); $("#enableVlan").prop("disabled", true); + $("#enableVlan").slideUp(100); $("#networkVlanID").val(""); $("#networkVlanID").prop("disabled", true); } else { @@ -275,13 +276,14 @@ kimchi.enableBridgeOptions = function(enable) { $("#networkVlanID").prop("disabled", true); $("#networkVlanID").val(""); $("#networkInterface").val(""); - $("#bridge-options").slideUp(100); + $("#bridgeOptions").slideUp(100); } else if (!$("#networkInterface").val()){ $("#networkInterface").prop("selectedIndex", 0); - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; + kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeBri").prop("checked", isInterfaceAvail); $("#networkTypeBri").prop("disabled", !isInterfaceAvail); @@ -289,7 +291,7 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); } else { - $("#bridge-options").slideDown(100); + $("#bridgeOptions").slideDown(100); } }; @@ -315,10 +317,8 @@ kimchi.cleanNetworkDialog = function() { $("#networkInterface option").removeAttr("selected").find(":first").attr("selected", "selected"); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); - $("#networkVlanID").prop("disabled", true); $("#enableVlan").prop("checked", false); }; - kimchi.setupNetworkFormEvent = function() { $("#networkName").on("keyup", function(event) { $("#networkName").toggleClass("invalid-field", !$("#networkName").val().match(/^[a-zA-Z0-9_]+$/)); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index e49b257..c9bf1d4 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -68,17 +68,28 @@ <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> </div> - <div id="bridge-options"> - <div class="destination"> - <label for="networkInterface">$_("Destination"): </label> - <select id="networkInterface"></select> - </div> - <div class="VLAN"> - <label for="enableVlan">$_("Enable VLAN"): </label> - <input id="enableVlan" type="checkbox" value=""/> - <label for="networkVlanID">$_("VLAN ID"): </label> - <input type="text" id="networkVlanID" disabled> - </div> + <div id="bridgeOptions"> + <table id="tableBridgeOption" > + <tr> + <td class="destination"> + <label id="labelNetworkInterface">$_("Destination"): </label> + </td> + <td class="VLANID"> + <input id="enableVlan" type="checkbox" value=""/> + <label id="labelVlanID">$_("Enable VLAN"): </label> + </td> + </tr> + <tr> + <td class="destination"> + <select id="networkInterface"></select> + </td> + <td class="labelVLAN"> + <label id="labelNetworkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled> + </td> + </tr> + </table> + </div> </div> </div> -- 1.9.1

3 2

[PATCH] Issue #317: disable storage pool create by default in UI
by shaohef＠linux.vnet.ibm.com 14 May '14

14 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> All button status of add/create pages should be consistent - it should be disabled by default until the minimum of the required fields are filled. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 8 ++++++++ ui/pages/storagepool-add.html.tmpl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..7bed152 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -145,6 +145,14 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#form-pool-add').change(function() { + if (kimchi.validateForm()) { + $('#pool-doAdd').removeAttr('disabled'); + } else { + $('#pool-doAdd').attr('disabled', 'disabled'); + } + + }); }; kimchi.validateForm = function() { diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..7406bab 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -152,7 +152,7 @@ </div> <footer> <div class="btn-group"> - <button id="pool-doAdd" class="btn-normal"> + <button id="pool-doAdd" class="btn-normal" disabled="disabled"> <span class="text">$_("Create")</span> </button> </div> -- 1.9.0

3 2

[PATCH] Fix text alignment on storage pool type combo box
by Crístian Viana 14 May '14

14 May '14

The storage pool type list does not have a left padding like the other combo boxes in Kimchi, bringing the text very close to the UI component's border. Apply a common CSS class to the combo box so it looks like the other objects in the application. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/pages/storagepool-add.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..6700b56 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -44,7 +44,7 @@ <div class="storage-type-wrapper-controls"> <div id="poolTypeId"> <input id="poolTypeInputId" name="type" type="hidden" value="dir"/> - <span id="pool-type-label"></span><span class="arrow"></span> + <span id="pool-type-label" class="text"></span><span class="arrow"></span> <div> <ul id="storagePool-list"> </ul> -- 1.9.0

1 1

[PATCH] Use ellipsis on buttons when additional input is required
by Crístian Viana 13 May '14

13 May '14

Common UI guidelines state that there should be ellipsis on buttons or menu items when additional information is required from the user to perform the operation, usually via a modal window or a popup. Some operations in Kimchi require additional input from the user (e.g. Template > Edit) while other operations do not (e.g. Template > Clone). Using a common guideline like this makes the UI easier to navigate, so the user can expect a new dialog when clicking on "Template > Edit" and no additional dialog when clicking on "Template > Clone", for example. There is a related discussion on this link: http://stackoverflow.com/q/637683/38333. Append an ellipsis to buttons and menu items that require additional user information. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 6 +++--- ui/pages/guest-add.html.tmpl | 2 +- ui/pages/guest.html.tmpl | 4 ++-- ui/pages/tabs/templates.html.tmpl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 4c94fc1..9bfc844 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -84,7 +84,7 @@ kimchi.host_main = function() { title: i18n['KCHREPO6003M'], toolbarButtons: [{ id: 'repositories-grid-add-button', - label: i18n['KCHREPO6012M'], + label: i18n['KCHREPO6012M'] + '…', onClick: function(event) { kimchi.window.open({url:'repository-add.html', class: repo_type}); } @@ -106,7 +106,7 @@ kimchi.host_main = function() { } }, { id: 'repositories-grid-edit-button', - label: i18n['KCHREPO6013M'], + label: i18n['KCHREPO6013M'] + "…", disabled: true, onClick: function(event) { var repository = repositoriesGrid.getSelected(); @@ -291,7 +291,7 @@ kimchi.host_main = function() { title: i18n['KCHDR6002M'], toolbarButtons: [{ id: reportGridID + '-generate-button', - label: i18n['KCHDR6006M'], + label: i18n['KCHDR6006M'] + '…', onClick: function(event) { kimchi.window.open('report-add.html', { close: function() { diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index 84a1994..ab80a2f 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -47,7 +47,7 @@ <div id="prompt-create-template" class="hidden"> <div>$_("Please create a template first.")</div> <a id="btn-create-template" class="btn-normal" href="templates.html"> - <span class="text">$_("Create a Template")</span> + <span class="text">$_("Create a Template")…</span> </a> </div> <div id="prompt-choose-template" class="hidden"> diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index c7335c8..f23889f 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -56,8 +56,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big shutoff-disabled" name="vm-media"><span class="text">$_("Manage Media")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big shutoff-disabled" name="vm-media"><span class="text">$_("Manage Media")…</span></button> + <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")…</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 6ae6640..59f490c 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -42,7 +42,7 @@ <div class="btn dropdown popable" style="width: 70px"> <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> - <a class="button-big template-edit" data-template='{name}'>$_("Edit")</a> + <a class="button-big template-edit" data-template='{name}'>$_("Edit")…</a> <a class="button-big template-clone" data-template='{name}'>$_("Clone")</a> <a class="button-big red template-delete" data-template='{name}'>$_("Delete")</a> </div> -- 1.9.0

1 0

[PATCH] Add missing error message when updating template
by Crístian Viana 09 May '14

09 May '14

The template update command (as well as the other ones) should return an error message when any of its property values is empty/wrong. The error message should describe what happened. When leaving the disk size empty during the template update command, no error message is returned and the server an exception is raised. Update the API JSON file so there is an error message assigned to the template disk property. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 3 ++- src/kimchi/i18n.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b9d371a..92e9720 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -549,7 +549,8 @@ "size": { "description": "Size (GB) of the disk", "type": "number", - "minimum": 1 + "minimum": 1, + "error": "KCHTMPL0022E" } } }, diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 25b703f..4beb29d 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -119,6 +119,7 @@ messages = { "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"), "KCHTMPL0020E": _("Unable to create template due error: %(err)s"), "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"), + "KCHTMPL0022E": _("Disk size must be an integer greater than 0"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), -- 1.9.0

1 0

[PATCH 0/2] Fix test cases and server setup
by Aline Manera 09 May '14

09 May '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): bug fix: Update test cases to use HTTPS bug fix: Allow changing default ports src/kimchi.conf.in | 3 ++ src/kimchi/config.py.in | 6 ++-- src/kimchi/proxy.py | 6 ++-- src/kimchi/server.py | 4 +-- src/kimchid.in | 17 ++++----- tests/test_authorization.py | 5 +-- tests/test_exception.py | 24 +++++++------ tests/test_mockmodel.py | 25 ++++++++------ tests/test_plugin.py | 5 +-- tests/test_rest.py | 80 ++++++++++++++++++++++--------------------- tests/test_server.py | 7 ++-- tests/utils.py | 20 +++++------ 12 files changed, 105 insertions(+), 97 deletions(-) -- 1.7.10.4

2 4

[PATCH v2] host/partitions: avoid calling disks.get_partitions_names() for each partition
by Zhou Zheng Sheng 09 May '14

09 May '14

Problem: In PartitionModel.lookup(), it calls disks.get_partitions_names() to verify the given partition is eligible to be used in a new logical storage pool as follow. if name not in disks.get_partitions_names(): raise NotFoundError(...) When the front-end issues GET request to host/partitions, the back-end would call get_partitions_names() for each partition. If there are many disks and partitions in the host, get_partitions_names() takes a long time to finish, and calling get_partitions_names() for each partition would make the GET request timeout. In all, the original control flow is as follow. GET host/partitions Partitions._get_resources() PartitionsModel.get_list() disks.get_partitions_names() for each partition name: Partition.lookup() PartitionModel.lookup() verify partition name in disks.get_partitions_names() disks.get_partition_details() The solution is to split the block device verification code out of disks.get_partitions_names(), and put it in a new function disks._is_available(). Now get_partitions_names() just returns all the block devices, and disks.get_partition_details() can perform the eligibility check by calling disks._is_available(). The original get_partitions_names() checks eligibility for all the detected device, so calling it for each partition is too slow. The new _is_available() function just checks the given block device. The New control flow is as follow. GET host/partitions Partitions._get_resources() PartitionsModel.get_list() disks.get_partitions_names() for each partition name: Partition.lookup() PartitionModel.lookup() disks.get_partition_details() check if the block device _is_available() v1: Make use of the resource and model arguments to have Partitions collection controller set a flag, so Partition model can inspect the flag and skip the check accordingly. v2: v1 solution is too hack, re-write the patch by refactoring the underlying disks model. Split the batch verification into small peices amortized by each concrete block device. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 6 +++++- src/kimchi/disks.py | 37 +++++++++++++++++++++++-------------- src/kimchi/model/host.py | 3 --- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index ad34919..ebf1bed 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -21,7 +21,7 @@ import cherrypy from kimchi.control.base import Collection, Resource, SimpleCollection from kimchi.control.utils import UrlSubNode, validate_method -from kimchi.exception import OperationFailed +from kimchi.exception import OperationFailed, NotFoundError from kimchi.template import render @@ -80,6 +80,7 @@ class Partitions(Collection): # sorted by their path def _get_resources(self, flag_filter): res_list = super(Partitions, self)._get_resources(flag_filter) + res_list = filter(lambda x: x.info['available'], res_list) res_list.sort(key=lambda x: x.info['path']) return res_list @@ -90,6 +91,9 @@ class Partition(Resource): @property def data(self): + if not self.info['available']: + raise NotFoundError("KCHPART0001E", {'name': self.info['name']}) + return self.info diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 842fd48..a13c753 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -142,7 +142,23 @@ def _get_vgname(devNodePath): return re.findall(r"LVM2_VG_NAME='([^\']*)'", out)[0] -def get_partitions_names(): +def _is_available(name, devtype, fstype, mountpoint, majmin): + devNodePath = _get_dev_node_path(majmin) + # Only list unmounted and unformated and leaf and (partition or disk) + # leaf means a partition, a disk has no partition, or a disk not held + # by any multipath device. Physical volume belongs to no volume group + # is also listed. Extended partitions should not be listed. + if (devtype in ['part', 'disk', 'mpath'] and + fstype in ['', 'LVM2_member'] and + mountpoint == "" and + _get_vgname(devNodePath) == "" and + _is_dev_leaf(devNodePath) and + not _is_dev_extended_partition(devtype, devNodePath)): + return True + return False + + +def get_partitions_names(check=False): names = set() keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT", "MAJ:MIN"] # output is on format key="value", @@ -151,26 +167,17 @@ def get_partitions_names(): # split()[0] to avoid the second part of the name, after the # whiteline name = dev['name'].split()[0] - devNodePath = _get_dev_node_path(dev['maj:min']) - # Only list unmounted and unformated and leaf and (partition or disk) - # leaf means a partition, a disk has no partition, or a disk not held - # by any multipath device. Physical volume belongs to no volume group - # is also listed. Extended partitions should not be listed. - if not (dev['type'] in ['part', 'disk', 'mpath'] and - dev['fstype'] in ['', 'LVM2_member'] and - dev['mountpoint'] == "" and - _get_vgname(devNodePath) == "" and - _is_dev_leaf(devNodePath) and - not _is_dev_extended_partition(dev['type'], devNodePath)): + if check and not _is_available(name, dev['type'], dev['fstype'], + dev['mountpoint'], dev['maj:min']): continue - names.add(name) return list(names) def get_partition_details(name): - dev_path = _get_dev_node_path(_get_dev_major_min(name)) + majmin = _get_dev_major_min(name) + dev_path = _get_dev_node_path(majmin) keys = ["TYPE", "FSTYPE", "SIZE", "MOUNTPOINT"] try: @@ -180,6 +187,8 @@ def get_partition_details(name): "Error getting partition info for %s: %s", name, e) return {} + dev['available'] = _is_available(name, dev['type'], dev['fstype'], + dev['mountpoint'], majmin) if dev['mountpoint']: # Sometimes the mountpoint comes with [SWAP] or other # info which is not an actual mount point. Filtering it diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 47b0aa1..e9ac487 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -245,9 +245,6 @@ class PartitionModel(object): pass def lookup(self, name): - if name not in disks.get_partitions_names(): - raise NotFoundError("KCHPART0001E", {'name': name}) - return disks.get_partition_details(name) -- 1.9.0

3 5

[PATCH 1/3] probe that libvirt support to change a live VM network source
by shaohef＠linux.vnet.ibm.com 09 May '14

09 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This is a good feature to user, but it is not supported by low version libvirt. So we need to probe it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 43 ++++++++++++++++++++++++++++++++++++++++++- src/kimchi/model/config.py | 3 +++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..6eb29f4 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -62,8 +62,25 @@ SIMPLE_VM_XML = """ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <devices> + %s + </devices> </domain>""" +SIMPLE_NETWORK_XML = """ +<network> + <name>%s</name> +</network> +""" + +VM_IFACE_XML = """ +<interface type='network'> + <mac address='52:54:00:12:34:56'/> + <source network='%s'/> + <model type='rtl8139'/> +</interface> +""" + SCSI_FC_XML = """ <pool type='scsi'> <name>TEST_SCSI_FC_POOL</name> @@ -196,7 +213,7 @@ class FeatureTests(object): rollback.prependDefer(FeatureTests.enable_screen_error_logging) conn = libvirt.open('qemu:///system') rollback.prependDefer(conn.close) - dom = conn.defineXML(SIMPLE_VM_XML) + dom = conn.defineXML(SIMPLE_VM_XML % "") rollback.prependDefer(dom.undefine) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, @@ -206,3 +223,27 @@ class FeatureTests(object): return True except libvirt.libvirtError: return False + + @staticmethod + def change_live_vm_network(): + with RollbackContext() as rollback: + FeatureTests.disable_screen_error_logging() + rollback.prependDefer(FeatureTests.enable_screen_error_logging) + conn = libvirt.open('qemu:///system') + rollback.prependDefer(conn.close) + net1_name = "isolated_test_net1" + net2_name = "isolated_test_net2" + net1 = conn.networkCreateXML(SIMPLE_NETWORK_XML % net1_name) + rollback.prependDefer(net1.destroy) + net2 = conn.networkCreateXML(SIMPLE_NETWORK_XML % net2_name) + rollback.prependDefer(net2.destroy) + iface1_xml = VM_IFACE_XML % net1_name + iface2_xml = VM_IFACE_XML % net2_name + dom = conn.createXML(SIMPLE_VM_XML % iface1_xml, flags=0) + rollback.prependDefer(dom.destroy) + try: + dom.updateDeviceFlags(iface2_xml, + libvirt.VIR_DOMAIN_AFFECT_LIVE) + return True + except libvirt.libvirtError: + return False diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index 0ef0855..88ab681 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -54,6 +54,7 @@ class CapabilitiesModel(object): self.libvirt_stream_protocols = [] self.fc_host_support = False self.metadata_support = False + self.change_live_vm_network = False # Subscribe function to set host capabilities to be run when cherrypy # server is up @@ -67,6 +68,8 @@ class CapabilitiesModel(object): self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe() self.fc_host_support = FeatureTests.libvirt_support_fc_host() self.metadata_support = FeatureTests.has_metadata_support() + self.change_live_vm_network = FeatureTests.change_live_vm_network() + self.libvirt_stream_protocols = [] for p in ['http', 'https', 'ftp', 'ftps', 'tftp']: -- 1.9.0

2 3

[PATCH] Issue #369: Fix config_dir assignment
by Aline Manera 09 May '14

09 May '14

From: Aline Manera <alinefm(a)br.ibm.com> In proxy.py, the config_dir was only initialized in a 'if' statement and used outside it. So if the SSL certificate and key were received as parameters, config_dir was undefined. Fix it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/proxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/proxy.py b/src/kimchi/proxy.py index 7a12bfd..1ccbbcc 100644 --- a/src/kimchi/proxy.py +++ b/src/kimchi/proxy.py @@ -57,9 +57,9 @@ def _create_proxy_config(p_port, k_port, p_ssl_port, cert, key): except KeyError: user_proxy = 'www-data' + config_dir = paths.conf_dir # No certificates specified by the user if not cert or not key: - config_dir = paths.conf_dir cert = '%s/kimchi-cert.pem' % config_dir key = '%s/kimchi-key.pem' % config_dir # create cert files if they don't exist -- 1.7.10.4

3 3

[PATCH v3] Correct the ID String of Disk Size in Template Edit Window
by Hongliang Wang 09 May '14

09 May '14

It was "version" instead of "disk". v2 -> v3: 3a) Corrected id string from CDROM (Aline's comment) v1 -> v2: 2a) Added for attribute for version text box (Sheldon's comment) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/pages/template-edit.html.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index f00e4fc..15ff25c 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -73,20 +73,20 @@ </div> <div> <div class="template-edit-wrapper-label"> - <label>$_("Disk (GB)")</label> + <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="disks" type="text" /> + <input id="template-edit-disk-textbox" name="disks" type="text" /> </div> </div> </fieldset> <fieldset class="template-edit-fieldset"> <div> <div class="template-edit-wrapper-label"> - <label>$_("CDROM")</label> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> </div> </div> <div> -- 1.8.1.4

3 2