May 2014 - Kimchi-devel - oVirt List Archives

[RFC] discover Kimchi peers
by Sheldon 08 Jul '14

08 Jul '14

I'd like to talk about how to discover Kimchi peers. Now I just talk about discover a peer in a same network here. I will use a local multicast subnetwork address <http://en.wikipedia.org/wiki/Multicast_address#Local_subnetwork> to find peers in one network. Choose 224.0.0.132 as the kimchi multicast address, and 8000 as the port. For cross network that need the router support multicast, so I give up discover a peer cross network. I will let user add the remote peers manully. In the whole system all peers are equal. There will not be a center discover service. We will define two kinds of multicast message Notify and Search. the format as follow. # ____________________________________________ # | head | message body | tail | # |___________________|_________________|______| # |sizeof(messageBody)| json message | EOL | # |___________________|_________________|______| the flow of discover Kimchi peers: 1. one host multicast a "search" message. in this message it tell himself information, and ask others tell their information. Like this: {"search": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this means "hello, I'm a kimchi host, this is my information, can you tell me who you are?" 2. others received a search will response an "notify" message. Like this: {"notify": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this tells others that "hi, I'm a kimchi host, I'm alive and this is my information" o (user) 1 is "search" /\ --------> 2 is "notify" | 1 _____ ________________ kimchi-host1 ------2-<---| DB |<----2-----|multicast listen |<--2-- | |____| |_______________| | ----------------------1-------------------------------> | | _____ |_____ | | | switch | | | |___________| o (user) | /\ --------- -----------------------------2----------------------- --->| | | _____ ________________ | kimchi-host3 ------1<---| DB |<---1------|multicast listen |<---1--| |____| |_______________| we need to discuss: 1. should we support beat heart? every kimchi host will send periodic notify to tell others himself information? 2. should we support a "quit" message? "quit" message tell other peers, that this kimchi quit normally. others can remove this from peers list. But the kimchi can not send "quit" when aborting abnormally. 3. Do we store the local peers information in DB? we can collection the local peers and send them immediately when user need to discover the peers. We will extend to support remote peers, these information need to be stored in DB. -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 8

[PATCH] Put focus on form's first field
by Crístian Viana 10 Jun '14

10 Jun '14

A good usability practice is to leave the focus on the first editable field on a form. That way, the user can start typing immediately what they want without having to use the mouse to click on the input element. Explicitely request focus to every form's first field. Some input elements did not have an ID; in those cases, the IDs were also added to the HTML code. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_add_main.js | 1 + ui/js/src/kimchi.guest_edit_main.js | 1 + ui/js/src/kimchi.report_add_main.js | 1 + ui/js/src/kimchi.repository_add_main.js | 1 + ui/js/src/kimchi.repository_edit_main.js | 1 + ui/js/src/kimchi.storagepool_add_main.js | 1 + ui/js/src/kimchi.template_edit_main.js | 2 ++ ui/pages/guest-add.html.tmpl | 2 +- ui/pages/repository-add.html.tmpl | 2 +- 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_add_main.js b/ui/js/src/kimchi.guest_add_main.js index 2113099..0a4f5e6 100644 --- a/ui/js/src/kimchi.guest_add_main.js +++ b/ui/js/src/kimchi.guest_add_main.js @@ -77,6 +77,7 @@ kimchi.guest_add_main = function() { $('#form-vm-add').on('submit', addGuest); $('#vm-doAdd').on('click', addGuest); + $('#guest-add-id-textbox').focus(); showTemplates(); }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 0236e2d..3588dcc 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -225,4 +225,5 @@ kimchi.guest_edit_main = function() { $(guestEditForm).on('submit', submitForm); $(saveButton).on('click', submitForm); + $('#guest-edit-id-textbox').focus(); }; diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 8759c2b..f7f1b4b 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -43,4 +43,5 @@ kimchi.report_add_main = function() { addReportForm.on('submit', submitForm); submitButton.on('click', submitForm); + nameTextbox.focus(); }; diff --git a/ui/js/src/kimchi.repository_add_main.js b/ui/js/src/kimchi.repository_add_main.js index 5dc84e5..4ee7a62 100644 --- a/ui/js/src/kimchi.repository_add_main.js +++ b/ui/js/src/kimchi.repository_add_main.js @@ -97,4 +97,5 @@ kimchi.repository_add_main = function() { }; $(addForm).on('submit', addRepository); + $('#repo_id').focus(); }; diff --git a/ui/js/src/kimchi.repository_edit_main.js b/ui/js/src/kimchi.repository_edit_main.js index 26d6c66..0b562ee 100644 --- a/ui/js/src/kimchi.repository_edit_main.js +++ b/ui/js/src/kimchi.repository_edit_main.js @@ -72,4 +72,5 @@ kimchi.repository_edit_main = function() { $(editForm).on('submit', editRepository); $(saveButton).on('click', editRepository); + $('#repository-edit-name-textbox').focus(); }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..d37a37d 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -20,6 +20,7 @@ kimchi.storagepool_add_main = function() { kimchi.initStorageAddPage(); $('#form-pool-add').on('submit', kimchi.addPool); $('#pool-doAdd').on('click', kimchi.addPool); + $('#poolId').focus(); }; kimchi.initStorageAddPage = function() { diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index f0f4718..a0e9e28 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -177,4 +177,6 @@ kimchi.template_edit_main = function() { kimchi.message.error(err.responseJSON.reason); }); }); + + $('#template-edit-id-textbox').focus(); }; diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index 84a1994..e478b2e 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -37,7 +37,7 @@ <p class="text-help"> $_("The name used to identify the virtual machine. If omitted, a name will be chosen based on the template used.") </p> - <input type="text" class="text" style="width: 300px" name="name"> + <input type="text" class="text" style="width: 300px" name="name" id="guest-add-id-textbox"> </div> </section> <section class="form-section"> diff --git a/ui/pages/repository-add.html.tmpl b/ui/pages/repository-add.html.tmpl index 05b4de9..9a8a037 100644 --- a/ui/pages/repository-add.html.tmpl +++ b/ui/pages/repository-add.html.tmpl @@ -39,7 +39,7 @@ $_("Single word, unique identifier for the repository.") </p> <div class="textbox-wrapper"> - <input type="text" class="text" name="repo_id" /> + <input type="text" class="text" name="repo_id" id="repo_id" /> </div> </div> </div> -- 1.9.0

2 2

[PATCHv2] Issue#348: Add loading icon when nfs mount is in progress
by lvroyce＠linux.vnet.ibm.com 10 Jun '14

10 Jun '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Improve feedback msg according to Hongliang's comments. Add loading icon to indicate nfs mount in progress, when error or normal response returns, close create window. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 2 ++ ui/pages/storagepool-add.html.tmpl | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..6b77bd8 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -198,6 +198,7 @@ kimchi.validateNfsForm = function () { kimchi.message.error.code('KCHPOOL6005E'); return false; } + $('#nfs-mount-loading').removeClass('hidden'); return true; }; @@ -295,6 +296,7 @@ kimchi.addPool = function(event) { kimchi.window.close(); }, function(err) { kimchi.message.error(err.responseJSON.reason); + kimchi.window.close(); }); } } diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..b033b36 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -91,6 +91,12 @@ </ul> </div> </div> + <div class="hidden" id="nfs-mount-loading"> + <p class="text-help"> + $_("Trying to mount NFS export path. It may take several seconds.") + <img src = "../images/theme-default/loading.gif" /> + </p> + </div> </div> </section> </div> -- 1.8.3.2

6 7

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

10 Jun '14

Finished align vlan fields. Redesigned the pattern of the label positions V3 -> V4: Address to Hongliang Wang: Assigned "for" attribute for label to associate it with text box accordingly 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 | 34 +++++++++++++++++++++------------- 3 files changed, 41 insertions(+), 22 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..aedf7e8 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -46,7 +46,7 @@ <div class="section-container"> <div class="section-header">1. $_("Network Name")</div> <div class="section-content"> - <input type="text" id="networkName"> + <input type="text" id="networkName" /> <div class="input-hint"> <span class="ui-icon ui-icon-info input-hint-icon"></span> <span class="input-hint-text">$_("Alphanumeric and '_' characters only.")</span> @@ -57,27 +57,35 @@ <div class="section-header">2. $_("Network Type")</div> <div class="section-content"> <div class="input-container"> - <input type="radio" id="networkTypeIso" name="networkType" value="isolated"> + <input type="radio" id="networkTypeIso" name="networkType" value="isolated" /> <label for="networkTypeIso">$_("Isolated: no physical network connection")</label> </div> <div class="input-container"> - <input type="radio" id="networkTypeNat" name="networkType" value="nat"> + <input type="radio" id="networkTypeNat" name="networkType" value="nat" /> <label for="networkTypeNat">$_("NAT: outbound physical network connection only")</label> </div> <div class="input-container"> - <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> + <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 for="networkVlanID" id="labelNetworkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled /> + </div> </div> </div> </div> -- 1.9.1

6 15

[PATCH 1/2] List iSCSI server for initiator while creating iSCSI Pool
by shaohef＠linux.vnet.ibm.com 09 Jun '14

09 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> The server should be already used in an existed iSCSI Pool. Test this patch by: $ curl -k -u shhfeng:123456 -H "Content-Type: application/json" \ > -H "Accept: application/json" \ > http://localhost:8000/storageservers?_target_type=iscsi [ { "host":"127.0.0.1" } ] Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- src/kimchi/model/storagepools.py | 4 +++- src/kimchi/model/storageservers.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 76c94ab..05a5866 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -416,7 +416,7 @@ "_target_type": { "description": "List storage servers of given type", "type": "string", - "pattern": "^netfs$" + "pattern": "^netfs|iscsi$" } }, "additionalProperties": false, diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index c0f2c58..c699fc6 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -37,9 +37,11 @@ POOL_STATE_MAP = {0: 'inactive', 4: 'inaccessible'} # Types of pools supported -# FIXME: Addd 'iscsi' STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', 'path': '/pool/source/dir/@path'}, + 'iscsi': {'addr': '/pool/source/host/@name', + 'port': '/pool/source/host/@port', + 'path': '/pool/source/device/@path'}, 'scsi': {'adapter_type': '/pool/source/adapter/@type', 'adapter_name': '/pool/source/adapter/@name', 'wwnn': '/pool/source/adapter/@wwnn', diff --git a/src/kimchi/model/storageservers.py b/src/kimchi/model/storageservers.py index c9dfb25..6259b92 100644 --- a/src/kimchi/model/storageservers.py +++ b/src/kimchi/model/storageservers.py @@ -21,8 +21,7 @@ from kimchi.exception import NotFoundError from kimchi.model.storagepools import StoragePoolModel, StoragePoolsModel # Types of remote storage servers supported -# FIXME: Add iscsi? -STORAGE_SERVERS = ['netfs'] +STORAGE_SERVERS = ['netfs', 'iscsi'] class StorageServersModel(object): -- 1.9.3

4 5

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

09 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3: change "enable-plugins" to "enable-sample" remove nls improve the Portuguese translation. 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 (6): Update root.py to make Cheetah render the JSON template. Update the i18n tmpl to produce JSON Add JS API for fetching i18n JSON Issue #342: load i18n.html of the plugin add an optional to toggle the sample plugin generate the translation files for plugins/sample Zhou Zheng Sheng (1): Add Minimal UI Page for the Sample Plugin configure.ac | 11 +++ plugins/sample/Makefile.am | 26 ++++- 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 | 8 +- 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, 367 insertions(+), 211 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

2 8

[PATCH] Adjust Guest Edit Storage Tab Styles
by Hongliang Wang 06 Jun '14

06 Jun '14

