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