Keep consistent with interface setup tab. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 92 ++++++++++--------------------------- ui/js/src/kimchi.guest_edit_main.js | 23 ++++++++-- ui/pages/guest-edit.html.tmpl | 39 ++++++++-------- 3 files changed, 63 insertions(+), 91 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 36f7f75..52c53eb 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -89,74 +89,7 @@ width: 400px; } -.guest-edit-cdrom-button { - background: url("../images/theme-default/guest-icon-sprite.png") no-repeat left top transparent; - border: none; - height: 25px; - vertical-align: middle; - width: 25px; -} - -.guest-edit-cdrom-button.attach { - margin: 15px 0 0 521px; -} - -.guest-edit-cdrom-button.attach:hover { - background-position: 0 -27px; -} - -.guest-edit-cdrom-button.attach:focus { - background-position: 0 -54px; -} - -.guest-edit-cdrom-button.attach:active { - background-position: 0 -81px; -} - -.guest-edit-cdrom-button.attach[disabled] { - background-position: 0 -108px; -} - -.guest-edit-cdrom-button.replace { - background-position: -27px 0; -} - -.guest-edit-cdrom-button.replace:hover { - background-position: -27px -27px; -} - -.guest-edit-cdrom-button.replace:focus { - background-position: -27px -54px; -} - -.guest-edit-cdrom-button.replace:active { - background-position: -27px -81px; -} - -.guest-edit-cdrom-button.replace[disabled] { - background-position: -27px -108px; -} - -.guest-edit-cdrom-button.detach { - background-position: -54px 0; -} - -.guest-edit-cdrom-button.detach:hover { - background-position: -54px -27px; -} - -.guest-edit-cdrom-button.detach:focus { - background-position: -54px -54px; -} - -.guest-edit-cdrom-button.detach:active { - background-position: -54px -81px; -} - -.guest-edit-cdrom-button.detach[disabled] { - background-position: -54px -108px; -} - +#form-guest-edit-storage .header, .guest-edit-interface .header { margin-bottom: 8px; padding-bottom: 2px; @@ -165,33 +98,56 @@ overflow: hidden; } +#form-guest-edit-storage .body .item, .guest-edit-interface .body .item { margin: 5px 0; } +#form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; width: 250px; } +#form-guest-edit-storage .cell.dev { + width: 60px; +} + +#form-guest-edit-storage .cell.path { + width: 440px; +} + +#form-guest-edit-storage .cell.path input { + box-sizing: border-box; + width: 100%; +} + .guest-edit-interface .body select { width: 180px; padding: 0px; } +#form-guest-edit-storage .action-area, .guest-edit-interface .action-area { float: right; } +#form-guest-edit-storage .action-area { + line-height: 24px; +} + +#form-guest-edit-storage button, .guest-edit-interface button { width: 20px; height: 20px; } +#form-guest-edit-storage .header button, .guest-edit-interface .header button { margin-bottom: 1px; } +#form-guest-edit-storage .body button:not(:last-child), .guest-edit-interface .body button:not(:last-child) { margin-right: 2px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 0236e2d..ba5fef5 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -36,7 +36,7 @@ kimchi.guest_edit_main = function() { kimchi.listVMStorages({ vm: kimchi.selectedGuest }, function(storages) { - var container = $('#guest-edit-cdrom-row-container'); + var container = $('#form-guest-edit-storage .body'); $(container).empty(); $.each(storages, function(index, storage) { @@ -53,9 +53,19 @@ kimchi.guest_edit_main = function() { }; $('input[type="text"][name="cdrom"]', container).on('click', replaceCDROM); - $('.replace', container).on('click', replaceCDROM); + $('.replace', container).button({ + icons: { + primary: 'ui-icon-pencil' + }, + text: false + }).click(replaceCDROM); - $('.detach', container).on('click', function(e) { + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }).click(function(e) { e.preventDefault(); var settings = { title : i18n['KCHAPI6004M'], @@ -172,7 +182,12 @@ kimchi.guest_edit_main = function() { refreshCDROMs(); - $('#guest-edit-attach-cdrom-button').on('click', function(event) { + $('#guest-edit-attach-cdrom-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false + }).click(function(event) { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 96d907e..3b7291a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -94,15 +94,12 @@ </fieldset> </form> <form id="form-guest-edit-storage"> - <fieldset class="guest-edit-fieldset"> - <div id="guest-edit-cdrom-row-container" class="guest-edit-cdrom-row-container"></div> - <div> - <button id="guest-edit-attach-cdrom-button" - class="guest-edit-cdrom-button attach" - title='$_("Attach")'> - </button> - </div> - </fieldset> + <div class="header"> + <span class="cell">$_("Device")</span> + <span class="cell">$_("Path")</span> + <button id="guest-edit-attach-cdrom-button" class="action-area attach"></button> + </div> + <div class="body"></div> </form> <form id="form-guest-edit-interface" class="guest-edit-interface"> <div class="header"> @@ -123,14 +120,16 @@ </footer> </div> <script id="cdrom-row-tmpl" type="text/html"> - <div> - <div class="guest-edit-wrapper-label"> + <div class="item" id="cdrom-{dev}"> + <span class="cell dev"> <label for="cdrom-{dev}">{dev}</label> - </div> - <div class="guest-edit-wrapper-controls"> + </span> + <span class="cell path"> <input id="cdrom-{dev}" name="cdrom" type="text" data-vm="{vm}" data-dev="{dev}" value="{path}" readonly="readonly" /> + </span> + <span class="action-area"> <button class="guest-edit-cdrom-button replace" data-vm="{vm}" data-dev="{dev}" title='$_("Replace")'> @@ -139,7 +138,7 @@ data-vm="{vm}" data-dev="{dev}" title='$_("Detach")'> </button> - </div> + </span> </div> </script> <script id="interface-tmpl" type="text/html"> @@ -160,19 +159,21 @@ <div> </script> <script id="disk-row-tmpl" type="text/html"> - <div> - <div class="guest-edit-wrapper-label"> + <div class="item" id="cdrom-{dev}"> + <span class="cell dev"> <label for="disk-{dev}">{dev}</label> - </div> - <div class="guest-edit-wrapper-controls"> + </span> + <span class="cell path"> <input id="disk-{dev}" name="disk" type="text" data-vm="{vm}" data-dev="{dev}" value="{path}" readonly="readonly" /> + </span> + <span class="action-area"> <button class="guest-edit-cdrom-button detach" data-vm="{vm}" data-dev="{dev}" title="$_("Detach")"> </button> - </div> + </span> </div> </script> <script type="text/javascript"> -- 1.8.1.4

2 5

[PATCH v2 0/8] Debug Report Rename Feature
by Hongliang Wang 06 Jun '14

06 Jun '14

Enable debug report rename feature in this patch set. v1 -> v2: 2a) Retrieved the Right Generated Time for Debug Report (Wen Wang's comment) 2b) Sorted debug reports by Generated Time Descendingly (Wen Wang's comment) 2c) Enabled Form Fields after Request Processed (Yuxin's comment) Hongliang Wang (8): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report: Use Generated Time instead of Most Changed Time Debug Report: Sort Reports by Generated Time Descendingly 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 | 8 ++++- src/kimchi/model/debugreports.py | 15 +++++++++- 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 | 41 ++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 ++++++++++++++++++++++++++++++++++ 9 files changed, 175 insertions(+), 2 deletions(-) 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

5 22

[PATCH v2] Insert loading icon in Storage tab
by Daniel Barboza 05 Jun '14

05 Jun '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Due to the timeout period to see if the NFS pool is online, the Storage tab may look irresponsible and the user might believe that the UI/kimchi is frozen. Inserting the loading icon+text in this tab to show that the UI is responsive, just waiting for an answer from the server. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 ++ ui/pages/tabs/storage.html.tmpl | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6052510..74e6892 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -17,6 +17,7 @@ */ kimchi.doListStoragePools = function() { kimchi.listStoragePools(function(result) { + $('#storagepoolsLoading').addClass('hidden'); var storageHtml = $('#storageTmpl').html(); if (result && result.length) { var listHtml = ''; @@ -34,6 +35,7 @@ kimchi.doListStoragePools = function() { $('#storagepoolsList').html(''); } }, function(err) { + $('#storagepoolsLoading').addClass('hidden'); kimchi.message.error(err.responseJSON.reason); }); diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index c3a992e..e837599 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -40,7 +40,13 @@ <li class="title-actions">$_("Actions")</li> </div> <ul id="storagepoolsList" class="list-storage empty-when-logged-off"></ul> -</div> + <div id="storagepoolsLoading"> + <div class="grid-loading"> + <div class="grid-loading-icon"></div> + <div class="grid-loading-text">$_("loading")</div> + </div> + </div> + </div> <script id="storageTmpl" type="html/text"> <li id="{name}"> <div class="storage-li in" data-name="{name}" data-stat="{state}"> -- 1.8.3.1

3 3

[PATCH] bug fix: decode volume name in IsoVolumesModel.
by shaohef＠linux.vnet.ibm.com 05 Jun '14

05 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> commit c53b3eab just fix volume name in StorageVolumeModel. reproduce this bug: 1. create a iso pool 2. put a iso with name αβγ.iso in it Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index d58fd0b..fd7e24d 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -239,7 +239,7 @@ class IsoVolumesModel(object): continue for volume in volumes: - res = self.storagevolume.lookup(pool_name, volume) + res = self.storagevolume.lookup(pool_name, volume.decode("utf-8")) if res['format'] == 'iso': res['name'] = '%s' % volume iso_volumes.append(res) -- 1.9.3

2 1

[PATCH 0/3] Update button labels
by Crístian Viana 05 Jun '14

05 Jun '14

Crístian Viana (3): Add missing closing quote in HTML code Use the verb "Create" in all create operations Use action verb as the main button's label po/en_US.po | 11 ++++------- po/kimchi.pot | 7 ++----- po/pt_BR.po | 11 ++++------- po/zh_CN.po | 11 ++++------- ui/js/src/kimchi.guest_edit_main.js | 8 ++++---- ui/js/src/kimchi.repository_edit_main.js | 6 +++--- ui/js/src/kimchi.template_edit_main.js | 2 +- ui/pages/guest-edit.html.tmpl | 4 ++-- ui/pages/repository-edit.html.tmpl | 4 ++-- ui/pages/storagepool-add.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 2 +- 12 files changed, 29 insertions(+), 41 deletions(-) -- 1.9.0

4 8

[PATCH] use LibvirtConnection instead of libivrt open directily to to get connection
by shaohef＠linux.vnet.ibm.com 05 Jun '14

05 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> On my F20, the kimchi can not start. It report: $ 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 Now use LibvirtConnection to get connection, kimchi can work well. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..df833e1 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -28,6 +28,7 @@ from lxml.builder import E +from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log @@ -104,7 +105,7 @@ def libvirt_supports_iso_stream(protocol): conn = None try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = LibvirtConnection('qemu:///system').get() dom = conn.defineXML(xml) dom.undefine() return True @@ -122,7 +123,7 @@ def _get_xml(): xml = ET.tostring(obj) return xml try: - conn = libvirt.open('qemu:///system') + conn = LibvirtConnection('qemu:///system').get() FeatureTests.disable_screen_error_logging() conn.findStoragePoolSources('netfs', _get_xml(), 0) except libvirt.libvirtError as e: @@ -174,7 +175,7 @@ def qemu_iso_stream_dns(): def libvirt_support_fc_host(): try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = LibvirtConnection('qemu:///system').get() pool = None pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) except libvirt.libvirtError as e: @@ -194,7 +195,7 @@ def has_metadata_support(): with RollbackContext() as rollback: FeatureTests.disable_screen_error_logging() rollback.prependDefer(FeatureTests.enable_screen_error_logging) - conn = libvirt.open('qemu:///system') + conn = LibvirtConnection('qemu:///system').get() rollback.prependDefer(conn.close) dom = conn.defineXML(SIMPLE_VM_XML) rollback.prependDefer(dom.undefine) -- 1.9.0

5 4

[PATCH] novnc does not work in IE
by Adam King 05 Jun '14

05 Jun '14

vnc_auto.html has 2 meta tags for X-UA-Compatible preventing the IE mode from taking effect. Combine them so they are both effective. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/pages/vnc_auto.html.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/pages/vnc_auto.html.tmpl b/ui/pages/vnc_auto.html.tmpl index f295019..bd96d60 100644 --- a/ui/pages/vnc_auto.html.tmpl +++ b/ui/pages/vnc_auto.html.tmpl @@ -12,8 +12,7 @@ --> <head> <title>noVNC</title> - <meta http-equiv="X-UA-Compatible" content="chrome=1"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta http-equiv="X-UA-Compatible" content="chrome=1, IE=Edge"> <link rel="stylesheet" href="$href("/css/novnc/base.css")" title="plain"> <script type='text/javascript'> var INCLUDE_URI = "/js/novnc/"; -- 1.9.0

4 4

[PATCH] Code Refector: Extract Variables in kimchi.login_window.js
by Hongliang Wang 05 Jun '14

05 Jun '14

1. Refactor code. 2. Put focus on log-in button instead of password box when browser automatically fill in log-in form. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.login_window.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.login_window.js b/ui/js/src/kimchi.login_window.js index 9c06a50..c562159 100644 --- a/ui/js/src/kimchi.login_window.js +++ b/ui/js/src/kimchi.login_window.js @@ -50,6 +50,9 @@ kimchi.login_main = function() { return true; }; + var userNameBox = $('#username'); + var passwordBox = $('#password'); + var loginButton = $('#btn-login'); var placeCursor = function(id) { if (id && $('#' + id).size() > 0) { $('#' + id).focus(); @@ -57,10 +60,10 @@ kimchi.login_main = function() { } var userName = kimchi.user.getUserName(); - userName && $('#username').val(userName); + userName && !userNameBox.val() && userNameBox.val(userName); + var password = passwordBox.val(); - var nodeToFocus = ! $('#username').val() ? $('#username') : - (! $('#password').val() ? $('#password') : $('#btn-login')); + var nodeToFocus = !userName ? userNameBox : !password ? passwordBox : loginButton; $(nodeToFocus).focus(); }; @@ -71,13 +74,13 @@ kimchi.login_main = function() { return false; } - $('#btn-login').text(i18n['KCHAUTH6002M']).prop('disabled', true); + loginButton.text(i18n['KCHAUTH6002M']).prop('disabled', true); - var userName = $('#username').val(); + var userName = userNameBox.val(); userName && kimchi.user.setUserName(userName); var settings = { username: userName, - password: $("#password").val() + password: passwordBox.val() }; kimchi.login(settings, function() { @@ -121,5 +124,5 @@ kimchi.login_main = function() { $('#form-login').on('submit', login); - placeCursor(); + setTimeout(placeCursor, 0); }; -- 1.8.1.4

2 1

[PATCH] Disable metadata log output in every guest refresh
by Crístian Viana 05 Jun '14

05 Jun '14

The libvirt function "metadata" always displays an error message when the VM does not have a metadata section in its XML descriptor. Kimchi refreshes the VM information every few seconds and a lot of error output is printed on the console. The real exception can still be logged by the "try/except" block, so the error itself is not being silenced, only its output. Even though this patch has no relation to feature tests, the functions which enable/disable the libvirt error messages are located inside the class FeatureTests so we need to import them. Silence the metadata error output when trying to read the metadata information from a VM. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index a94c7f8..c9ab1d4 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -19,6 +19,7 @@ import re from kimchi.exception import OperationFailed +from kimchi.featuretests import FeatureTests from kimchi.model.config import CapabilitiesModel import libvirt from lxml import etree @@ -84,6 +85,7 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): + FeatureTests.disable_screen_error_logging() try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -91,6 +93,8 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): return etree.fromstring(xml) except libvirt.libvirtError: return None + finally: + FeatureTests.enable_screen_error_logging() def set_metadata_node(dom, node, mode="all"): -- 1.9.0

3 2

[PATCH] Repository Grid Column Resizing Issue
by Hongliang Wang 05 Jun '14

05 Jun '14

Last commit was reverted because it failed for Ubuntu system. Added it back and made it work for Ubuntu with this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 24 ++++++++++++++++++++++++ ui/js/src/kimchi.host.js | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 6a1a308..dc7fccf 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -258,4 +258,28 @@ height: 200px; width: 850px; } + +.host-panel #repositories-grid .repository-id { + width: 120px; +} + +.host-panel #repositories-grid .repository-name { + width: 640px; +} + +.host-panel #repositories-grid .repository-enabled { + width: 92px; +} + +.host-panel #repositories-grid .repository-baseurl.deb { + width: 400px; +} + +.host-panel #repositories-grid .repository-enabled.deb { + width: 100px; +} + +.host-panel #repositories-grid .repository-gpgcheck.deb { + width: 150px; +} /* End of Repository */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 4c94fc1..3b0adec 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -47,19 +47,19 @@ kimchi.host_main = function() { name: 'baseurl', label: i18n['KCHREPO6006M'], makeTitle: true, - 'class': 'repository-baseurl' + 'class': 'repository-baseurl deb' }, { name: 'enabled', label: i18n['KCHREPO6009M'], - 'class': 'repository-enabled' + 'class': 'repository-enabled deb' }, { name: 'config[dist]', label: "dist", - 'class': 'repository-gpgcheck' + 'class': 'repository-gpgcheck deb' }, { name: 'config[comps]', label: "comps", - 'class': 'repository-gpgcheck' + 'class': 'repository-gpgcheck deb' }]; } else { -- 1.8.1.4

2 1

[PATCH] Issue #100: do not delete the VM when storage volume not found
by shaohef＠linux.vnet.ibm.com 05 Jun '14

05 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> The VM may not be in a certain pool for some reasons. Or the pool may not be active for some reasons. We do not allow to delete this VM in this case. And report the detail message to user. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 17bda04..3201fdd 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -426,14 +426,25 @@ class VMModel(object): if info['state'] == 'running': self.poweroff(name) + vols = [] + for path in paths: + try: + vols.append(conn.storageVolLookupByPath(path)) + except libvirt.libvirtError as e: + if e.get_error_code() == libvirt.VIR_ERR_NO_STORAGE_VOL: + raise OperationFailed( + "KCHVM0021E", + {'name': name, 'err': e.get_error_message()}) + else: + raise + try: dom.undefine() except libvirt.libvirtError as e: raise OperationFailed("KCHVM0021E", {'name': name, 'err': e.get_error_message()}) - for path in paths: - vol = conn.storageVolLookupByPath(path) + for vol in vols: pool = vol.storagePoolLookupByVolume() xml = pool.XMLDesc(0) pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] -- 1.9.0

2 1

[PATCH] Fix Text Truncated Problem of Login Button
by Hongliang Wang 03 Jun '14

03 Jun '14

Long text in some languages of login button is truncated. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/login-window.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css index 8a21090..f4ad5f8 100644 --- a/ui/css/theme-default/login-window.css +++ b/ui/css/theme-default/login-window.css @@ -69,7 +69,7 @@ #login-window .login-panel button { font-size: 18px; height: 40px; - width: 160px; + min-width: 160px; float: right; } -- 1.8.1.4

4 3

[PATCH v2] Fix text alignment on storage pool type combo boxes
by Crístian Viana 03 Jun '14

03 Jun '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. The SCSI device list on the same window has the same alignment problem. Apply a common CSS class to the combo boxes so they look 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..ba85e6e 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> @@ -142,7 +142,7 @@ <div class="storage-type-wrapper-controls"> <div id="scsiAdapter"> <input type="hidden"/> - <span></span><span class="arrow"></span> + <span class="text"></span><span class="arrow"></span> <div><ul></ul></div> </div> </div> -- 1.9.0

4 3

[PATCH] Remove button "Cancel" from modal dialog
by Crístian Viana 03 Jun '14

03 Jun '14

Only one of the modal dialogs in Kimchi has a "Cancel" button along with the form submit button. That button layout is inconsistent with the rest of the application and it provides the same functionality as the "X" button present at the top of every dialog. Remove the button "Cancel" from the dialog "Edit template". Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 4 ---- ui/pages/template-edit.html.tmpl | 1 - 2 files changed, 5 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index f0f4718..9ff8bcc 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -104,10 +104,6 @@ kimchi.template_edit_main = function() { }); }); - $('#tmpl-edit-button-cancel').on('click', function() { - kimchi.window.close(); - }); - $('#template-edit-storagePool').change(function() { storagepool = $(this).val(); var storageArray = storagepool.split("/"); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 434d938..8a4f0e4 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -141,7 +141,6 @@ </div> <footer> <div class="btn-group"> - <a id="tmpl-edit-button-cancel" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Cancel")</span></a> <a id="tmpl-edit-button-save" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Save")</span></a> </div> </footer> -- 1.9.0

4 4

[PATCH v2] Update README with the correct FF ESR version.
by Adam King 03 Jun '14

03 Jun '14

The README should indicate that Kimchi now supports FF 24 ESR which was released late in 2013. 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

5 4

[PATCH v2] VM template: add disk size error message
by Zhou Zheng Sheng 03 Jun '14

03 Jun '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. How to trigger this bug: 1. In Web UI, create a template as usual. 2. Edit the template, define the disk size as 0.5. v2: v1 adds the error to "disks", but the error is not raised against it. v2 correctly adds the error message to the "size" constraint. 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..76c94ab 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -379,7 +379,8 @@ "size": { "description": "Size (GB) of the disk", "type": "number", - "minimum": 1 + "minimum": 1, + "error": "KCHTMPL0022E" } } }, @@ -549,7 +550,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..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

3 3

[PATCH] UI: Fix VM Delete Confirmation Dialog Box Title
by Zhou Zheng Sheng 03 Jun '14

03 Jun '14

Previously it was 'Power off Confirmation', this patch changes it to 'VM Delete Confirmation'. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 2 +- ui/pages/i18n.html.tmpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 510e7f9..ea36d62 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -108,7 +108,7 @@ kimchi.vmdelete = function(event) { var vm = $(this).closest('li[name=guest]'); var vm_id=vm.attr("id"); var settings = { - title : i18n['KCHVM6002M'], + title : i18n['KCHVM6008M'], content : i18n['KCHVM6001M'], confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 98da828..7194792 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -134,6 +134,7 @@ var i18n = { " the guest OS shutdown. Would you like to continue?")", 'KCHVM6006M': "$_("Shut Down Confirmation")", 'KCHVM6007M': "$_("Note the guest OS may ignore this request. Would you like to continue?")", + 'KCHVM6008M': "$_("VM Delete Confirmation")", 'KCHVMCD6001M': "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", 'KCHVMCD6002M': "$_("Attach")", -- 1.9.0

5 4

[PATCH] adjust the width of host info-container
by shaohef＠linux.vnet.ibm.com 03 Jun '14

03 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> the layout is wrong in firefox, fix it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 6a1a308..ed28d25 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -117,7 +117,7 @@ .host-panel .info-container { padding-top: 16px; - width: 892px; + width: 890px; } .host-panel .section-header { -- 1.9.0

2 1

[PATCH] Exception: fix exception details when not specified
by lvroyce＠linux.vnet.ibm.com 03 Jun '14

03 Jun '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> 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: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/control/utils.py | 6 ++++-- src/kimchi/exception.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kimchi/control/utils.py b/src/kimchi/control/utils.py index 5e63816..a67f627 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(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): -- 1.8.3.2

5 7

[PATCH] Remove unused listDeepScanIsos function
by Rodrigo Trujillo 03 Jun '14

03 Jun '14

The function listDeepScanIsos is not being used in the Kimchi code. It was replaced by stepListDeepScanIsos. --- ui/js/src/kimchi.api.js | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 7d85fdf..5f3bf00 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -481,30 +481,6 @@ var kimchi = { return deepScanHandler; }, - listDeepScanIsos : function(suc, err) { - var isoPool = 'iso' + new Date().getTime(); - kimchi.createStoragePool({ - name : isoPool, - type : 'kimchi-iso', - path : '/' - }, function(result) { - var taskId = result.task_id; - function monitorTask() { - kimchi.getTask(taskId, function(result) { - var status = result.status; - if (status === "finished") { - kimchi.listStorageVolumes(isoPool, suc, err); - } else if (status === "running") { - setTimeout(monitorTask, 50); - } else if (status === "failed") { - err(result.message); - } - }, err); - } - monitorTask(); - }, err); - }, - getTask : function(taskId, suc, err) { kimchi.requestJSON({ url : kimchi.url + 'tasks/' + encodeURIComponent(taskId), -- 1.9.0

5 4

[PATCH] Rename kimchi.template to kimchi.substitute
by Hongliang Wang 03 Jun '14

03 Jun '14

This function was designed to substitute variables in HTML template strings originally so it was named as kimchi.template, and it can be used in other scenarios, e.g. we use it when we load plugins we have a unified URL for plugin XML files: /plugins/{plugin}/ui/config/tab-ext.xml and after we have the plugins list, we can easily generate the corresponding URLs like /plugins/pluginA/ui/config/tab-ext.xml, /plugins/pluginB/ui/config/tab-ext.xml. by list ['pluginA', 'pluginB']. Though it is sometimes misunderstood to be related with VM templates. Renamed it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.guest_add_main.js | 2 +- ui/js/src/kimchi.guest_edit_main.js | 4 +-- ui/js/src/kimchi.guest_media_main.js | 2 +- ui/js/src/kimchi.host.js | 2 +- ui/js/src/kimchi.main.js | 2 +- ui/js/src/kimchi.network.js | 2 +- ui/js/src/kimchi.storage_main.js | 4 +-- ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/js/src/kimchi.substitute.js | 45 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.template.js | 45 -------------------------------- ui/js/src/kimchi.template_add_main.js | 4 +-- ui/js/src/kimchi.template_edit_main.js | 2 +- ui/js/src/kimchi.template_main.js | 2 +- 14 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 ui/js/src/kimchi.substitute.js delete mode 100644 ui/js/src/kimchi.template.js diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 055f487..2c70969 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -375,7 +375,7 @@ kimchi.widget.Grid.prototype = (function() { var container = $('#' + containerID); var gridID = this['opts']['id']; var rowSelection = this['opts']['rowSelection'] || 'single'; - var domNode = $(kimchi.template(htmlStr, { + var domNode = $(kimchi.substitute(htmlStr, { id: gridID, loading: i18n['KCHGRD6001M'], message: i18n['KCHGRD6002M'], diff --git a/ui/js/src/kimchi.guest_add_main.js b/ui/js/src/kimchi.guest_add_main.js index 2113099..eefd59a 100644 --- a/ui/js/src/kimchi.guest_add_main.js +++ b/ui/js/src/kimchi.guest_add_main.js @@ -25,7 +25,7 @@ kimchi.guest_add_main = function() { var html = ''; var tmpl = $('#tmpl-template').html(); $.each(result, function(index, value) { - html += kimchi.template(tmpl, value); + html += kimchi.substitute(tmpl, value); }); $('#templateTile').html(html); return; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 0236e2d..90dcb32 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -42,7 +42,7 @@ kimchi.guest_edit_main = function() { $.each(storages, function(index, storage) { storage['vm'] = kimchi.selectedGuest; rowHTML = $('#' + storage['type'] + '-row-tmpl').html(); - var templated = kimchi.template(rowHTML, storage); + var templated = kimchi.substitute(rowHTML, storage); container.append(templated); }); @@ -96,7 +96,7 @@ kimchi.guest_edit_main = function() { $(".action-area", item).toggleClass("hide"); }; var addItem = function(data) { - var itemNode = $.parseHTML(kimchi.template($('#interface-tmpl').html(),data)); + var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); $(".body", "#form-guest-edit-interface").append(itemNode); $("select", itemNode).append(networkOptions); if(data.network!==""){ diff --git a/ui/js/src/kimchi.guest_media_main.js b/ui/js/src/kimchi.guest_media_main.js index 02009ec..d6dee2e 100644 --- a/ui/js/src/kimchi.guest_media_main.js +++ b/ui/js/src/kimchi.guest_media_main.js @@ -28,7 +28,7 @@ kimchi.guest_media_main = function() { $.each(storages, function(index, storage) { storage['vm'] = kimchi.selectedGuest; - var templated = kimchi.template(rowHTML, storage); + var templated = kimchi.substitute(rowHTML, storage); container.append(templated); }); diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 4c94fc1..ee59a7e 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -485,7 +485,7 @@ kimchi.host_main = function() { data['memory'] = kimchi.formatMeasurement(data['memory'], { fixed: 2 }); - var templated = kimchi.template(htmlTmpl, data); + var templated = kimchi.substitute(htmlTmpl, data); $('#host-content-container').html(templated); initPage(); diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 86fed5b..184029d 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -69,7 +69,7 @@ kimchi.main = function() { var tabs = retrieveTabs(tabConfigUrl); kimchi.listPlugins(function(plugins) { $(plugins).each(function(i, p) { - var url = kimchi.template(pluginConfigUrl, { + var url = kimchi.substitute(pluginConfigUrl, { plugin: p }); tabs.push.apply(tabs, retrieveTabs(url)); diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ca6d29b..875bc08 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -63,7 +63,7 @@ kimchi.getNetworkItemHtml = function(network) { } var disable_in_use = network.in_use ? "ui-state-disabled" : ""; - var networkItem = kimchi.template($('#networkItem').html(), { + var networkItem = kimchi.substitute($('#networkItem').html(), { name : network.name, state : network.state, type : network.type, diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6052510..1493124 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -25,7 +25,7 @@ kimchi.doListStoragePools = function() { value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocated = kimchi.changetoProperUnit(value.allocated,1); if ('kimchi-iso' !== value.type) { - listHtml += kimchi.template(storageHtml, value); + listHtml += kimchi.substitute(storageHtml, value); } }); $('#storagepoolsList').html(listHtml); @@ -172,7 +172,7 @@ kimchi.doListVolumes = function(poolObj) { value.poolname = poolObj.data('name'); value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocation = kimchi.changetoProperUnit(value.allocation,1); - listHtml += kimchi.template(volumeHtml, value); + listHtml += kimchi.substitute(volumeHtml, value); }); volumeDiv.html(listHtml); } else { diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..050aa90 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -30,7 +30,7 @@ kimchi.initStorageAddPage = function() { valid_types = ['part', 'disk', 'mpath']; $.each(data, function(index, value) { if (valid_types.indexOf(value.type) != -1) { - listHtml += kimchi.template(deviceHtml, value); + listHtml += kimchi.substitute(deviceHtml, value); } }); $('.host-partition').html(listHtml); diff --git a/ui/js/src/kimchi.substitute.js b/ui/js/src/kimchi.substitute.js new file mode 100644 index 0000000..27ca8ed --- /dev/null +++ b/ui/js/src/kimchi.substitute.js @@ -0,0 +1,45 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * 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. + */ +kimchi.substitute = function(templatedStr, data, tag) { + tag = tag || /\{([^\}]+)\}/g; + + var escapeHtml = function(html) { + return String(html) + .replace(/&/g, '&') + .replace(/</g, '<') + .replace(/>/g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + }; + + return templatedStr.replace(tag, function(matchResult, express) { + var propertyArray = express.split('!'); + var defaultValue = propertyArray[1] || ''; + propertyArray = propertyArray[0].split('.'); + var value = data, i = 0, l = propertyArray.length, property; + for (; i < l; i++) { + property = propertyArray[i]; + if (value) { + value = value[property]; + } else { + break; + } + } + return escapeHtml((value || value === 0) ? value : defaultValue); + }); +}; diff --git a/ui/js/src/kimchi.template.js b/ui/js/src/kimchi.template.js deleted file mode 100644 index 082269f..0000000 --- a/ui/js/src/kimchi.template.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Project Kimchi - * - * Copyright IBM, Corp. 2013 - * - * 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. - */ -kimchi.template = function(templateStr, data, tag) { - tag = tag || /\{([^\}]+)\}/g; - - var escapeHtml = function(html) { - return String(html) - .replace(/&/g, '&') - .replace(/</g, '<') - .replace(/>/g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); - }; - - return templateStr.replace(tag, function(matchResult, express) { - var propertyArray = express.split('!'); - var defaultValue = propertyArray[1] || ''; - propertyArray = propertyArray[0].split('.'); - var value = data, i = 0, l = propertyArray.length, property; - for (; i < l; i++) { - property = propertyArray[i]; - if (value) { - value = value[property]; - } else { - break; - } - } - return escapeHtml((value || value === 0) ? value : defaultValue); - }); -}; diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index dbb3952..e9adbac 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -152,7 +152,7 @@ kimchi.template_add_main = function() { volume.isoId = isoId; volume.capacity = kimchi.changetoProperUnit(volume.capacity, 1); kimchi.isoInfo[isoId] = volume; - html += kimchi.template(template, volume); + html += kimchi.substitute(template, volume); } }); $('#list-local-iso').append(html); @@ -266,7 +266,7 @@ kimchi.template_add_main = function() { if (!kimchi.isoInfo[isoId]) { volume.isoId = isoId; kimchi.isoInfo[isoId] = volume; - html += kimchi.template(template, volume); + html += kimchi.substitute(template, volume); } }); $('#list-remote-iso').html(html); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 9ff8bcc..cffc685 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -87,7 +87,7 @@ kimchi.template_edit_main = function() { var html = ''; var tmpl = $('#tmpl-network').html(); $.each(result, function(index, network) { - html += kimchi.template(tmpl, network); + html += kimchi.substitute(tmpl, network); }); $('#template-edit-network-list').html(html).show(); if(template.networks && template.networks.length > 0) { diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 160ecc8..b90e3f3 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -22,7 +22,7 @@ kimchi.doListTemplates = function() { var listHtml = ''; var templateHtml = $('#templateTmpl').html(); $.each(result, function(index, value) { - listHtml += kimchi.template(templateHtml, value); + listHtml += kimchi.substitute(templateHtml, value); }); $('#templateList').html(listHtml); kimchi.templateBindClick(); -- 1.8.1.4

3 3

[PATCH] model.host: avoid redundant libvirt lookupByName API invocation
by Zhou Zheng Sheng 03 Jun '14

03 Jun '14

In HostModel._get_vms_list_by_state(), it gets a list of domain objects and extracts the names, then it traverses the names and calls lookupByName(name) to get domain objects. This is redundant because it has a list of domain object already. This patch fixes the problem. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index e9ac487..5844f4b 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -104,15 +104,9 @@ class HostModel(object): def _get_vms_list_by_state(self, state): conn = self.conn.get() - names = [dom.name().decode('utf-8') for dom in conn.listAllDomains(0)] - - ret_list = [] - for name in names: - dom = conn.lookupByName(name.encode("utf-8")) - info = dom.info() - if (DOM_STATE_MAP[info[0]]) == state: - ret_list.append(name) - return ret_list + return [dom.name().decode('utf-8') + for dom in conn.listAllDomains(0) + if (DOM_STATE_MAP[dom.info()[0]]) == state] class HostStatsModel(object): -- 1.9.3

4 3

[PATCH 1/2] Remove '.iso' extension checking from json schema
by Rodrigo Trujillo 03 Jun '14

03 Jun '14

Libvirt accepts iso files with names that do not end with '.iso' extension. Also, Kimchi discovers ISOs stored in storagepools by the file format, it does not care about file name. This patch removes the .iso checking from API.json schema, then files ending with '.iso.1', '.iso.bkp' or any other, can be used. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b9d371a..44a1439 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -361,7 +361,7 @@ "cdrom": { "description": "Path for cdrom", "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "required": true, "error": "KCHTMPL0014E" }, @@ -532,7 +532,7 @@ "cdrom": { "description": "Path for cdrom", "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "error": "KCHTMPL0014E" }, "disks": { -- 1.9.0

3 4

[PATCH 1/3] create a new login page
by shaohef＠linux.vnet.ibm.com 03 Jun '14

03 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> this page is used for the session timeout or first login. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/images/progressing.gif | Bin 0 -> 1152 bytes ui/pages/login.html.tmpl | 247 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+) create mode 100644 ui/images/progressing.gif create mode 100644 ui/pages/login.html.tmpl diff --git a/ui/images/progressing.gif b/ui/images/progressing.gif new file mode 100644 index 0000000000000000000000000000000000000000..6552d41d9d4c874091bb51931c6adf64a95e8bd0 GIT binary patch literal 1152 zcmZ?wbhEHb6k!ly*v!E2|NsBHckiA#b7s?~O&uK_IXO9@p`oUxrgCy}4A_9;e{Mh5 zkYH!W09PYD17=2`8pWS1oFWVy3_2k7AY&O=+5}E^`WY^hIhD@I;2`qkhUamCHs#2? zD{Sl5ddqAu;o;E8n07H&VTOd$9w+z3Od8dz)1OOlg@hfQ?6P6gg)Nhut~h8s_iHy| zTx?f<DfNuF4qs+in1T70o7P)P87f1<g5(0~t-`bz%`;<c7;R*Hby&0+Cd*D$nyx)7 zxH>hoEs9-2GEYbl<TO?^r*$AZO&~F#<dR{_!xK!0-EtLPZ*p|yWoF`%>SmZA?aQ<9 zUT3kA$h=8X2{%vLaEeZ2FfFvxHCy+@)2xTXXx&nW19L8~I4mhFCLSR*N5YUN_g8RC zxvG$d3rC2Yoni>Hr8Z+mk+UtMt&Fyriq3S|nYyz*lh|s_)v7fmBnyPWjzbSOeSwpn ztM^*GK3gr@WX{W=;H4@s$Eix`o#&Z+UC|vq;?Mm$*qz>q{MpOLKD$V>lW^GM@gRp< zTfqAxmTMW#NQtz1Ow(GUENaLTnG@~OSSl%)a-~@^*=_L^Wu6LazRZG$dI^iu%U-z% zg<00g*_8=1ySk){v9Pk(*~<9qvQD2qQDdsojG1{NY_a__TQemj7eK-u-Fqm>f>utm zWMS=L&jJU059@Suul#8<RCK0juuU^pO9X~|9`=wYHdzoCYCehQmh?GGSt;IO&EY61 z^|cU^WKC}pQa3GC)^bS)J5HFrADAqr$@=Tg_KIeUMR6Q@nr+9QW_y9zNsLj!T)@YO zmFW>EN`0IXPrZ>S5M3ptD%hrTMQhc8T>+_g4tF#}E)IMpc<k8J3C>bEce!tTI4V-^ zEEL|{;B8wW%<SUK!k*>CY&#hksVX{CWv466RGb|aXRcN%49rjY*aHrnWY;d4a(eT< sn9_<U58lHODbH9KGQC;#6@s@G?AG7t-SQycLr1Fr#FC=U9tH+$0KoWQ9smFU literal 0 HcmV?d00001 diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl new file mode 100644 index 0000000..e7afbb3 --- /dev/null +++ b/ui/pages/login.html.tmpl @@ -0,0 +1,247 @@ +#* + * Project Kimchi + * + * Copyright IBM, Corp. 2014 + * + * 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. + *# +#unicode UTF-8 +#import gettext +#from kimchi.cachebust import href +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent _ = t.gettext +#silent _t = t.gettext +#from kimchi.config import get_version +<!DOCTYPE html> +<html lang="$lang.lang[0]"> +<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" /> + +<style type="text/css"> +.login { + font-family: Arial; + margin: 0px; +} + +.login input.invalid-field { + border-color: #C85305 !important; +} + +.login .header { + background: none repeat scroll 0 0 #353D40; + border-bottom: 3px solid #008ABF; + border-top: 0 none; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + height: 50px; + color: #F8F8F8; + font-size: 13px; + font-weight: 700; + font-family: Helvetica; + overflow: hidden; +} + +.login .header .lang { + float: right; + margin-right: 20px; + margin-top: 14px; +} + +.login .header .lang select { + vertical-align: middle; +} + +.login .content-pane { + margin-left: auto; + margin-right: auto; + margin-top: 200px; + width: 260px; +} + +.login .content-pane .trademark { + margin-bottom: 30px; +} + +.login .content-pane .trademark .logo { + background: url("../images/logo.ico") no-repeat scroll center center transparent; + display: inline-block; + height: 25px; + width: 25px; + margin-left: -4px; + margin-right: 5px; + vertical-align: middle; +} + +.login .content-pane .trademark .name { + vertical-align: middle; + padding-top: 2px; + font-weight: bold; + font-size: 18px; +} + +.login .content-pane .trademark .version { + vertical-align: middle; + padding-top: 6px; + font-size: 13px; + padding-left: 6px; +} + +.login .content-pane .message-area .item { + font-size: 12px; + margin-bottom: 30px; + margin-top: 30px; + height: 20px; +} + +.login .content-pane .message-area .text { + color: #C85305; +} + +.login .progress-indicator .progress-icon { + margin-right: 3px; + vertical-align: middle; + width: 15px; + height: 15px; +} + +.login .progress-indicator .progress-text { + vertical-align: middle; + padding-top: 2px; +} + +.login .content-pane .hint { + margin-bottom: 10px; + font-size: 14px; +} + +.login .content-pane .field-area { + overflow: hidden; +} + +.login .content-pane .field-area .text-field { + width: 240px; + padding: 5px 7px; + margin-bottom: 5px; + border: 1px solid #BABABA; + border-radius: 1px; +} + +.login .button { + margin-top: 20px; + background: -moz-linear-gradient(center top , #1783BF 0%, #0C4C88 100%) repeat scroll 0 0 transparent; + border-color: #666666 #666666 #555555; + border-image: none; + border-radius: 5px 5px 5px 5px; + border-style: solid; + border-width: 1px; + color: #DDDDDD; + cursor: pointer; + font-weight: bolder; + padding: 5px 10px; + float: right; +} +</style> + +<script> + +function validateForm() { + var user = document.forms["login"]["username"]; + var pass = document.forms["login"]["password"]; + var validateField = function(field){ + field.className = "text-field"; + var isValid = field.value && field.value.trim()!="" ? true : false; + if(!isValid) field.className += " invalid-field"; + return isValid; + }; + var isValid = validateField(user); + isValid = validateField(pass) && isValid; + if(isValid) + document.getElementById("messWait").style.display = ""; + return isValid; +} + +function getCookie(cname) { + var name = cname + "="; + var ca = document.cookie.split(';'); + for(var i=0; i<ca.length; i++) { + var c = ca[i].trim(); + if (c.indexOf(name)==0) return c.substring(name.length,c.length); + } + return null; +} + +function setCookie(cname,cvalue,exdays) { + var d = new Date(); + d.setTime(d.getTime()+(exdays*24*60*60*1000)); + var expires = "expires="+d.toGMTString(); + document.cookie = cname + "=" + cvalue + "; " + expires; +} + +function init() { + var defaultLang = 'en_US'; + var clientLang = document.getElementById('userLang').value; + var persistLang = getCookie('kimchiLang'); + document.getElementById("userLang").value = persistLang || clientLang || defaultLang; +/* + var url = window.location.href; + if(url.indexOf("wrongUserPass")!=-1) + document.getElementById("messUserPass").style.display = ""; + if(url.indexOf("sessionTimeout")!=-1) + document.getElementById("messSession").style.display = ""; +*/ +} + +function changeLang() { + var lang = document.getElementById('userLang').value; + setCookie('kimchiLang', lang, 365); + window.location.reload(); +} + +</script> +</head> +<body class="login" onload="init()"> + +<div class="header"> + <div class="lang"> + <label>$_("Language"):</label> + <select id="userLang" onchange="changeLang()"> + <option value="en_US">English (US)</option> + <option value="zh_CN">中文（简体）</option> + <option value="pt_BR">Português (Brasil)</option> + </select> + </div> +</div> +<div class="content-pane"> + <div class="trademark"><span class="logo"></span><span class="name">Kimchi</span><span class="version">1.2</span></div> + <div class="message-area"> + <div id="messUserPass" class="item text" style="display: none;">$_("User Name or password is incorrect.")</div> + <div id="messSession" class="item text" style="display: none;">$_("Session timeout, please re-login.")</div> + <div id="messWait" class="item progress-indicator" style="display: none;"> + <img src="images/progressing.gif" class="progress-icon"><span class="progress-text">$_("Processing")...</span> + </div> + </div> + <div class="hint">$_("Sign in with your linux account")</div> + <div class="field-area"> + <form name="login" action="/login?next=$getVar('data.next', '/')" method="POST" onsubmit="return validateForm()"> + <input type="hidden" name="next" value="$getVar('data.next', '/')"> + <input type="text" name="username" placeholder="$_("User Name")" class="text-field" autofocus> + <input type="password" name="password" placeholder="$_("Password")" class="text-field"> + <input type="submit" value="$_("Sign In")" class="button"> + </form> + </div> +</div> + +</body> +</html> -- 1.9.3

3 5

[PATCH] Issue #296 [enhance]kimchi UI should not waiting while generating reports
by Wen Wang 02 Jun '14

02 Jun '14

1) Removed the dialogue window when generating a debug report. 2) Designed an animation bar indicate user there is a report generating during the generating progress. 3) Disable the buttons' functions in debug report area when generating a new report in case there might be any conflict. Meanwhile user can operate on other parts of Kimchi. 4) Enable all buttonss' functions in debug report area after generating progress. --- ui/css/theme-default/host.css | 22 +++++++++++++++++++++ ui/js/src/kimchi.report_add_main.js | 38 ++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 6a1a308..c684c0a 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -219,6 +219,28 @@ width: 200px; } +#id-generate-bar { + text-align: center; + vertical-align: middle; +} + +#id-generate-panel { + vertical-align: middle; + margin: 0 auto; + text-align: center; + height: 20px; + width: 250px; + color: #fff; + border: 1px solid #ccc; + background-color: #5af; +} + +#id-generating { + font-color: #fff; + background: #5af url(../../images/theme-default/loading.gif) 7px + center no-repeat; + padding-left: 26px; +} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 8759c2b..1e5df89 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -1,4 +1,5 @@ kimchi.report_add_main = function() { + var reportGridID = 'available-reports-grid'; var addReportForm = $('#form-report-add'); var submitButton = $('#button-report-add'); var nameTextbox = $('input[name="name"]', addReportForm); @@ -13,12 +14,39 @@ kimchi.report_add_main = function() { return false; } var formData = addReportForm.serializeObject(); - submitButton - .text(i18n['KCHDR6007M']) - .prop('disabled', true); - nameTextbox.prop('disabled', true); + kimchi.window.close(); + var reportGrid = null; + $('#' + reportGridID + '-generate-button').prop('disabled',true); + $('#' + reportGridID + '-remove-button').prop('disabled',true); + $('#' + reportGridID + '-download-button').prop('disabled',true); + $('#' + reportGridID + '-rename-button').prop('disabled',true); + $('#available-reports-grid').find('.grid-body').find('table').find('tr').click(function() { + $('#' + reportGridID + '-remove-button').prop('disabled',true); + $('#' + reportGridID + '-download-button').prop('disabled',true); + $('#' + reportGridID + '-rename-button').prop('disabled',true); + }); + var len = $('#available-reports-grid').find('.grid-frozen-body-view').find('tr').length + 1; + $('#available-reports-grid').find('.grid-frozen-body-view').find('table').append('<tr id="temp-row-col1"><td>' + len + '</td></tr>'); + $('#available-reports-grid').find('.grid-body-view').find('table').append('<tr id="temp-row-col2"><td id="id-generate-bar"; colspan="2"></td></tr>'); + var textboxValue = $('#report-name-textbox').val(); + if (textboxValue != "") { + if (textboxValue.length <= 15) { + $('#id-generate-bar').append('<div id="id-generate-panel"></div>'); + $('#id-generate-panel').append('<label id="id-generating"><span>' + '"' + textboxValue +'" ' + i18n['KCHDR6007M'] + '</span></label>'); + } + else { + $('#id-generate-bar').append('<div id="id-generate-panel"></div>'); + $('#id-generate-panel').append('<label id="id-generating"><span>' + '"' + textboxValue.substring(0,13) +'..." ' + i18n['KCHDR6007M'] + '</span></label>'); + } + } + else { + $('#id-generate-bar').append('<div id="id-generate-panel"></div>'); + $('#id-generate-panel').append('<label id="id-generating"><span>' + i18n['KCHDR6007M'] + '</span></label>'); + } kimchi.createReport(formData, function(result) { - kimchi.window.close(); + $('#temp-row-col1').remove(); + $('#temp-row-col2').remove(); + $('#' + reportGridID + '-generate-button').prop('disabled',false); kimchi.topic('kimchi/debugReportAdded').publish({ result: result }); -- 1.9.1

4 4

[PATCHv3 0/2] ref_cnt fixes for disk attachment
by lvroyce＠linux.vnet.ibm.com 02 Jun '14

02 Jun '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): disk attachment: fix ref_cnt to prevent double attach disk attachment: limit ref_cnt check to disk attachment src/kimchi/model/vmstorages.py | 31 ++++++++++++++++++++++++++++++- tests/test_model.py | 1 + 2 files changed, 31 insertions(+), 1 deletion(-) -- 1.8.3.2

2 4

[PATCHv4 0/2] Support for storage pool extend
by lvroyce＠linux.vnet.ibm.com 01 Jun '14

01 Jun '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Depend on exception fix patchset. v3>v4, delete json schema change.(Shaohe's comments) v2>v3, fixed loading info cannot display when reopen, also correct i18n for Chinese.(Yuxin's comments) v1>v2, Added error msg and loading info for pool extend.(Aline's comments) Royce Lv (2): StoragePool Edit: Add Disk to Logical Pool Update po file po/zh_CN.po | 5 +++- ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.storage_main.js | 47 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.html.tmpl | 1 + ui/pages/tabs/storage.html.tmpl | 15 ++++++++++ 6 files changed, 80 insertions(+), 2 deletions(-) -- 1.8.3.2

2 5

[PATCH] Issue#348: Add loading icon when nfs mount is in progress
by lvroyce＠linux.vnet.ibm.com 29 May '14

29 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add loading icon to indicate nfs mount in progress, when error or normal response returns, close create window. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 2 ++ ui/pages/storagepool-add.html.tmpl | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..6b77bd8 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -198,6 +198,7 @@ kimchi.validateNfsForm = function () { kimchi.message.error.code('KCHPOOL6005E'); return false; } + $('#nfs-mount-loading').removeClass('hidden'); return true; }; @@ -295,6 +296,7 @@ kimchi.addPool = function(event) { kimchi.window.close(); }, function(err) { kimchi.message.error(err.responseJSON.reason); + kimchi.window.close(); }); } } diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..b0bc36d 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -91,6 +91,12 @@ </ul> </div> </div> + <div class="hidden" id="nfs-mount-loading"> + <p class="text-help"> + $_("Server trying mount nfs export path...") + <img src = "../images/theme-default/loading.gif" /> + </p> + </div> </div> </section> </div> -- 1.8.3.2

5 5

[PATCH] Add dependency of pyflakes and pep8
by lvroyce＠linux.vnet.ibm.com 29 May '14

29 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Pyflakes and pep8 dependencies need to be added so that pyflakes check can be performed properly. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 2 ++ contrib/kimchi.spec.fedora.in | 2 ++ contrib/kimchi.spec.suse.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index aac1a24..581601b 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -25,6 +25,8 @@ Depends: python-cherrypy3 (>= 3.2.0), firewalld, nginx Build-Depends: libxslt, + pep8, + pyflakes, python-libxml2 Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 2d4699b..9f62e05 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -32,6 +32,8 @@ Requires: nginx Requires: iscsi-initiator-utils BuildRequires: libxslt BuildRequires: libxml2-python +BuildRequires: python-pep8 +BuildRequires: pyflakes %if 0%{?rhel} == 6 Requires: python-ordereddict diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 165f566..36d6b0a 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -28,6 +28,8 @@ Requires: nginx Requires: open-iscsi BuildRequires: libxslt-tools BuildRequires: python-libxml2 +BuildRequires: python-pyflakes +BuildRequires: python-pep8 %if 0%{?sles_version} == 11 Requires: python-ordereddict -- 1.8.3.2

2 1

[PATCH] Insert loading icon in Storage tab
by Daniel Barboza 28 May '14

28 May '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Due to the timeout period to see if the NFS pool is online, the Storage tab may look irresponsible and the user might believe that the UI/kimchi is frozen. Inserting the loading icon+text in this tab to show that the UI is responsive, just waiting for an answer from the server. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 ++ ui/pages/tabs/storage.html.tmpl | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6052510..74e6892 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -17,6 +17,7 @@ */ kimchi.doListStoragePools = function() { kimchi.listStoragePools(function(result) { + $('#storagepoolsLoading').addClass('hidden'); var storageHtml = $('#storageTmpl').html(); if (result && result.length) { var listHtml = ''; @@ -34,6 +35,7 @@ kimchi.doListStoragePools = function() { $('#storagepoolsList').html(''); } }, function(err) { + $('#storagepoolsLoading').addClass('hidden'); kimchi.message.error(err.responseJSON.reason); }); diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index c3a992e..84372c1 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -40,7 +40,13 @@ <li class="title-actions">$_("Actions")</li> </div> <ul id="storagepoolsList" class="list-storage empty-when-logged-off"></ul> -</div> + <div id="storagepoolsLoading"> + <div class="grid-loading"> + <div class="grid-loading-icon"></div> + <div class="grid-loading-text">$_("loading")</div> + </div> + </div> + </div> <script id="storageTmpl" type="html/text"> <li id="{name}"> <div class="storage-li in" data-name="{name}" data-stat="{state}"> -- 1.8.3.1

3 2

[PATCHv3 0/3] Storage pool extend support
by lvroyce＠linux.vnet.ibm.com 28 May '14

28 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v2>v3, fixed loading info cannot display when reopen, also correct i18n for Chinese. v1>v2, Added error msg and loading info for pool extend.(Aline's comments) Royce Lv (3): StoragePool Edit: Add Disk to Logical Pool StoragePool Edit: Update json schema Update po file po/zh_CN.po | 5 +++- src/kimchi/API.json | 3 +- ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.storage_main.js | 47 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.html.tmpl | 1 + ui/pages/tabs/storage.html.tmpl | 15 ++++++++++ 7 files changed, 82 insertions(+), 3 deletions(-) -- 1.8.3.2

3 5

[PATCH] Remove '.iso' extension checking when create new template
by Rodrigo Trujillo 27 May '14

27 May '14

Libvirt accepts iso files with names that do not end with '.iso' extension. Also, Kimchi discovers ISOs stored in storagepools by the file format, it does not care about file name. This patch removes the .iso checking from API.json schema, then files ending with '.iso.1', '.iso.bkp' or any other, can be used. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b9d371a..44a1439 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -361,7 +361,7 @@ "cdrom": { "description": "Path for cdrom", "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "required": true, "error": "KCHTMPL0014E" }, @@ -532,7 +532,7 @@ "cdrom": { "description": "Path for cdrom", "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "error": "KCHTMPL0014E" }, "disks": { -- 1.9.0

4 5

[PATCHv2 1/2] StoragePool Edit: Add Disk to Logical Pool
by lvroyce＠linux.vnet.ibm.com 27 May '14

27 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, add loading icon before disk query finished and display mesg when no partition is available. Add storage pool extend dialog and choose proper disk for extension. Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 12 +++++++++ ui/js/src/kimchi.storage_main.js | 46 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.html.tmpl | 1 + ui/pages/tabs/storage.html.tmpl | 15 +++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 3c6765c..d30bf10 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -208,6 +208,18 @@ var kimchi = { }).done(suc).fail(err); }, + updateStoragePool : function(name, content, suc, err) { + $.ajax({ + url : kimchi.url + "storagepools/" + encodeURIComponent(name), + type : 'PUT', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify(content) + }).done(suc).fail(err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + }); + }, + startVM : function(vm, suc, err) { kimchi.requestJSON({ url : kimchi.url + 'vms/' + encodeURIComponent(vm) + '/start', diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6052510..ef3d8f5 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -24,6 +24,7 @@ kimchi.doListStoragePools = function() { value.usage = parseInt(value.allocated / value.capacity * 100) || 0; value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocated = kimchi.changetoProperUnit(value.allocated,1); + value.enableExt = value.type==="logical" ? "" : "hide-content"; if ('kimchi-iso' !== value.type) { listHtml += kimchi.template(storageHtml, value); } @@ -138,6 +139,11 @@ kimchi.storageBindClick = function() { } }); + $('.pool-extend').on('click', function() { + $("#logicalPoolExtend").dialog("option", "poolName", $(this).data('name')); + $("#logicalPoolExtend").dialog("open"); + }); + $('#volume-doAdd').on('click', function() { kimchi.window.open('storagevolume-add.html'); }); @@ -187,11 +193,51 @@ kimchi.doListVolumes = function(poolObj) { }); } +kimchi.initLogicalPoolExtend = function() { + $("#logicalPoolExtend").dialog({ + autoOpen : false, + modal : true, + width : 600, + resizable : false, + closeText: "X", + open : function(){ + $(".ui-dialog-titlebar-close", $("#logicalPoolExtend").parent()).removeAttr("title"); + kimchi.listHostPartitions(function(data) { + if (data.length > 0) { + $('.host-partition', '#logicalPoolExtend').html(''); + for(var i=0;i<data.length;i++){ + if (data[i].type === 'part' || data[i].type === 'disk') { + $('.host-partition', '#logicalPoolExtend').append(kimchi.template($('#logicalPoolExtendTmpl').html(), data[i])); + } + } + } else { + $('.host-partition').html(i18n['KCHPOOL6011M']); + $('.host-partition').addClass('text-help'); + } + }); + }, + beforeClose : function() { $('.host-partition', '#logicalPoolExtend').empty(); }, + buttons : [{ + class: "ui-button-primary", + text: i18n.KCHAPI6007M, + click: function(){ + var devicePaths = []; + $("input[type='checkbox']:checked", "#logicalPoolExtend").each(function(){ + devicePaths.push($(this).prop('value')); + }) + kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths}); + $(this).dialog("close"); + } + }] + }); +} + kimchi.storage_main = function() { $('#storage-pool-add').on('click', function() { kimchi.window.open('storagepool-add.html'); }); kimchi.doListStoragePools(); + kimchi.initLogicalPoolExtend(); } kimchi.changeArrow = function(obj) { diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..bc57601 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -33,7 +33,7 @@ kimchi.initStorageAddPage = function() { listHtml += kimchi.template(deviceHtml, value); } }); - $('.host-partition').html(listHtml); + $('.host-partition', '#form-pool-add').html(listHtml); } else { $('.host-partition').html(i18n['KCHPOOL6011M']); $('.host-partition').addClass('text-help'); diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 98da828..f7977c8 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -58,6 +58,7 @@ var i18n = { 'KCHAPI6004M': "$_("Confirm")", 'KCHAPI6005M': "$_("Create")", 'KCHAPI6006M': "$_("Warning")", + 'KCHAPI6007M': "$_("Save")", 'KCHGRD6001M': "$_("Loading...")", 'KCHGRD6002M': "$_("An error occurs while checking for packages update.")", diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index c3a992e..76d2e07 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -41,6 +41,14 @@ </div> <ul id="storagepoolsList" class="list-storage empty-when-logged-off"></ul> </div> +<div id="logicalPoolExtend" title="$_("Device path")"> + <div class="host-partition"> + <p class="text-help"> + $_("Looking for available partitions ...") + <img src = "../images/theme-default/loading.gif" /> + </p> + </div> +</div> <script id="storageTmpl" type="html/text"> <li id="{name}"> <div class="storage-li in" data-name="{name}" data-stat="{state}"> @@ -74,6 +82,7 @@ <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big pool-deactivate" data-stat="{state}" data-name="{name}" data-persistent="{persistent}"><span class="text">$_("Deactivate")</span></button> <button class="button-big pool-activate" data-stat="{state}" data-name="{name}"><span class="text">$_("Activate")</span></button> + <button class="button-big pool-extend {enableExt}" data-stat="{state}" data-name="{name}"><span class="text">$_("Extend")</span></button> <button class="button-big red pool-delete" data-stat="{state}" data-name="{name}"><span class="text">$_("Undefine")</span></button> </div> </div> @@ -107,6 +116,12 @@ </div> </div> </script> +<script id="logicalPoolExtendTmpl" type="html/text"> + <div> + <input type="checkbox" value="{path}" name="devices"> + <label for="{name}">{path}</label> + </div> +</script> <script> kimchi.storage_main(); </script> -- 1.8.3.2

4 3

[PATCH v2] Rename kimchi.template to kimchi.substitute
by Hongliang Wang 27 May '14

27 May '14

This function was designed to substitute variables in HTML template strings originally so it was named as kimchi.template, and it can be used in other scenarios, e.g. we use it when we load plugins we have a unified URL for plugin XML files: /plugins/{plugin}/ui/config/tab-ext.xml and after we have the plugins list, we can easily generate the corresponding URLs like /plugins/pluginA/ui/config/tab-ext.xml, /plugins/pluginB/ui/config/tab-ext.xml. by list ['pluginA', 'pluginB']. Though it is sometimes misunderstood to be related with VM templates. Renamed it in this patch. v1 -> v2: 2a) Configurated git to use "rename" instead of "remove"&"create" (Thanks to Sheldon & Zheng Sheng's help) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.guest_add_main.js | 2 +- ui/js/src/kimchi.guest_edit_main.js | 4 ++-- ui/js/src/kimchi.guest_media_main.js | 2 +- ui/js/src/kimchi.host.js | 2 +- ui/js/src/kimchi.main.js | 2 +- ui/js/src/kimchi.network.js | 2 +- ui/js/src/kimchi.storage_main.js | 4 ++-- ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/js/src/{kimchi.template.js => kimchi.substitute.js} | 2 +- ui/js/src/kimchi.template_add_main.js | 4 ++-- ui/js/src/kimchi.template_edit_main.js | 2 +- ui/js/src/kimchi.template_main.js | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename ui/js/src/{kimchi.template.js => kimchi.substitute.js} (96%) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 055f487..2c70969 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -375,7 +375,7 @@ kimchi.widget.Grid.prototype = (function() { var container = $('#' + containerID); var gridID = this['opts']['id']; var rowSelection = this['opts']['rowSelection'] || 'single'; - var domNode = $(kimchi.template(htmlStr, { + var domNode = $(kimchi.substitute(htmlStr, { id: gridID, loading: i18n['KCHGRD6001M'], message: i18n['KCHGRD6002M'], diff --git a/ui/js/src/kimchi.guest_add_main.js b/ui/js/src/kimchi.guest_add_main.js index 2113099..eefd59a 100644 --- a/ui/js/src/kimchi.guest_add_main.js +++ b/ui/js/src/kimchi.guest_add_main.js @@ -25,7 +25,7 @@ kimchi.guest_add_main = function() { var html = ''; var tmpl = $('#tmpl-template').html(); $.each(result, function(index, value) { - html += kimchi.template(tmpl, value); + html += kimchi.substitute(tmpl, value); }); $('#templateTile').html(html); return; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 0236e2d..90dcb32 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -42,7 +42,7 @@ kimchi.guest_edit_main = function() { $.each(storages, function(index, storage) { storage['vm'] = kimchi.selectedGuest; rowHTML = $('#' + storage['type'] + '-row-tmpl').html(); - var templated = kimchi.template(rowHTML, storage); + var templated = kimchi.substitute(rowHTML, storage); container.append(templated); }); @@ -96,7 +96,7 @@ kimchi.guest_edit_main = function() { $(".action-area", item).toggleClass("hide"); }; var addItem = function(data) { - var itemNode = $.parseHTML(kimchi.template($('#interface-tmpl').html(),data)); + var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); $(".body", "#form-guest-edit-interface").append(itemNode); $("select", itemNode).append(networkOptions); if(data.network!==""){ diff --git a/ui/js/src/kimchi.guest_media_main.js b/ui/js/src/kimchi.guest_media_main.js index 02009ec..d6dee2e 100644 --- a/ui/js/src/kimchi.guest_media_main.js +++ b/ui/js/src/kimchi.guest_media_main.js @@ -28,7 +28,7 @@ kimchi.guest_media_main = function() { $.each(storages, function(index, storage) { storage['vm'] = kimchi.selectedGuest; - var templated = kimchi.template(rowHTML, storage); + var templated = kimchi.substitute(rowHTML, storage); container.append(templated); }); diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 4c94fc1..ee59a7e 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -485,7 +485,7 @@ kimchi.host_main = function() { data['memory'] = kimchi.formatMeasurement(data['memory'], { fixed: 2 }); - var templated = kimchi.template(htmlTmpl, data); + var templated = kimchi.substitute(htmlTmpl, data); $('#host-content-container').html(templated); initPage(); diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 86fed5b..184029d 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -69,7 +69,7 @@ kimchi.main = function() { var tabs = retrieveTabs(tabConfigUrl); kimchi.listPlugins(function(plugins) { $(plugins).each(function(i, p) { - var url = kimchi.template(pluginConfigUrl, { + var url = kimchi.substitute(pluginConfigUrl, { plugin: p }); tabs.push.apply(tabs, retrieveTabs(url)); diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ca6d29b..875bc08 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -63,7 +63,7 @@ kimchi.getNetworkItemHtml = function(network) { } var disable_in_use = network.in_use ? "ui-state-disabled" : ""; - var networkItem = kimchi.template($('#networkItem').html(), { + var networkItem = kimchi.substitute($('#networkItem').html(), { name : network.name, state : network.state, type : network.type, diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6052510..1493124 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -25,7 +25,7 @@ kimchi.doListStoragePools = function() { value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocated = kimchi.changetoProperUnit(value.allocated,1); if ('kimchi-iso' !== value.type) { - listHtml += kimchi.template(storageHtml, value); + listHtml += kimchi.substitute(storageHtml, value); } }); $('#storagepoolsList').html(listHtml); @@ -172,7 +172,7 @@ kimchi.doListVolumes = function(poolObj) { value.poolname = poolObj.data('name'); value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocation = kimchi.changetoProperUnit(value.allocation,1); - listHtml += kimchi.template(volumeHtml, value); + listHtml += kimchi.substitute(volumeHtml, value); }); volumeDiv.html(listHtml); } else { diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..050aa90 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -30,7 +30,7 @@ kimchi.initStorageAddPage = function() { valid_types = ['part', 'disk', 'mpath']; $.each(data, function(index, value) { if (valid_types.indexOf(value.type) != -1) { - listHtml += kimchi.template(deviceHtml, value); + listHtml += kimchi.substitute(deviceHtml, value); } }); $('.host-partition').html(listHtml); diff --git a/ui/js/src/kimchi.template.js b/ui/js/src/kimchi.substitute.js similarity index 96% rename from ui/js/src/kimchi.template.js rename to ui/js/src/kimchi.substitute.js index 082269f..9d4dff6 100644 --- a/ui/js/src/kimchi.template.js +++ b/ui/js/src/kimchi.substitute.js @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -kimchi.template = function(templateStr, data, tag) { +kimchi.substitute = function(templateStr, data, tag) { tag = tag || /\{([^\}]+)\}/g; var escapeHtml = function(html) { diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index dbb3952..e9adbac 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -152,7 +152,7 @@ kimchi.template_add_main = function() { volume.isoId = isoId; volume.capacity = kimchi.changetoProperUnit(volume.capacity, 1); kimchi.isoInfo[isoId] = volume; - html += kimchi.template(template, volume); + html += kimchi.substitute(template, volume); } }); $('#list-local-iso').append(html); @@ -266,7 +266,7 @@ kimchi.template_add_main = function() { if (!kimchi.isoInfo[isoId]) { volume.isoId = isoId; kimchi.isoInfo[isoId] = volume; - html += kimchi.template(template, volume); + html += kimchi.substitute(template, volume); } }); $('#list-remote-iso').html(html); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 9ff8bcc..cffc685 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -87,7 +87,7 @@ kimchi.template_edit_main = function() { var html = ''; var tmpl = $('#tmpl-network').html(); $.each(result, function(index, network) { - html += kimchi.template(tmpl, network); + html += kimchi.substitute(tmpl, network); }); $('#template-edit-network-list').html(html).show(); if(template.networks && template.networks.length > 0) { diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 160ecc8..b90e3f3 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -22,7 +22,7 @@ kimchi.doListTemplates = function() { var listHtml = ''; var templateHtml = $('#templateTmpl').html(); $.each(result, function(index, value) { - listHtml += kimchi.template(templateHtml, value); + listHtml += kimchi.substitute(templateHtml, value); }); $('#templateList').html(listHtml); kimchi.templateBindClick(); -- 1.8.1.4

2 1

[PATCH] Add /var/spool/cron to default host configuration backup paths
by Zhou Zheng Sheng 27 May '14

27 May '14

/var/spool/cron contains user cron jobs and ".cron.hostname". It should be included in the default backup. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- plugins/ginger/ginger.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ginger/ginger.conf b/plugins/ginger/ginger.conf index dbb2aa2..d6dce1d 100644 --- a/plugins/ginger/ginger.conf +++ b/plugins/ginger/ginger.conf @@ -4,7 +4,7 @@ plugin_class = "Ginger" uri = "/plugins/ginger" [backup] -default_include = ['/etc', ] +default_include = ['/etc', '/var/spool/cron'] default_exclude = ['/etc/init.d', '/etc/rc.d', '/etc/rc?.d', ] [/] -- 1.9.0

1 1

[PATCH v4 0/4] Host device passthrough: Summary
by Zhou Zheng Sheng 27 May '14

27 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. The fourth patch adds a sub-collection "vm_holders" to the host device resource. It's to list all VMs that are holding the device. I'll update API and unit test once everyone is happy with the interface and logic. v4: Add new sub-collection to host device to list the VMs holding the device. v3: Fix a small naming error introduced by rebase. v2: Handle the devices in VM's sub-collection "hostdevs". v1: Handle the devices in VM template. Zhou Zheng Sheng (4): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device docs/API.md | 11 +- src/kimchi/control/host.py | 16 ++ src/kimchi/control/vm/hostdevs.py | 44 ++++++ src/kimchi/featuretests.py | 10 +- src/kimchi/hostdev.py | 263 +++++++++++++++++++++++++++++++ src/kimchi/i18n.py | 7 + src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 53 +++++-- src/kimchi/model/libvirtstoragepool.py | 18 +-- src/kimchi/model/vmhostdevs.py | 277 +++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 +++- tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 711 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

1 4

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

27 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v2>v3, Because kimchi exception used unicode as msg, convert it to str to make unicode encode work. 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/i18n.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kimchi/control/utils.py b/src/kimchi/control/utils.py index 5e63816..081bb81 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": str(e.message)}) class UrlSubNode(object): 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

3 2

[PATCH 0/4] ticket support for guest
by shaohef＠linux.vnet.ibm.com 27 May '14

27 May '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> ticket support for guest ShaoHe Feng (4): update API.md ticket in backend: add a set ticket action for VM resource support ticket in UI. set the password for spice and VNC page. docs/API.md | 4 ++++ src/kimchi/control/vms.py | 1 + src/kimchi/model/vms.py | 28 ++++++++++++++++++++++++++++ ui/js/src/kimchi.api.js | 33 ++++++++++++++++++++++++++++++++- ui/pages/spice.html.tmpl | 3 ++- ui/pages/websockify/console.html | 5 +++++ 6 files changed, 72 insertions(+), 2 deletions(-) -- 1.9.0

9 26

[PATCHv2 0/2] Disk attachment
by lvroyce＠linux.vnet.ibm.com 26 May '14

26 May '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Fix for ref_cnt for disk attachment. Royce Lv (2): disk attachment: fix ref_cnt to prevent double attach disk attachment: avoid checking cdrom ref_cnt src/kimchi/model/vmstorages.py | 31 ++++++++++++++++++++++++++++++- tests/test_model.py | 1 + 2 files changed, 31 insertions(+), 1 deletion(-) -- 1.8.3.2

3 8

[RFC] Problems with iso names while create new template
by Rodrigo Trujillo 23 May '14

23 May '14

Hi, There is a problem while creating a new template with local isos. If some iso is stored inside an active storagepool, then kimchi is going to show it for selection. Kimchi looks for any file, with any name, but of type "iso" - IsoVolumesModel:get_list() in src/kimchi/model/storagevolumes.py. So, isos rename like ubuntu.iso.1 or even teste.exe will be shown to user. Error happens if user selects one of them, because the JSON schema restricts file names to ends with ".iso". According to my tests, Libvirt accepts any name, since the file is ISO type. So, I would like to propose to remove the ".iso" checking in the JSON schema. This is not going to break anything in UI. Problems would happen if user tries to create a template using the API directly and gives a file that is not an ISO. In this case, a error will be returned by libvirt and triggered to user. Patch is quite simple. Any objection ? Rodrigo Trujillo

1 1

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

23 May '14

Bugfix that disabled the content display of the action button for an exsiting network when creating a new network. V1 -> V2 Accroding to Hongliang Wang, fix the bug that tabs keep shown when there exists more than one network. --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ca6d29b..8c037e5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -165,11 +165,13 @@ kimchi.addNetworkActions = function(network) { icons : { secondary : "action-button-icon" } - }).click(function() { + }).click(function(event) { + event.stopPropagation(); + $("*").find(".menu-container", "#" + network.name).toggle(false); $(".menu-container", "#" + network.name).toggle(); window.scrollBy(0, 150); }); - $(".menu-container", "#" + network.name).mouseleave(function() { + $(document).click(function(event) { $(".menu-container", "#" + network.name).toggle(false); }); }; -- 1.9.1

2 1

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

23 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. v1: Handle the devices in VM template. v2: Handle the devices in VM's sub-collection "hostdevs". v3: Fix a small naming error introduced by rebase. 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 7

[PATCH] Enable buttons only when all required data is entered
by Crístian Viana 23 May '14

23 May '14

Most forms contain fields that must be filled before they are submitted. Some of them submit the missing data and display an error message when something goes wrong, and some of them do not allow the user to submit them if some data is missing. Make the forms behavior consistent by enabling their buttons only when the required data is entered. Internally, the page tags all required fields with the class "required" and whenever any of their values change, they are checke. If any required field is empty, the submit button becomses disabled; otherwise, it becomes enabled. Fix GitHub issue #317 ("Inconsistent button status when adding or creating new resources"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/css/theme-default/login-window.css | 4 -- ui/js/src/kimchi.guest_edit_main.js | 15 +++++++ ui/js/src/kimchi.login_window.js | 36 +++++++-------- ui/js/src/kimchi.storagepool_add_main.js | 75 +++++++++++++++++++++++--------- ui/js/src/kimchi.template_edit_main.js | 20 +++++++++ ui/pages/guest-edit.html.tmpl | 6 +-- ui/pages/i18n.html.tmpl | 6 --- ui/pages/login-window.html.tmpl | 8 ++-- ui/pages/storagepool-add.html.tmpl | 6 +-- ui/pages/template-edit.html.tmpl | 8 ++-- 10 files changed, 117 insertions(+), 67 deletions(-) diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css index 8a21090..d021be6 100644 --- a/ui/css/theme-default/login-window.css +++ b/ui/css/theme-default/login-window.css @@ -62,10 +62,6 @@ width: 290px; } -#login-window .login-panel .msg-required { - color: red; -} - #login-window .login-panel button { font-size: 18px; height: 40px; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 0236e2d..bb4ee51 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -202,6 +202,21 @@ kimchi.guest_edit_main = function() { kimchi.retrieveVM(kimchi.selectedGuest, initContent); + var updateSubmitButtonStatus = function() { + var valid = true; + guestEditForm.find('input.required').each(function(index, field) { + if (field.value === '') { + valid = false; + return; + } + }); + + saveButton.prop('disabled', !valid); + }; + + guestEditForm.find('input.required').on('input propertychange', + updateSubmitButtonStatus); + var submitForm = function(event) { $(saveButton).prop('disabled', true); var data=$('#form-guest-edit-general').serializeObject(); diff --git a/ui/js/src/kimchi.login_window.js b/ui/js/src/kimchi.login_window.js index 9c06a50..52394a5 100644 --- a/ui/js/src/kimchi.login_window.js +++ b/ui/js/src/kimchi.login_window.js @@ -30,26 +30,25 @@ kimchi.login_main = function() { $(opt).prop('selected', selectedLanguage === k); } + var updateSubmitButtonStatus = function() { + var valid = true; + $('#form-login').find('input.required').each(function(index, field) { + if (field.value === '') { + valid = false; + return; + } + }); + + $('#btn-login').prop('disabled', !valid); + } + + $('#form-login').find('input.required').on('input propertychange', + updateSubmitButtonStatus); + $('#language').on('change', function() { kimchi.topic('languageChanged').publish($(this).val()); }); - var validateNonEmpty = function(idsArray) { - for(var i = 0; i < idsArray.length; i++) { - var id = idsArray[i]; - if (!$('#' + id).val()) { - $('#' + id + '-msg').text(i18n['KCHAUTH6002E']); - placeCursor(id); - return false; - } - else { - $('#' + id + '-msg').empty(); - } - } - - return true; - }; - var placeCursor = function(id) { if (id && $('#' + id).size() > 0) { $('#' + id).focus(); @@ -66,11 +65,6 @@ kimchi.login_main = function() { }; var login = function(event) { - - if (!validateNonEmpty(['username', 'password'])) { - return false; - } - $('#btn-login').text(i18n['KCHAUTH6002M']).prop('disabled', true); var userName = $('#username').val(); diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 86dbe7f..5356985 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -122,6 +122,18 @@ kimchi.initStorageAddPage = function() { }); }); + var updateSubmitButtonStatus = function() { + var valid = true; + $('#form-pool-add').find('input.required').each(function(index, field) { + if (field.value === '') { + valid = false; + return; + } + }); + + $('#pool-doAdd').prop('disabled', !valid); + }; + $('#poolTypeInputId').change(function() { var poolObject = {'dir': ".path-section", 'netfs': '.nfs-section', 'iscsi': '.iscsi-section', 'scsi': '.scsi-section', @@ -134,7 +146,49 @@ kimchi.initStorageAddPage = function() { $(value).addClass('tmpl-html'); } }); + + switch (selectType) { + case 'dir': + $('#pathId').addClass('required'); + + $('#nfsserverId').removeClass('required'); + $('#nfspathId').removeClass('required'); + $('#iscsiserverId').removeClass('required'); + break; + case 'netfs': + $('#nfsserverId').addClass('required'); + $('#nfspathId').addClass('required'); + + $('#pathId').removeClass('required'); + $('#iscsiserverId').removeClass('required'); + break; + case 'iscsi': + $('#iscsiserverId').addClass('required'); + + $('#pathId').removeClass('required'); + $('#nfsserverId').removeClass('required'); + $('#nfspathId').removeClass('required'); + break; + case 'scsi': + $('#pathId').removeClass('required'); + $('#nfsserverId').removeClass('required'); + $('#nfspathId').removeClass('required'); + $('#iscsiserverId').removeClass('required'); + break; + case 'logical': + $('#pathId').removeClass('required'); + $('#nfsserverId').removeClass('required'); + $('#nfspathId').removeClass('required'); + $('#iscsiserverId').removeClass('required'); + break; + } + + updateSubmitButtonStatus(); }); + + $('#form-pool-add').find('input').on('input propertychange', + updateSubmitButtonStatus); + $('#authId').click(function() { if ($(this).prop("checked")) { $('.authenticationfield').removeClass('tmpl-html'); @@ -150,10 +204,6 @@ kimchi.initStorageAddPage = function() { kimchi.validateForm = function() { var name = $('#poolId').val(); var poolType = $("#poolTypeInputId").val(); - if ('' === name) { - kimchi.message.error.code('KCHPOOL6001E'); - return false; - } if (name.indexOf("/")!=-1) { kimchi.message.error.code('KCHPOOL6004E'); return false; @@ -173,10 +223,6 @@ kimchi.validateForm = function() { kimchi.validateDirForm = function () { var path = $('#pathId').val(); - if ('' === path) { - kimchi.message.error.code('KCHPOOL6002E'); - return false; - } if (!/(^\/.*)$/.test(path)) { kimchi.message.error.code('KCHAPI6003E'); return false; @@ -190,10 +236,6 @@ kimchi.validateNfsForm = function () { if (!kimchi.validateServer(nfsserver)) { return false; } - if ('' === nfspath) { - kimchi.message.error.code('KCHPOOL6003E'); - return false; - } if (!/((\/([0-9a-zA-Z-_\.]+)))$/.test(nfspath)) { kimchi.message.error.code('KCHPOOL6005E'); return false; @@ -203,22 +245,13 @@ kimchi.validateNfsForm = function () { kimchi.validateIscsiForm = function() { var iscsiServer = $('#iscsiserverId').val(); - var iscsiTarget = $('#iscsiTargetId').val(); if (!kimchi.validateServer(iscsiServer)) { return false; } - if ('' === iscsiTarget) { - kimchi.message.error.code('KCHPOOL6007E'); - return false; - } return true; }; kimchi.validateServer = function(serverField) { - if ('' === serverField) { - kimchi.message.error.code('KCHPOOL6008E'); - return false; - } if(!kimchi.isServer(serverField)) { kimchi.message.error.code('KCHPOOL6009E'); return false; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index f0f4718..e552bf9 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -104,6 +104,26 @@ kimchi.template_edit_main = function() { }); }); + var updateSubmitButtonStatus = function() { + var valid = true; + templateEditForm.find('input.required').each(function(index, field) { + if (field.value === '') { + valid = false; + return; + } + }); + + if (valid) { + $('#tmpl-edit-button-save').removeAttr('disabled'); + } + else { + $('#tmpl-edit-button-save').attr('disabled', 'disabled'); + } + }; + + templateEditForm.find('input.required').on('input propertychange', + updateSubmitButtonStatus); + $('#tmpl-edit-button-cancel').on('click', function() { kimchi.window.close(); }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 96d907e..d35ad7a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -49,7 +49,7 @@ </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-id-textbox" - name="name" type="text" /> + name="name" type="text" class="required" /> </div> </div> <div> @@ -62,7 +62,7 @@ <input id="guest-edit-cores-textbox" name="cpus" - type="text" /> + type="text" class="required" /> </div> </div> <div> @@ -74,7 +74,7 @@ <div class="guest-edit-wrapper-controls"> <input id="guest-edit-memory-textbox" name="memory" - type="text" /> + type="text" class="required" /> </div> </div> <div> diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 98da828..814825f 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -33,7 +33,6 @@ <script> var i18n = { 'KCHAUTH6001E': "$_("The username or password you entered is incorrect. Please try again.")", - 'KCHAUTH6002E': "$_("This field is required.")", 'KCHAUTH6001M': "$_("Log in")", 'KCHAUTH6002M': "$_("Logging in...")", @@ -158,14 +157,9 @@ var i18n = { 'KCHPOOL6004M': "$_("SCSI Fibre Channel")", 'KCHPOOL6005M': "$_("No SCSI adapters found.")", - 'KCHPOOL6001E': "$_("The storage pool name can not be blank.")", - 'KCHPOOL6002E': "$_("The storage pool path can not be blank.")", - 'KCHPOOL6003E': "$_("NFS server mount path can not be blank.")", 'KCHPOOL6004E': "$_("Invalid storage pool name. It should not contain '/'.")", 'KCHPOOL6005E': "$_("Invalid NFS mount path.")", 'KCHPOOL6006E': "$_("No logical device selected.")", - 'KCHPOOL6007E': "$_("The iSCSI target can not be blank.")", - 'KCHPOOL6008E': "$_("Server name can not be blank.")", 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP. please, modify it.")", 'KCHPOOL6010M': "$_("Looking for available partitions ...")", 'KCHPOOL6011M': "$_("No available partitions found.")", diff --git a/ui/pages/login-window.html.tmpl b/ui/pages/login-window.html.tmpl index 3e451c4..1cd9e83 100644 --- a/ui/pages/login-window.html.tmpl +++ b/ui/pages/login-window.html.tmpl @@ -34,15 +34,13 @@ <div class="content login-panel"> <form id="form-login" action="/login" method="POST"> <div class="row"> - <input type="text" id="username" name="username" required="required" placeholder="$_("User Name")" /> - <div id="username-msg" class="msg-required"></div> + <input type="text" id="username" name="username" class="required" placeholder="$_("User Name")" /> </div> <div class="row"> - <input type="password" id="password" name="password" required="required" placeholder="$_("Password")" /> - <div id="password-msg" class="msg-required"></div> + <input type="password" id="password" name="password" class="required" placeholder="$_("Password")" /> </div> <div class="row"> - <button id="btn-login" class="btn-normal">$_("Log in")</button> + <button id="btn-login" class="btn-normal" disabled="true">$_("Log in")</button> </div> </form> </div> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 977db66..6ce1343 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -36,7 +36,7 @@ <p class="text-help"> $_("The name used to identify the storage pools, and it should not be empty.") </p> - <input id="poolId" required="required" type="text" class="text storage-base-input-width" name="name"> + <input id="poolId" type="text" class="text storage-base-input-width required" name="name"> </div> </section> <section class="form-section"> @@ -60,7 +60,7 @@ $_("The path of the Storage Pool. Each Storage Pool must have a unique path.")</p> <p class="text-help"> $_("Kimchi will try to create the directory when it does not already exist in your system.")</p> - <input id="pathId" type="text" class="text storage-base-input-width"> + <input id="pathId" type="text" class="text storage-base-input-width required"> </div> <div class="clear"></div> </section> @@ -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> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 434d938..46b7058 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -36,7 +36,7 @@ <label for="template-edit-id-textbox">$_("Name")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" class="required" /> </div> </div> <div> @@ -60,7 +60,7 @@ <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + <input id="template-edit-cpu-textbox" name="cpus" type="text" class="required" /> </div> </div> <div> @@ -68,7 +68,7 @@ <label for="template-edit-memory-textbox">$_("Memory")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <input id="template-edit-memory-textbox" name="memory" type="text" class="required" /> </div> </div> <div> @@ -76,7 +76,7 @@ <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-disk-textbox" name="disks" type="text" class="required" /> </div> </div> </fieldset> -- 1.9.0

3 7

Improving diff hunk headers
by Christy Perez 22 May '14

22 May '14

Hi all, I was looking over patches today and wished that there was better context for the changed lines. Specifically, I wanted a function name instead of just the class name. I finally came across this e-mail [1] from someone at Red Hat: """ Hello, I'm sure you're aware of hunk header lines in patches: @@ -24,5 +24,5 @@ class SomeClass(object): It's possible to configure which source line Git selects for the hunk header. By default it uses non-indented lines. A "python" regexp, which selects functions, classes and methods, is already included in Git; you just have to enable it. I also use custom regexps for ldifs and API.txt: $ cat ~/.gitattributes # (Or .git/info/attributes for project-specific config) *.py diff=python API.txt diff=apitxt *.ldif diff=ldif *.update diff=ldif $ git config -l # set with e.g. `git config --global key="value"` ... core.attributesfile=~/.gitattributes diff.apitxt.xfuncname=^command: .* diff.ldif.xfuncname=^dn:.* Enjoy your Friday! -- Petr³ """ We can also define our own, as per: http://stackoverflow.com/questions/2783086/how-does-git-diff-generate-hunk-… I put *.py diff=python into my kimchi project's .git/info/attributes file, and I like these diffs a lot better. For example (using a really old branch I should have deleted while ago! ): @@ -37,7 +37,6 @@ class AsyncTask(object): self.status = 'running' self.message = 'OK' self._save_helper() - self._cp_request = cherrypy.serving.request self.thread = threading.Thread(target=self._run_helper, args=(opaque, self._status_cb)) self.thread.setDaemon(True) @@ -37,7 +37,6 @@ class AsyncTask(object): self.status = 'running' self.message = 'OK' self._save_helper() - self._cp_request = cherrypy.serving.request self.thread = threading.Thread(target=self._run_helper, args=(opaque, self._status_cb)) self.thread.setDaemon(True) @@ -60,17 +59,13 @@ class AsyncTask(object): obj = {} for attr in ('id', 'target_uri', 'message', 'status'): obj[attr] = getattr(self, attr) - try: - with self.objstore as session: - session.store('task', self.id, obj) - except Exception as e: - raise OperationFailed('KCHASYNC0002E', {'err': e.message}) + with self.objstore as session: + session.store('task', self.id, obj) def _run_helper(self, opaque, cb): - cherrypy.serving.request = self._cp_request try: changes to: diff --git a/src/kimchi/asynctask.py b/src/kimchi/asynctask.py index e2d2dcf..8f0d96c 100644 --- a/src/kimchi/asynctask.py +++ b/src/kimchi/asynctask.py @@ -37,7 +37,6 @@ def __init__(self, id, target_uri, fn, objstore, opaque=None): self.status = 'running' self.message = 'OK' self._save_helper() - self._cp_request = cherrypy.serving.request self.thread = threading.Thread(target=self._run_helper, args=(opaque, self._status_cb)) self.thread.setDaemon(True) @@ -60,17 +59,13 @@ def _save_helper(self): obj = {} for attr in ('id', 'target_uri', 'message', 'status'): obj[attr] = getattr(self, attr) - try: - with self.objstore as session: - session.store('task', self.id, obj) - except Exception as e: - raise OperationFailed('KCHASYNC0002E', {'err': e.message}) + with self.objstore as session: So now you can see the function that the code is in, not the larger-scope (the class). I thought I would share, in case any one else wanted to use this. Maybe we could even add a .gitattributes file to kimchi if others think it's a good idea to enforce some project-specific conventions. Happy coding! - Christy [1] http://www.redhat.com/archives/freeipa-devel/2013-April/msg00381.html

2 2