January 2014 - Kimchi-devel - oVirt List Archives

[RFC][PATCH 0/3] VM supports interfaces
by shaohef＠linux.vnet.ibm.com 17 Jan '14

17 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> just support get interfaces missing mockmodel and testcase ShaoHe Feng (3): VM supports interfaces: update API VM supports interfaces: update model VM supports interfaces: update controller docs/API.md | 47 ++++++++++++++++++++++++++++++++++++++++ src/kimchi/control/vm/ifaces.py | 48 +++++++++++++++++++++++++++++++++++++++++ src/kimchi/control/vms.py | 9 ++++++++ src/kimchi/model.py | 31 ++++++++++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 src/kimchi/control/vm/ifaces.py -- 1.8.4.2

3 11

[PATCH V3] add a synchronous function with timeout to execute command
by shaohef＠linux.vnet.ibm.com 17 Jan '14

17 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 address zhengsheng's commnet. raise TimeoutExpired when timeout do not return timeout_flag V1 -> V2 check timeout happens and report a specific error + if proc.returncode == -9 and timeout_flag[0] is True: + kimchi_log.error("subprocess is killed by signal.SIGKILL " + "for timeout %s seconds", timeout) ShaoHe Feng (1): add a synchronous function with timeout to execute command src/kimchi/exception.py | 4 ++++ src/kimchi/utils.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) -- 1.8.4.2

5 6

[PATCH V2] Add jquery widget dropDown button
by zhoumeina 17 Jan '14

17 Jan '14

v1-v2 Modify the widget with create and destroy function and drop redundant function. This patch is working for make dropDown button a jquery widget. We can create a dropdown button simply with: $('#buttonId').dropdownButton(); And in html: <div id="buttonId"> <span class="text">$_("Button label")</span><span class="arrow"></span> <div> <button><span class="text">$_("dropdownbutton1")</span></button> <button><span class="text">$_("dropdownbutton2")</span></button> </div> </div> If we need some other style, you can add it to html, and bind action in js. Not a perfect widget, but a beginning. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- ui/js/widgets/button-dropDown.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 ui/js/widgets/button-dropDown.js diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js new file mode 100644 index 0000000..0adda37 --- /dev/null +++ b/ui/js/widgets/button-dropDown.js @@ -0,0 +1,38 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.dropdownButton', { + + _create : function() { + this.actionDiv = this.element; + this.actionDiv.addClass('btn dropdown popable'); + this.actionDiv.find('div').addClass('popover'); + this.actionDiv.find('button').addClass('button-big'); + }, + + destroy : function() { + this.actionDiv.removeClass('btn dropdown popable'); + this.actionDiv.find('div').removeClass('popover'); + this.actionDiv.find('button').removeClass('button-big'); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file -- 1.7.1

3 5

[PATCH] Change all CSS files indentation to 4 spaces
by Crístian Viana 17 Jan '14

17 Jan '14

In order to make the code more consistent, all CSS files should use the same indentation level. Use 4 spaces to indent the CSS properties. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 10 +++++----- ui/css/theme-default/line-chart.css | 6 +++--- ui/css/theme-default/popover.css | 14 +++++++------- ui/css/theme-default/storage.css | 24 ++++++++++++------------ ui/css/theme-default/template_add.css | 4 ++-- ui/css/theme-default/topbar.css | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index c7ed3f6..304f4f4 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -80,7 +80,7 @@ } .btn.loading .icon { - background: url(../images/theme-default/icon-load.png) center center no-repeat; + background: url(../images/theme-default/icon-load.png) center center no-repeat; } .btn .text { @@ -125,7 +125,7 @@ background: #f3f3f3; background: -moz-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f3f3f3), color-stop(50%, #dddddd), - color-stop(51%, #d8d8d8), color-stop(100%, #cccccc)); + color-stop(51%, #d8d8d8), color-stop(100%, #cccccc)); background: -webkit-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); background: -o-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); background: -ms-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); @@ -137,7 +137,7 @@ .btn-tool:hover { box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px rgba(0, 0, 0, .25) inset, -3px -3px 3px rgba(0, 0, 0, .25) - inset; + inset; } /* Generated at http://colorzilla.com/gradient-editor/ */ @@ -373,8 +373,8 @@ line-height: 38px; padding: 0 20px; color: #EEE; - border-radius: 8px; - font-size: 13px; + border-radius: 8px; + font-size: 13px; } .btn-normal:not([disabled]):hover { diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css index 4fc0e2e..5bb61e2 100644 --- a/ui/css/theme-default/line-chart.css +++ b/ui/css/theme-default/line-chart.css @@ -1,13 +1,13 @@ .chart-container { - background: black; + background: black; } .line-chart { - overflow: hidden; + overflow: hidden; } .line-chart .background { - fill: black; + fill: black; } .line-chart text { diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 95eb183..63f09cb 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -75,18 +75,18 @@ .actionsheet { background: rgb(238, 238, 238); background: -moz-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); + rgba(165, 165, 165, 1) 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(238, 238, 238, 1)), - color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)), - color-stop(100%, rgba(165, 165, 165, 1))); + color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)), + color-stop(100%, rgba(165, 165, 165, 1))); background: -webkit-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) - 96%, rgba(165, 165, 165, 1) 100%); + 96%, rgba(165, 165, 165, 1) 100%); background: -o-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); + rgba(165, 165, 165, 1) 100%); background: -ms-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); + rgba(165, 165, 165, 1) 100%); background: linear-gradient(to bottom, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) - 96%, rgba(165, 165, 165, 1) 100%); + 96%, rgba(165, 165, 165, 1) 100%); padding: 10px 10px 0 10px; } diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index d81dc75..3eb3321 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -66,13 +66,13 @@ background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), - color-stop(100%, #e5e5e5)); + color-stop(100%, #e5e5e5)); background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', - endColorstr='#e5e5e5', GradientType=0); + endColorstr='#e5e5e5', GradientType=0); border: 1px solid #ccc; color: #333; -moz-border-top-left-radius: 8px; @@ -212,7 +212,7 @@ .status-dot { background: #72AA00; background: linear-gradient(to bottom, #BFD255 0%, #8EB92A 50%, #72AA00 51%, #9ECB2D - 100%) repeat scroll 0 0 transparent; + 100%) repeat scroll 0 0 transparent; border: 1px solid #72AA00; border-radius: 13px; box-shadow: 3px 3px 3px #FFFFFF, -3px -3px 3px #DDDDDD; @@ -282,7 +282,7 @@ .inactive { background: #E80501; background: linear-gradient(to bottom, #E88692 0%, #E84845 50%, #E80501 51%, #E84845 - 100%) repeat scroll 0 0 transparent; + 100%) repeat scroll 0 0 transparent; border: 1px solid #FF340C; } @@ -300,7 +300,7 @@ .detail-view-icon { background: url(../images/large_details_icon.png) no-repeat center - center; + center; height: 30px; width: 42px; } @@ -458,21 +458,21 @@ .list-storage .storage-li[data-stat="active"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down.png) no-repeat center - center; + center; height: 52px; width: 45px; } .list-storage .storage-li[data-stat="inactive"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down-disable.png) no-repeat center - center; + center; height: 52px; width: 45px; } .arrow-up { background: url(../images/theme-default/arrow-up.png) no-repeat center - center; + center; height: 52px; width: 45px; } @@ -489,22 +489,22 @@ .volume-default { background: url(../images/theme-default/icon-volume-default.png) - no-repeat center center; + no-repeat center center; } .icon-raw { background: url(../images/theme-default/icon-raw.png) no-repeat center - center; + center; } .icon-qcow2 { background: url(../images/theme-default/icon-qcow2.png) no-repeat center - center; + center; } .icon-iso { background: url(../images/theme-default/icon-iso.png) no-repeat center - center; + center; } .host-partition { diff --git a/ui/css/theme-default/template_add.css b/ui/css/theme-default/template_add.css index 46cf56b..e392fe9 100644 --- a/ui/css/theme-default/template_add.css +++ b/ui/css/theme-default/template_add.css @@ -284,6 +284,6 @@ } #iso-more-loading { - background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center no-repeat; - padding: 0 20px 0 26px; + background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center no-repeat; + padding: 0 20px 0 26px; } diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 6a5aec6..43eef2f 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -162,6 +162,6 @@ a#btn-logout:hover { @media ( max-width : 640px) { #logo { - display: none; + display: none; } } -- 1.8.4.2

1 0

[PATCH V3 0/2] Debugreport tool test enhancement
by Shu Ming 17 Jan '14

17 Jan '14

V3->V2: Addressed ZHengsheng's comment by adding space in the end of " " V2->V1: Addressed Shaohe's comment V1: 1)We need a way to tune the debugreport timeout value 2)Skip the test if there is not debugreport tool Shu Ming (2): Skip the debug report test if there is no tool avaible Add a timeout tunning environment variable for debug report test tests/test_model.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 1.8.1.4

2 5

[PATCH V6 0/2] Add spice support of UI
by zhoumeina 17 Jan '14

17 Jan '14

v5-v6 Add token in spice contructor to be consistent with the current proxy mechanism. modify the vnc_proxy_port to display_proxy_port so that it can be used by spice too. v4-v5 vm_graphics is not null and not running make it disabled v3-v4 restructure js code to drop redundance code. replace tabs with 4 spaces v2-v3 Add related make files v1-v2 add spice.html.tmpl This patch add the front end support of spice. 1 If there were a spice vm in host, show a "spice" button but not "vnc" in guest page. 2 click "spice" we can show a screen just like the demo http://www.spice-space.org/spice-html5/spice.html zhoumeina (2): Add the front end support for SPICE Modify vnc_proxy_port to display_proxy_port configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 2 +- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- src/kimchi/control/config.py | 2 +- src/kimchi/vnc.py | 2 +- ui/css/spice/spice.css | 115 ++++ ui/js/Makefile.am | 2 +- ui/js/spice/Makefile.am | 25 + ui/js/spice/atKeynames.js | 183 ++++++ ui/js/spice/bitmap.js | 51 ++ ui/js/spice/cursor.js | 92 +++ ui/js/spice/display.js | 806 ++++++++++++++++++++++++ ui/js/spice/enums.js | 282 +++++++++ ui/js/spice/inputs.js | 251 ++++++++ ui/js/spice/jsbn.js | 589 ++++++++++++++++++ ui/js/spice/lz.js | 166 +++++ ui/js/spice/main.js | 176 ++++++ ui/js/spice/png.js | 256 ++++++++ ui/js/spice/prng4.js | 79 +++ ui/js/spice/quic.js | 1335 ++++++++++++++++++++++++++++++++++++++++ ui/js/spice/rng.js | 102 +++ ui/js/spice/rsa.js | 146 +++++ ui/js/spice/sha1.js | 346 +++++++++++ ui/js/spice/spiceconn.js | 447 ++++++++++++++ ui/js/spice/spicedataview.js | 96 +++ ui/js/spice/spicemsg.js | 883 ++++++++++++++++++++++++++ ui/js/spice/spicetype.js | 480 +++++++++++++++ ui/js/spice/ticket.js | 250 ++++++++ ui/js/spice/utils.js | 261 ++++++++ ui/js/spice/wire.js | 123 ++++ ui/js/src/kimchi.api.js | 25 +- ui/js/src/kimchi.guest_main.js | 27 +- ui/pages/guest.html.tmpl | 1 + ui/pages/spice.html.tmpl | 139 +++++ 37 files changed, 7736 insertions(+), 11 deletions(-) create mode 100644 ui/css/spice/spice.css create mode 100644 ui/js/spice/Makefile.am create mode 100644 ui/js/spice/atKeynames.js create mode 100644 ui/js/spice/bitmap.js create mode 100644 ui/js/spice/cursor.js create mode 100644 ui/js/spice/display.js create mode 100644 ui/js/spice/enums.js create mode 100644 ui/js/spice/inputs.js create mode 100644 ui/js/spice/jsbn.js create mode 100644 ui/js/spice/lz.js create mode 100644 ui/js/spice/main.js create mode 100644 ui/js/spice/png.js create mode 100644 ui/js/spice/prng4.js create mode 100644 ui/js/spice/quic.js create mode 100644 ui/js/spice/rng.js create mode 100644 ui/js/spice/rsa.js create mode 100644 ui/js/spice/sha1.js create mode 100644 ui/js/spice/spiceconn.js create mode 100644 ui/js/spice/spicedataview.js create mode 100644 ui/js/spice/spicemsg.js create mode 100644 ui/js/spice/spicetype.js create mode 100644 ui/js/spice/ticket.js create mode 100644 ui/js/spice/utils.js create mode 100644 ui/js/spice/wire.js create mode 100644 ui/pages/spice.html.tmpl

2 6

[PATCH] host.css: Change Indent to 4 Spaces
by Hongliang Wang 17 Jan '14

17 Jan '14

Apply %s/^ / /g in host.css. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 146 +++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 5e96b37..b6e04b2 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -1,207 +1,207 @@ .host-panel { - font-size: 12px; - margin-bottom: 100px; + font-size: 12px; + margin-bottom: 100px; } .host-panel .logo-container, .host-panel .info-container, .host-panel .section-label, .host-panel .section-value { - display: inline-block; - vertical-align: top; + display: inline-block; + vertical-align: top; } .host-panel .section-label { - display: inline-block; - margin-right: 1em; - vertical-align: top; + display: inline-block; + margin-right: 1em; + vertical-align: top; } .host-panel .logo { - background: url("../images/icon-vm.png") no-repeat left top; - height: 128px; - width: 128px; + background: url("../images/icon-vm.png") no-repeat left top; + height: 128px; + width: 128px; } .host-panel .hostname { - text-decoration: underline; + text-decoration: underline; } .host-panel .action-panel { - margin-top: 2em; - padding-left: 10px; + margin-top: 2em; + padding-left: 10px; } .host-panel .button-icon { - background: url("../images/theme-default/host-icon-sprite.png") no-repeat left top; - display: inline-block; - height: 12px; - width: 12px; + background: url("../images/theme-default/host-icon-sprite.png") no-repeat left top; + display: inline-block; + height: 12px; + width: 12px; } .host-panel .action-icon-stop { - background-position: -14px 0; + background-position: -14px 0; } .host-panel .action-icon-restart { - background-position: -28px 0; + background-position: -28px 0; } .host-panel .action-icon-download { - background-position: -42px 0; + background-position: -42px 0; } .host-panel .action-icon-connect { - background-position: -56px 0; + background-position: -56px 0; } .host-panel .action-icon-add { - background-position: -70px 0; + background-position: -70px 0; } .host-panel .action-icon-edit { - background-position: -84px 0; + background-position: -84px 0; } .host-panel .action-icon-remove { - background-position: -98px 0; + background-position: -98px 0; } .host-panel button:disabled .action-icon-start { - background-position: 0 -14px; + background-position: 0 -14px; } .host-panel button:disabled .action-icon-stop { - background-position: -14px -14px; + background-position: -14px -14px; } .host-panel button:disabled .action-icon-restart { - background-position: -28px -14px; + background-position: -28px -14px; } .host-panel button:disabled .action-icon-download { - background-position: -42px -14px; + background-position: -42px -14px; } .host-panel button:disabled .action-icon-connect { - background-position: -56px -14px; + background-position: -56px -14px; } .host-panel button:disabled .action-icon-add { - background-position: -70px -14px; + background-position: -70px -14px; } .host-panel button:disabled .action-icon-edit { - background-position: -84px -14px; + background-position: -84px -14px; } .host-panel button:disabled .action-icon-remove { - background-position: -98px -14px; + background-position: -98px -14px; } .host-panel .info-container { - padding-top: 16px; - width: 892px; + padding-top: 16px; + width: 892px; } .host-panel .section-header { - background: #EEE; - border-radius: 5px; - cursor: pointer; - line-height: 2em; - margin: 1em 0 1em; - padding-left: 6px; + background: #EEE; + border-radius: 5px; + cursor: pointer; + line-height: 2em; + margin: 1em 0 1em; + padding-left: 6px; } .host-panel .section-header:hover { - background: #06f; - color: white; + background: #06f; + color: white; } .host-panel .section-content { - padding-left: 1em; + padding-left: 1em; } .host-panel .section-header .arrow { - border-color: transparent; - border-style: solid; - display: inline-block; - margin-right: 6px; - width: 0; + border-color: transparent; + border-style: solid; + display: inline-block; + margin-right: 6px; + width: 0; } .host-panel .section-header[aria-expanded="true"] .arrow { - border-top-color: black; - border-width: 8px 4px 0; - border-bottom: none; + border-top-color: black; + border-width: 8px 4px 0; + border-bottom: none; } .host-panel .section-header[aria-expanded="true"]:hover .arrow { - border-top-color: white; + border-top-color: white; } .host-panel .section-header[aria-expanded="false"] .arrow { - border-left-color: black; - border-right: none; - border-width: 4px 0 4px 8px; + border-left-color: black; + border-right: none; + border-width: 4px 0 4px 8px; } .host-panel .section-header[aria-expanded="false"]:hover .arrow { - border-left-color: white; + border-left-color: white; } .host-panel .section-row { - line-height: 1.6em; - margin-bottom: 1em; + line-height: 1.6em; + margin-bottom: 1em; } .host-panel .section-label { - width: 100px; + width: 100px; } #frequency-textbox { - width: 20px; + width: 20px; } #container-chart-cpu, #container-chart-memory, #container-chart-disk-io, #container-chart-network-io { - border: 1px solid white; - box-shadow: 2px 2px 2px gray, 2px -2px 2px gray, -2px -2px 2px gray, -2px 2px 2px gray; - height: 100px; - width: 500px; + border: 1px solid white; + box-shadow: 2px 2px 2px gray, 2px -2px 2px gray, -2px -2px 2px gray, -2px 2px 2px gray; + height: 100px; + width: 500px; } #container-chart-disk-io .disk-write, #container-chart-network-io .network-sent { - stroke: #f80; + stroke: #f80; } /* Debug Report */ .host-panel #available-reports-grid { - border-color: #ddd; - height: 400px; - width: 750px; + border-color: #ddd; + height: 400px; + width: 750px; } .host-panel select#available-reports-list { - width: 300px; + width: 300px; } .host-panel select#available-reports-list option { - margin: .2em 1em; + margin: .2em 1em; } .debug-report-id { - width: 30px; + width: 30px; } .debug-report-name, .debug-report-file, .debug-report-time { - width: 200px; + width: 200px; } .debug-report-file { - width: 300px; + width: 300px; } /* End of Debug Report */ -- 1.8.1.4

2 2

[PATCH] UI: Remove Unused Label Room for Debug Report
by Hongliang Wang 17 Jan '14

17 Jan '14

A blank column was reserved for labeling debug report grid, though there is no need place a label here. Remove it and make the report grid wider to make full use of page width. Dependency: * [PATCH] host.css: Change Indent to 4 Spaces Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 2 +- ui/pages/tabs/host.html.tmpl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 5e96b37..ad778bf 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -180,7 +180,7 @@ .host-panel #available-reports-grid { border-color: #ddd; height: 400px; - width: 750px; + width: 850px; } .host-panel select#available-reports-list { diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index aa4ecfb..d32773a 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -130,7 +130,6 @@ </h3> <div id="content-sys-reports" class="section-content"> <div class="section-row"> - <div class="section-label"></div> <div class="section-value"> <div id="available-reports-grid-container"></div> </div> -- 1.8.1.4

2 2

[PATCH V6 0/2] Add spice support of UI
by zhoumeina 17 Jan '14

17 Jan '14

v5-v6 Add token in spice contructor to be consistent with the current proxy mechanism. modify the vnc_proxy_port to display_proxy_port so that it can be used by spice too. v4-v5 vm_graphics is not null and not running make it disabled v3-v4 restructure js code to drop redundance code. replace tabs with 4 spaces v2-v3 Add related make files v1-v2 add spice.html.tmpl This patch add the front end support of spice. 1 If there were a spice vm in host, show a "spice" button but not "vnc" in guest page. 2 click "spice" we can show a screen just like the demo http://www.spice-space.org/spice-html5/spice.html zhoumeina (2): Add the front end support for SPICE Modify vnc_proxy_port to display_proxy_port configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 2 +- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- src/kimchi/control/config.py | 2 +- src/kimchi/vnc.py | 2 +- ui/css/spice/spice.css | 115 ++++ ui/js/Makefile.am | 2 +- ui/js/spice/Makefile.am | 25 + ui/js/spice/atKeynames.js | 183 ++++++ ui/js/spice/bitmap.js | 51 ++ ui/js/spice/cursor.js | 92 +++ ui/js/spice/display.js | 806 ++++++++++++++++++++++++ ui/js/spice/enums.js | 282 +++++++++ ui/js/spice/inputs.js | 251 ++++++++ ui/js/spice/jsbn.js | 589 ++++++++++++++++++ ui/js/spice/lz.js | 166 +++++ ui/js/spice/main.js | 176 ++++++ ui/js/spice/png.js | 256 ++++++++ ui/js/spice/prng4.js | 79 +++ ui/js/spice/quic.js | 1335 ++++++++++++++++++++++++++++++++++++++++ ui/js/spice/rng.js | 102 +++ ui/js/spice/rsa.js | 146 +++++ ui/js/spice/sha1.js | 346 +++++++++++ ui/js/spice/spiceconn.js | 447 ++++++++++++++ ui/js/spice/spicedataview.js | 96 +++ ui/js/spice/spicemsg.js | 883 ++++++++++++++++++++++++++ ui/js/spice/spicetype.js | 480 +++++++++++++++ ui/js/spice/ticket.js | 250 ++++++++ ui/js/spice/utils.js | 261 ++++++++ ui/js/spice/wire.js | 123 ++++ ui/js/src/kimchi.api.js | 25 +- ui/js/src/kimchi.guest_main.js | 27 +- ui/pages/guest.html.tmpl | 1 + ui/pages/spice.html.tmpl | 139 +++++ 37 files changed, 7736 insertions(+), 11 deletions(-) create mode 100644 ui/css/spice/spice.css create mode 100644 ui/js/spice/Makefile.am create mode 100644 ui/js/spice/atKeynames.js create mode 100644 ui/js/spice/bitmap.js create mode 100644 ui/js/spice/cursor.js create mode 100644 ui/js/spice/display.js create mode 100644 ui/js/spice/enums.js create mode 100644 ui/js/spice/inputs.js create mode 100644 ui/js/spice/jsbn.js create mode 100644 ui/js/spice/lz.js create mode 100644 ui/js/spice/main.js create mode 100644 ui/js/spice/png.js create mode 100644 ui/js/spice/prng4.js create mode 100644 ui/js/spice/quic.js create mode 100644 ui/js/spice/rng.js create mode 100644 ui/js/spice/rsa.js create mode 100644 ui/js/spice/sha1.js create mode 100644 ui/js/spice/spiceconn.js create mode 100644 ui/js/spice/spicedataview.js create mode 100644 ui/js/spice/spicemsg.js create mode 100644 ui/js/spice/spicetype.js create mode 100644 ui/js/spice/ticket.js create mode 100644 ui/js/spice/utils.js create mode 100644 ui/js/spice/wire.js create mode 100644 ui/pages/spice.html.tmpl

2 3

[PATCH V7 0/2] Add UI spice support
by zhoumeina 17 Jan '14

17 Jan '14

v6-v7 Add commit message of the second patch v5-v6 Add token in spice contructor to be consistent with the current proxy mechanism. modify the vnc_proxy_port to display_proxy_port so that it can be used by spice too. v4-v5 vm_graphics is not null and not running make it disabled v3-v4 restructure js code to drop redundance code. replace tabs with 4 spaces v2-v3 Add related make files v1-v2 add spice.html.tmpl This patch add the front end support of spice. 1 If there were a spice vm in host, show a "spice" button but not "vnc" in guest page. 2 click "spice" we can show a screen just like the demo http://www.spice-space.org/spice-html5/spice.html zhoumeina (2): Add the front end support for SPICE Modify vnc_proxy_port to display_proxy_port configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 2 +- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- src/kimchi/control/config.py | 2 +- src/kimchi/vnc.py | 2 +- ui/css/spice/spice.css | 115 ++++ ui/js/Makefile.am | 2 +- ui/js/spice/Makefile.am | 25 + ui/js/spice/atKeynames.js | 183 ++++++ ui/js/spice/bitmap.js | 51 ++ ui/js/spice/cursor.js | 92 +++ ui/js/spice/display.js | 806 ++++++++++++++++++++++++ ui/js/spice/enums.js | 282 +++++++++ ui/js/spice/inputs.js | 251 ++++++++ ui/js/spice/jsbn.js | 589 ++++++++++++++++++ ui/js/spice/lz.js | 166 +++++ ui/js/spice/main.js | 176 ++++++ ui/js/spice/png.js | 256 ++++++++ ui/js/spice/prng4.js | 79 +++ ui/js/spice/quic.js | 1335 ++++++++++++++++++++++++++++++++++++++++ ui/js/spice/rng.js | 102 +++ ui/js/spice/rsa.js | 146 +++++ ui/js/spice/sha1.js | 346 +++++++++++ ui/js/spice/spiceconn.js | 447 ++++++++++++++ ui/js/spice/spicedataview.js | 96 +++ ui/js/spice/spicemsg.js | 883 ++++++++++++++++++++++++++ ui/js/spice/spicetype.js | 480 +++++++++++++++ ui/js/spice/ticket.js | 250 ++++++++ ui/js/spice/utils.js | 261 ++++++++ ui/js/spice/wire.js | 123 ++++ ui/js/src/kimchi.api.js | 25 +- ui/js/src/kimchi.guest_main.js | 27 +- ui/pages/guest.html.tmpl | 1 + ui/pages/spice.html.tmpl | 139 +++++ 37 files changed, 7736 insertions(+), 11 deletions(-) create mode 100644 ui/css/spice/spice.css create mode 100644 ui/js/spice/Makefile.am create mode 100644 ui/js/spice/atKeynames.js create mode 100644 ui/js/spice/bitmap.js create mode 100644 ui/js/spice/cursor.js create mode 100644 ui/js/spice/display.js create mode 100644 ui/js/spice/enums.js create mode 100644 ui/js/spice/inputs.js create mode 100644 ui/js/spice/jsbn.js create mode 100644 ui/js/spice/lz.js create mode 100644 ui/js/spice/main.js create mode 100644 ui/js/spice/png.js create mode 100644 ui/js/spice/prng4.js create mode 100644 ui/js/spice/quic.js create mode 100644 ui/js/spice/rng.js create mode 100644 ui/js/spice/rsa.js create mode 100644 ui/js/spice/sha1.js create mode 100644 ui/js/spice/spiceconn.js create mode 100644 ui/js/spice/spicedataview.js create mode 100644 ui/js/spice/spicemsg.js create mode 100644 ui/js/spice/spicetype.js create mode 100644 ui/js/spice/ticket.js create mode 100644 ui/js/spice/utils.js create mode 100644 ui/js/spice/wire.js create mode 100644 ui/pages/spice.html.tmpl

3 5

[PATCH V8 0/2] Add spice UI support
by zhoumeina 17 Jan '14

17 Jan '14

v7-v8 Change session novnc to display. v6-v7 Add commit message of the second patch v5-v6 Add token in spice contructor to be consistent with the current proxy mechanism. modify the vnc_proxy_port to display_proxy_port so that it can be used by spice too. v4-v5 vm_graphics is not null and not running make it disabled v3-v4 restructure js code to drop redundance code. replace tabs with 4 spaces v2-v3 Add related make files v1-v2 add spice.html.tmpl This patch add the front end support of spice. 1 If there were a spice vm in host, show a "spice" button but not "vnc" in guest page. 2 click "spice" we can show a screen just like the demo http://www.spice-space.org/spice-html5/spice.html zhoumeina (2): Add the front end support for SPICE Modify vnc_proxy_port to display_proxy_port configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 2 +- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 4 +- src/kimchi/control/config.py | 2 +- src/kimchi/vnc.py | 2 +- ui/css/spice/spice.css | 115 ++++ ui/js/Makefile.am | 2 +- ui/js/spice/Makefile.am | 25 + ui/js/spice/atKeynames.js | 183 ++++++ ui/js/spice/bitmap.js | 51 ++ ui/js/spice/cursor.js | 92 +++ ui/js/spice/display.js | 806 ++++++++++++++++++++++++ ui/js/spice/enums.js | 282 +++++++++ ui/js/spice/inputs.js | 251 ++++++++ ui/js/spice/jsbn.js | 589 ++++++++++++++++++ ui/js/spice/lz.js | 166 +++++ ui/js/spice/main.js | 176 ++++++ ui/js/spice/png.js | 256 ++++++++ ui/js/spice/prng4.js | 79 +++ ui/js/spice/quic.js | 1335 ++++++++++++++++++++++++++++++++++++++++ ui/js/spice/rng.js | 102 +++ ui/js/spice/rsa.js | 146 +++++ ui/js/spice/sha1.js | 346 +++++++++++ ui/js/spice/spiceconn.js | 447 ++++++++++++++ ui/js/spice/spicedataview.js | 96 +++ ui/js/spice/spicemsg.js | 883 ++++++++++++++++++++++++++ ui/js/spice/spicetype.js | 480 +++++++++++++++ ui/js/spice/ticket.js | 250 ++++++++ ui/js/spice/utils.js | 261 ++++++++ ui/js/spice/wire.js | 123 ++++ ui/js/src/kimchi.api.js | 25 +- ui/js/src/kimchi.guest_main.js | 27 +- ui/pages/guest.html.tmpl | 1 + ui/pages/spice.html.tmpl | 139 +++++ 37 files changed, 7737 insertions(+), 12 deletions(-) create mode 100644 ui/css/spice/spice.css create mode 100644 ui/js/spice/Makefile.am create mode 100644 ui/js/spice/atKeynames.js create mode 100644 ui/js/spice/bitmap.js create mode 100644 ui/js/spice/cursor.js create mode 100644 ui/js/spice/display.js create mode 100644 ui/js/spice/enums.js create mode 100644 ui/js/spice/inputs.js create mode 100644 ui/js/spice/jsbn.js create mode 100644 ui/js/spice/lz.js create mode 100644 ui/js/spice/main.js create mode 100644 ui/js/spice/png.js create mode 100644 ui/js/spice/prng4.js create mode 100644 ui/js/spice/quic.js create mode 100644 ui/js/spice/rng.js create mode 100644 ui/js/spice/rsa.js create mode 100644 ui/js/spice/sha1.js create mode 100644 ui/js/spice/spiceconn.js create mode 100644 ui/js/spice/spicedataview.js create mode 100644 ui/js/spice/spicemsg.js create mode 100644 ui/js/spice/spicetype.js create mode 100644 ui/js/spice/ticket.js create mode 100644 ui/js/spice/utils.js create mode 100644 ui/js/spice/wire.js create mode 100644 ui/pages/spice.html.tmpl

3 5

[PATCH V2] UI bug fix: Set vlan_id value only if 'Enable VLAN' is checked
by Aline Manera 17 Jan '14

17 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Remove alert used for testing Aline Manera (1): UI bug fix: Set vlan_id value only if 'Enable VLAN' is checked ui/js/src/kimchi.network.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 1.7.10.4

3 7

[PATCH] Issue #308: Use correct iSCSI package for openSUSE
by Crístian Viana 17 Jan '14

17 Jan '14

Kimchi depends on an iSCSI system package to validate the iSCSI devices when creating a storage pool. Currently, the package "iscsi-initiator-utils" is listed as a dependency, but it is not available on openSUSE. Therefore, the Kimchi RPM file cannot be installed on that distro. Update the iSCSI dependency package name for openSUSE to "open-iscsi". Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.suse.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index d1aec7b..bacf8df 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -21,7 +21,7 @@ Requires: python-ethtool Requires: python-ipaddr Requires: python-lxml Requires: nfs-client -Requires: iscsi-initiator-utils +Requires: open-iscsi %if 0%{?sles_version} == 11 Requires: python-ordereddict -- 1.8.4.2

4 3

[PATCH V9 0/1] Open 8000 and 8001 port by default for distro packages
by taget＠linux.vnet.ibm.com 17 Jan '14

17 Jan '14

From: Eli Qiao <taget(a)linux.vnet.ibm.com> I tested on Fedora and Ubuntu system. V9 -V8 changes: 1. Fix rebase error. 2. Revert 2 in V8 3. Add set +e when checking firewalld service to avoid bad return status. V8 -V7 changes: 1. Rebase to latest code.(DEBIAN/control.in) 2. Install kimchid.xml to system dir (shu ming) 3. Remove changes for open suse.(Aline) V7 -V6 changes: 1. Remove firewalld message when install kimchi rpm on fedora/RHEL 2. Start firewalld service if not start 3. Ship kimchid.xml to ubuntu distro in Makefile.am V6 -V5 changes: 1.Keep specific condition for RHEL6 when starting kimchid service 2.Remove full path of firewall-cmd in postrm V5 - V4 changes: 1. Add cover-letter. (Aline) 2. Move clean up rules into if condition. (Aline) 3. Use with_systemd condition to check if use firewalld rules. (Aline) 4. Fix typo (Aline) V4 - V3 changes: 1 Fix typo in firewalld.xml (Rodrigo) V3 - V2 changes: 1.Rename kimchid.xml to firewalld.xml (Mark) 2.Remove firewalld from serivce require (Mark) 3.Fix typo V2 - V1 changes: 1.Add firewalld sevice configure file kimchid.xml to help open iptables port (Mark) 2.Add Ubuntu iptables rule (Royce) Eli Qiao (1): spec: Open 8000 and 8001 port by default Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/DEBIAN/postinst | 6 ++++++ contrib/DEBIAN/postrm | 2 ++ contrib/kimchi.spec.fedora.in | 26 ++++++++++++++++++++++++++ src/Makefile.am | 1 + src/firewalld.xml | 7 +++++++ 7 files changed, 45 insertions(+) create mode 100644 src/firewalld.xml -- 1.8.3.1

3 5

[PATCH V2] Add support to RHEL 7
by abotega＠linux.vnet.ibm.com 17 Jan '14

17 Jan '14

From: Adriano Botega <abotega(a)linux.vnet.ibm.com> V1 -> V2: Addressed Mark's comment: Just add the hyphen to the matching characters set. RHEL 7 is the next Red Hat Enterprise distro version and because of a difference in the distro name in Volume Descriptor Table on it's ISO file, Kimchi is not recognizing as a RHEL distro. This patch adds the correct regex to add support to RHEL 7 Signed-off-by: Adriano Botega <abotega(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 7e6d733..62cce39 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -110,7 +110,7 @@ iso_dir = [ ('opensuse', '12.2', 'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'), ('rhel', '4.8', 'RHEL/4-U8'), - ('rhel', lambda m: m.group(1), 'RHEL[_/](\d+\.\d+)'), + ('rhel', lambda m: m.group(1), 'RHEL[_/-](\d+\.\d+)'), ('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'), ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), -- 1.8.4.2

4 3

About the pre-integration test
by Shu Ming 16 Jan '14

16 Jan '14

Hi, After running the full unit-test cases by "sudo ./run_test.sh", I found the test cases were broken in all platforms including Fedora 20, Fedora 18, Ubuntu 12.04. I am not sure which patch broke it, but I think we should make sure all the existing unit-test cases passed before integration. To the maintainer, please enforce it when merging the patches. To the patch's submitter, please do a full unit test before submitting your patches into the mailing lists. It is very common for a new patch to trigger other test case's failure which seems non-related. Please make your code clean by the unit test cases. The unit test cases may take one minute, but it will save other's time in hours.

4 5

[PATCH V5] Add nfs server and target UI in create storage pool
by zhoumeina 16 Jan '14

16 Jan '14

v4-v5 Change some html nits. V3-V4 add value in jquery widget. move all storage all page style to css files. v2-v3 Make nfs server inputbox to combobox Edit jquery widgets to fix some small nits in it. change some parameter according to the changes from back end. v1-v2 Fix some bug in this patch, make it working and retest This patch is working adding a select box in create nfs pool, when user don't want to input the server ip or name, he can simply select "used the server I have used before" and choose a server in a select box, this is more convinent. In order to show server target I did a select box in UI, but sometimes maybe the export path number is large. So I made a filter-select widget to make user easier to choose the export path he want. This is the first jquery widget. And let us make all common widget to jquery widget from now on. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 21 +++-- ui/css/theme-default/form.css | 6 ++ ui/css/theme-default/popover.css | 1 + ui/css/theme-default/storage.css | 29 ++++++- ui/js/Makefile.am | 4 +- ui/js/src/kimchi.api.js | 27 ++++++- ui/js/src/kimchi.popable.js | 2 +- ui/js/src/kimchi.storagepool_add_main.js | 72 ++++++++++++++-- ui/js/src/kimchi.utils.js | 11 +++ ui/js/widgets/combobox.js | 131 +++++++++++++++++++++++++++++ ui/js/widgets/filter-select.js | 135 ++++++++++++++++++++++++++++++ ui/js/widgets/select-menu.js | 83 ++++++++++++++++++ ui/pages/i18n.html.tmpl | 5 +- ui/pages/storagepool-add.html.tmpl | 59 ++++++++------ 14 files changed, 539 insertions(+), 47 deletions(-) create mode 100644 ui/js/widgets/combobox.js create mode 100644 ui/js/widgets/filter-select.js create mode 100644 ui/js/widgets/select-menu.js diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index c7ed3f6..dcca6a9 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -247,30 +247,37 @@ .btn-select { display: inline-block; position: relative; - height: 38px; + height: 30px; padding-right: 20px; margin: 5px; vertical-align: top; -webkit-border-radius: 5px; -moz-border-radius: 5px; - border-radius: 5px; - background: #eee; + background: #fff; box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 2px 2px 2px rgba(0, 0, 0, .15) inset; font-size: 13px; - line-height: 38px; + line-height: 30px; text-align: left; cursor: pointer; } -.btn-select .text { +.btn-select .input { + border: 0 solid #CCCCCC; padding: 0 10px; + margin-right: 10px; + font-size: 16px; + height: 30px; + line-height: 30px; + width: 100%; + position: absolute; + background: transparent; } .btn-select .arrow { position: absolute; width: 15px; - height: 38px; - line-height: 38px; + height: 30px; + line-height: 30px; top: 0; right: 5px; background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index 28e30a5..d1a3885 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -49,4 +49,10 @@ .form-section input.invalid-field[type="text"] { border-color: #FF4444; +} + +.text-help { + font-size: 12px; + color: #333; + margin: 0 0 5px 5px; } \ No newline at end of file diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 95eb183..e91ccc0 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -31,6 +31,7 @@ left: 0; display: none; cursor: default; + width: 100%; } .popover:BEFORE { diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index d81dc75..62e1540 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -529,7 +529,7 @@ width: 300px; display: inline-block; vertical-align: top; - padding: 5px 5px 5px 20px; + padding: 5px 5px 5px 22px; } .storage-type-wrapper-controls input[type="text"] { @@ -548,11 +548,36 @@ .storage-type-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 250px; + width: 150px; } .storage-type-wrapper-controls input[type="text"][disabled] { color: #bbb; background-color: #fafafa; cursor: not-allowed; +} + +.storage-add-input-width { + width: 285px; +} + +.form-section .storage-field { + overflow: visible; +} + +.storage-base-input-width { + width: 300px; +} + +.storage-window { + width: 600px; + height: 700px; +} + +.storage-port-width { + width:40px; +} + +.storage-auth-width { + width: 150px; } \ No newline at end of file diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 6808226..65254da 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = novnc -EXTRA_DIST = src +EXTRA_DIST = src widgets jsdir = $(datadir)/kimchi/ui/js @@ -31,7 +31,7 @@ dist_js_DATA = \ modernizr.custom.2.6.2.min.js \ $(NULL) -kimchi.min.js: src/*.js +kimchi.min.js: widgets/*.js src/*.js cat $(sort $^) > $@ CLEANFILES = kimchi.min.js diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index a4608ff..8d006d2 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -683,5 +683,30 @@ var kimchi = { success : suc, error : err }); + }, + + getStorageServers: function(type, suc, err) { + var url = kimchi.url + 'storageservers?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); + }, + + getStorageTargets: function(server,type, suc, err) { + var url = kimchi.url + 'storageservers/' + server + '/storagetargets?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); } -}; +}; \ No newline at end of file diff --git a/ui/js/src/kimchi.popable.js b/ui/js/src/kimchi.popable.js index 153d32c..2a843be 100644 --- a/ui/js/src/kimchi.popable.js +++ b/ui/js/src/kimchi.popable.js @@ -25,7 +25,7 @@ kimchi.popable = function() { $(document).on("click", ".popable", function(e) { var isOpen = $(this).hasClass('open'); $(".popable").removeClass('open'); - if (!isOpen) { + if (!isOpen && $(this).find('ul').html() !== '') { $(this).addClass('open'); } diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 24de979..85ac70f 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -29,6 +29,9 @@ kimchi.storagepool_add_main = function() { }; kimchi.initStorageAddPage = function() { + $('#poolTypeId').selectMenu(); + $('#serverComboboxId').combobox(); + $('#targetFilterSelectId').filterselect(); var options = [ { label : "DIR", value : "dir" @@ -54,8 +57,66 @@ kimchi.initStorageAddPage = function() { }); $('.host-partition').html(listHtml); } - kimchi.select('storagePool-list', options); - $('#poolType').change(function() { + $('#poolTypeId').selectMenu("setData", options); + kimchi.getStorageServers('netfs', function(data) { + var serverContent = []; + serverContent.push({ + label : i18n['select_default'], + value : '' + }); + if (data.length > 0) { + $.each(data, function(index, value) { + serverContent.push({ + label : value.addr, + value : value.addr + }); + }); + } + $('#serverComboboxId').combobox("setData", serverContent); + $('input[name=nfsServerType]').change(function() { + if ($(this).val() === 'input') { + $('#nfsServerInputDiv').removeClass('tmpl-html'); + $('#nfsServerChooseDiv').addClass('tmpl-html'); + } else { + $('#nfsServerInputDiv').addClass('tmpl-html'); + $('#nfsServerChooseDiv').removeClass('tmpl-html'); + } + }); + $('#nfsserverId').on("change",function() { + if ($(this).val() !== '' && kimchi.isServer($(this).val())) { + $('#nfspathId').prop('disabled',false); + } else { + $('#nfspathId').prop( "disabled",true); + } + $('#targetFilterSelectId').filterselect('clear'); + }); + $('#nfspathId').focus(function() { + var targetContent = []; + kimchi.getStorageTargets($('#nfsserverId').val(), 'netfs', function(data) { + if (data.length > 0) { + $.each(data, function(index, value) { + targetContent.push({ + label : value.target, + value : value.target + }); + }); + } else { + targetContent.push({ + label : i18n['msg.no.result'], + value : '' + }); + } + $('#targetFilterSelectId').filterselect("setData", targetContent); + },function() { + targetContent.push({ + label : i18n['msg.no.result'], + value : '' + }); + $('#targetFilterSelectId').filterselect("setData", targetContent); + }); + }); + }); + $('#poolTypeInputId').change(function() { if ($(this).val() === 'dir') { $('.path-section').removeClass('tmpl-html'); $('.logical-section').addClass('tmpl-html'); @@ -111,7 +172,6 @@ kimchi.validateForm = function() { } else { return kimchi.validateLogicalForm(); } - }; kimchi.validateDirForm = function () { @@ -162,11 +222,7 @@ kimchi.validateServer = function(serverField) { kimchi.message.error(i18n['msg.pool.edit.server.blank']); return false; } - var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}" - var ip = "(\\d{1,3}\.){3}\\d{1,3}" - regex = new RegExp('^' + domain + '|' + ip + '$') - - if (!regex.test(serverField)) { + if(kimchi.isServer(nfsserver)) { kimchi.message.error(i18n['msg.validate.pool.edit.server']); return false; } diff --git a/ui/js/src/kimchi.utils.js b/ui/js/src/kimchi.utils.js index a23bf51..3cf36b9 100644 --- a/ui/js/src/kimchi.utils.js +++ b/ui/js/src/kimchi.utils.js @@ -168,3 +168,14 @@ kimchi.isUnsignedNumeric = function(number) { var reg = /^d+(.d+)?$/ return reg.test(number); } + +kimchi.isServer = function(server) { + var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}"; + var ip = "(\\d{1,3}\.){3}\\d{1,3}"; + regex = new RegExp('^' + domain + '|' + ip + '$'); + if (!regex.test(server)) { + return false; + } else { + return true; + } +}; diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js new file mode 100644 index 0000000..aa948e6 --- /dev/null +++ b/ui/js/widgets/combobox.js @@ -0,0 +1,131 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.combobox', { + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function(options) { + this.listControl.html(''); + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + + that.listControl.on('click', itemTag, function(e) { + that.listControl.children().removeClass(selectedClass); + that.listControl.addClass(selectedClass); + that.target.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if (oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + that.listControl.html(''); + var items = that._dataList(options); + $.each(items, function(index, item) { + that.listControl.append(item); + }) + }); + + that.target.keyup(function(event) { + that.listControl.html(''); + var items = that._dataList(options); + var temp = 0; + $.each(items, function(index, item) { + if (item.html().indexOf(that.target.val()) >= 0) { + that.listControl.append(item); + temp++; + } + }); + if (that.listControl.html() === '') { + that.listControl.html(i18n['msg.no.mapping.result']); + } + if (temp > 0) { + that._open(); + } + }); + }, + + value : function(value) { + if (value === undefined) { + return this.target.val(); + } + this.target.val(value); + }, + + _dataList : function(options) { + var item; + var itemTag = 'li'; + var selectedClass = 'active'; + var items = []; + var that = this; + $.each(options, function(index, option) { + item = $('<' + itemTag + '></' + itemTag + '>'); + item.text(option.label); + item.data('value', option.value); + if (option.value === that.target.val()) { + item.addClass(selectedClass); + } + items.push(item); + }); + return items; + }, + + clear : function() { + this.target.val(""); + }, + + _open : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (!isOpen) { + this.selectDiv.addClass('open'); + } + }, + + _close : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (isOpen) { + this.selectDiv.removeClass('open'); + } + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover'); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js new file mode 100644 index 0000000..6eaaa94 --- /dev/null +++ b/ui/js/widgets/filter-select.js @@ -0,0 +1,135 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.filterselect', { + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function(options) { + this.listControl.html(''); + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + + that.listControl.on('click', itemTag, function(e) { + that.listControl.children().removeClass(selectedClass); + that.listControl.addClass(selectedClass); + that.target.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if (oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + that.listControl.html(''); + var items = that._dataList(options); + if (items.length === 0) { + that.listControl.html(i18n['msg.no.mapping.result']); + } else { + $.each(items, function(index, item) { + that.listControl.append(item); + }) + } + }); + + that.target.keyup(function(event) { + that.listControl.html(''); + var items = that._dataList(options); + var temp = 0; + $.each(items, function(index, item) { + if (item.html().indexOf(that.target.val()) >= 0) { + that.listControl.append(item); + temp++; + } + }); + if (that.listControl.html() === '') { + that.listControl.html(i18n['msg.no.mapping.result']); + } + if (temp > 0) { + that._open(); + } + }); + }, + + value : function(value) { + if (value === undefined) { + return this.target.val(); + } + this.target.val(value); + }, + + _dataList : function(options) { + var item; + var itemTag = 'li'; + var selectedClass = 'active'; + var items = []; + var that = this; + $.each(options, function(index, option) { + item = $('<' + itemTag + '></' + itemTag + '>'); + item.text(option.label); + item.data('value', option.value); + if (option.value === that.target.val()) { + item.addClass(selectedClass); + } + items.push(item); + }); + return items; + }, + + clear : function() { + this.target.val(""); + }, + + _open : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (!isOpen) { + this.selectDiv.addClass('open'); + } + }, + + _close : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (isOpen) { + this.selectDiv.removeClass('open'); + } + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover') + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js new file mode 100644 index 0000000..053eeba --- /dev/null +++ b/ui/js/widgets/select-menu.js @@ -0,0 +1,83 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.selectMenu', { + + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.label = this.selectDiv.find('span').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.label.addClass('input'); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function (options) { + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + $.each(options, function(index, option) { + item = $('<' + itemTag + '></' + itemTag + '>'); + item.text(option.label); + item.data('value', option.value); + if(option.value === value) { + item.addClass(selectedClass); + that.label.text(option.label); + } + that.listControl.append(item); + }); + that.listControl.on('click', itemTag, function() { + that.listControl.children().removeClass(selectedClass); + that.listControl.addClass(selectedClass); + that.label.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if(oldValue !== newValue) { + that.target.change(); + } + }); + + }, + + value : function(data) { + if (data === undefined) { + return this.target.val(); + } + this.target.val(data.value); + this.label.val(data.label); + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.label.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover'); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 603f8d7..9727eba 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -122,7 +122,10 @@ var i18n = { " there, are you sure to continue? ")", 'msg.pool.edit.iscsitarget.blank': "$_("The iSCSI target can not be blank.")", 'msg.pool.edit.server.blank':"$_("Server name can not be blank.")", - 'msg.validate.pool.edit.server':"$_("This is not a valid Server Name or IP. please, modify it.")" + 'msg.validate.pool.edit.server':"$_("This is not a valid Server Name or IP. please, modify it.")", + 'select_default': "$_("Please choose")", + 'msg.no.mapping.result': "$_("No such data exsit.")", + 'msg.no.result' : "$_("No valid result")" }; </script> </body> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index e8dac43..6518df0 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -27,7 +27,7 @@ <!DOCTYPE html> <html> <body> - <div class="window" style="width: 600px; height: 700px;"> + <div class="window storage-window"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -40,18 +40,17 @@ <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" style="width: 300px" - name="name"> + <input id="poolId" required="required" type="text" class="text storage-base-input-width" name="name"> </div> </section> <section class="form-section"> <h2>2. $_("Storage Pool Type")</h2> <div class="storage-type-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="poolType" name="type" type="hidden" value="dir"/> - <span class="text" id="pool-type-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"> + <div id="poolTypeId"> + <input id="poolTypeInputId" name="type" type="hidden" value="dir"/> + <span id="pool-type-label"></span><span class="arrow"></span> + <div> + <ul id="storagePool-list"> </ul> </div> </div> @@ -65,30 +64,40 @@ $_("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" required="required" style="width: 300px"> + <input id="pathId" type="text" class="text storage-base-input-width" required="required"> </div> <div class="clear"></div> </section> </div> <div class="nfs-section tmpl-html"> <section class="form-section"> - <h2>3. $_("NFS server IP")</h2> - <div class="field"> + <h2>3. $_("NFS Server IP")</h2> + <div class="field storage-field"> <p class="text-help"> - $_("NFS server IP or hostname. It should not be empty.")</p> - <input id="nfsserverId" required="required" type="text" class="text" - style="width: 300px"> + $_("NFS server IP or hostname. It can be input or chosen from history.")</p> + <div id="serverComboboxId" class="storage-add-input-width"> + <input id="nfsserverId"/> + <span class="arrow"></span> + <div> + <ul id="nfs-server-used"> + </ul> + </div> + </div> </div> </section> <section class="form-section"> <h2>4. $_("NFS Path")</h2> - <div class="field"> + <div class="field storage-field"> <p class="text-help">$_("The nfs exported path on nfs server")</p> - <input id="nfspathId" required="required" type="text" class="text" - style="width: 300px"> - <input type="hidden" id="localpathId" class="text" value="none"> - </div> - <div class="clear"></div> + <div id="targetFilterSelectId" class="storage-add-input-width"> + <input id="nfspathId" class="input" disabled/> + <span class="arrow"></span> + <div> + <ul id="nfs-server-target"> + </ul> + </div> + </div> + </div> </section> </div> <div class="logical-section tmpl-html"> @@ -103,15 +112,15 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text" style="width: 300px"> - <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text" style="width:40px" maxlength='4'> + <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> <section class="form-section"> <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text" style="width: 300px"> + <input id="iscsiTargetId" type="text" class="text storage-base-input-width> </div> </section> <section class="form-section"> @@ -123,8 +132,8 @@ <section class="authenticationfield form-section tmpl-html"> <h2>5. $_("iSCSI Authentication")</h2> <div class="field"> - <input id="usernameId" placeholder="$_("User Name")" type="text" class="text" style="width: 150px"> - <input id="passwordId" placeholder="$_("Password")" type="text" class="text" style="width: 150px"> + <input id="usernameId" placeholder="$_("User Name")" type="text" class="text storage-auth-width"> + <input id="passwordId" placeholder="$_("Password")" type="text" class="text storage-auth-width"> </div> </section> </div> -- 1.7.1

3 4

Re: [Kimchi-devel] [project-kimchi] [PATCH] Bug Fix: Get correct exception info when run unittest on Python2.6
by Sheldon 16 Jan '14

16 Jan '14

On 07/09/2013 02:51 AM, Adam Litke wrote: > On Thu, Jul 04, 2013 at 05:50:06PM +0800, caobbu(a)linux.vnet.ibm.com wrote: >> From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> >> >> When running unittest on SLES(python2.6), found a problem: >> If an exception occurs in body of 'with' statement, the 'exc_value' is a str >> not a exception object, 'raise firstException' will raise a TypeError. >> In this case, we will not get info of the first exception. >> >> This is a bug on Python 2.6: >> http://bugs.python.org/issue7853 >> >> Reference: >> http://docs.python.org/2.7/library/stdtypes.html#context-manager-types >> >> Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> >> --- >> tests/utils.py | 15 ++++----------- >> 1 files changed, 4 insertions(+), 11 deletions(-) >> >> diff --git a/tests/utils.py b/tests/utils.py >> index debccfb..11c8bf4 100644 >> --- a/tests/utils.py >> +++ b/tests/utils.py >> @@ -128,21 +128,14 @@ class RollbackContext(object): >> return self >> >> def __exit__(self, exc_type, exc_value, traceback): >> - firstException = exc_value >> - >> for undo, args, kwargs in self._finally: >> try: >> undo(*args, **kwargs) >> except Exception as e: >> - # keep the earliest exception info >> - if not firstException: >> - firstException = e >> - # keep the original traceback info >> - traceback = sys.exc_info()[2] >> - >> - # re-raise the earliest exception >> - if firstException is not None: >> - raise firstException, None, traceback > I don't think the proper solution is to delete the ability to raise the > previous exception. To workaround the python bug you could just check > the type of exc_value and only raise if it's an Exception. If it's a > string you can just log it. not only string but also int. should we still consider this patch. or we will not give up to support RollbackContext on some distros? $ ./run_tests.sh test_utils FE ====================================================================== ERROR: test_path_permission (test_utils.searchPermissionTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/user/kimchi/tests/test_utils.py", line 145, in test_path_permission break File "/home/user/kimchi/tests/utils.py", line 177, in __exit__ raise firstException, None, traceback TypeError: exceptions must be old-style classes or derived from BaseException, not int > >> + traceback = sys.exc_info()[2] >> + raise e, None, traceback >> + >> + return False if exc_value is not None else True >> >> def defer(self, func, *args, **kwargs): >> self._finally.append((func, args, kwargs)) >> -- >> 1.7.7.6 >> >> -- >> project-kimchi mailing list <project-kimchi(a)googlegroups.com> >> https://groups.google.com/forum/#!forum/project-kimchi >> --- >> You received this message because you are subscribed to the Google Groups "project-kimchi" group. >> To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. >> >> -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

1 0

[kimchi-devel RFC] REST API for Permission check and fixes
by Royce Lv 16 Jan '14

16 Jan '14

User scenarios: Users may create template from ISOs from shallow/deep scan or from a user specified local path. Because kimchid runs as root and have access of most ISOs scanned. For qemu, however, the real user to start a vm, does not always have access of the ISO to install a vm. Under this circumstance, we need to denote that: 1. On scanning, indicate which ISOs may not be accessible by qemu user. 2. When create a template from an ISO which qemu does not have access , ask if user want to fix permission, if not, disable the template. 3. If user accept fix permission, change permission of template cdrom. Rest API will look like: 1. scanning and report GET /storagepools/pool-1/storagevolumes/iso-volume {'type': 'raw', 'path': '/home/i-am-an-iso.iso', 'accessible': False} 2. Create template POST /templates {'name': 'template-1' 'cdrom': 'a-b-c'} "a-b-c.iso" not accessible by qemu ----> {'name': 'template-1', 'status': 'disable'} NOTE: template in 'disable' status may because of any of its facility not active (storagepool, iso, network, etc) 3. Fix permission(Permission fix just open for template, we don't support fix for single volume/path temporarily) PUT /templates/t-1/cdrom {'accessible': True}

5 9

[RFC]: Use lxml to generate and manipulate XML documents
by Sheldon 16 Jan '14

16 Jan '14

As we all know there is a issue about generate and manipulate XML documents *https://github.com/kimchi-project/kimchi/issues/124* IMO, lxml is a good choice. you can see this patch: $ git show 69edfe9 Mark use it to generate XML documents. And for manipulate XML documents, here is a example. /$ ipython -c 'from lxml import objectify root = objectify.fromstring("<root><a k=\"key\">24.12.2000<b>12.24.2000</b></a></root>") print root.a print root.a.b print root.a.get("k") ' / /re//sult//: // //24.12.2000 // //12.24.2000 // //key / more info: http://lxml.de/ -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

6 6

ovirt mailbox continues to block mails
by Yu Xin Huo 16 Jan '14

16 Jan '14

Aline, I am focusing on patch review these days, but mail blocking issue is really troublesome. For a patchset, I can only see one of them. Hong Liang even did not get this patch at all. Please check why they are blocked and if it is due to mail size, please increase the upper limit of mail size.

3 2

[RFC] define REST API for guest Network Interfaces.
by Sheldon 16 Jan '14

16 Jan '14

now we have support network get/create/delete/activate/deactivate Now we need to support the attach/detach/ <https://github.com/kimchi-project/kimchi/wiki/customize-VM#organization-of-…> a Network to a guest. And get the info of Network attached to a guest. libvirt supports several types of network interfaces: 'bridge','network','user','ethernet','direct','hostdev','mcast', 'server', 'client' but there is not a unique "name" attribute for "interface" element.(more libvirt network interfaces info <http://libvirt.org/formatdomain.html#elementsNICS>) That is not good to define our REST API. But for "network" type resource, there is a "network" attribute of "source" resource. And the value of "network" attribute is the name of network that we defined by /networks POST method. the "network" type + "network" attribute is unique. We can define the Network Interfaces like this to support "network" type Interfaces: GET /vms/*name*/Interfaces?type=network&network="default" But this is not RESTFUL. Maybe We can also name a Network Interface by the Interface mac. The mac is unique. GET /vms/*name*/Interfaces/mac The best way for user is get the NICS name in guest. such as eth0, eth1.... GET /vms/*name*/Interfaces/eth0 GET /vms/*name*/Interfaces/eth1 But there is a problem, we need get the nic name and mac from guest. and Make a map in kimchi DB. also the nic name may change, we need make the map consistence with guest nic name. -- Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 3

Re: [Kimchi-devel] [WIP PATCH 0/2] Hosts Management & Host Repository Management
by Aline Manera 15 Jan '14

15 Jan '14

On 01/13/2014 05:43 AM, Hongliang Wang wrote: > On 01/10/2014 10:13 PM, Aline Manera wrote: >> >> Some comments: >> >> 1) Make sure to have Makefile.am files updated as you are adding new >> files > ACK >> >> 2) Always use 4 spaces for indentation > ACK >> >> 3) About API: >> - For federation: I suggest to use /peers instead of /hosts >> In addition to list, add, remove actions we also >> need a discover function to find the peers automatically for the user. >> - For host repositories: from the previous backend patches sent o >> former mail list, it should be /host/repositories instead of >> /repositories >> > ACK >> 4) About UI: >> I prefer to have the "Federation" section listed like the other ones. >> So, when opening the "Federation" section, we display a table >> (like those used) with peers information and actions buttons. > Peers are not in a subset of host, so they are not put in a > "Federation" Section like those used. > > What's more, we need a trade-off here. > > Federated peers are in the same level of localhost, that means peers > including current host are all within a tree structure with same level: > > - Federation > - localhost > - Peer 1 > - Peer 2 > - ... > > When clicking one of the federated peers, user will be guided to the > corresponding page of that peer. > > This leads to 2 types of design: > > 1) Flatten > > ====================================== > Kimchi Logo > _____________________________________________________________ > > Peers | Guests | Templates | Storage | Network > ___/\_________________________________________________________ > > localhost 0.0.0.0 1 VMs, 2 Templates, 3 Pools > > Peer 1 9.1.2.1 Go > > Peer 2 9.1.2.2 Go > > Peer 3 9.1.2.3 Go > > ====================================== > > 2) Hierarchy > > ========================================== > Kimchi Logo > ___________________________________________________________________ > (Floating Menu) | > Federated Peers | Host | Guests | Templates | Storage | Network > - localhost |___/\_____________________________________________ > - Peer 1 > | > - Peer 2 > | > - Peer 3 > | > ========================================== > > The difference between the 2 types is usage frequency of federated > peers. If the user jumps to other peers frequently, Option 1 is > better; otherwise, the user rarely jumps to other peers, Option 2 is > better. In this patch, user is supposed to rarely jump to other peers. > I'd say I prefer the option 2. That way we can have the host info in a tab and all the peers in a separated one. > Welcome more discussions. >> >> >> On 12/30/2013 05:57 AM, Hongliang Wang wrote: >>> Added federated hosts; >>> Added host repository management. >>> >>> There is a bug in kimchi.widget.Grid widget: when there are more >>> than one >>> Grid instances in the page, column resizing function will work >>> incorrectly. >>> I'll send another patch to fix it. >>> >>> Hongliang Wang (2): >>> Federated Hosts Management >>> Host Repositories Management UI >>> >>> src/kimchi/model.py | 1 + >>> ui/css/theme-default/host-add.css | 29 +++++++ >>> ui/css/theme-default/host-edit.css | 29 +++++++ >>> ui/css/theme-default/host.css | 80 +++++++++++++++--- >>> ui/css/theme-default/hosts.css | 24 ++++++ >>> ui/css/theme-default/repository-edit.css | 29 +++++++ >>> ui/css/theme-default/window.css | 6 +- >>> ui/images/theme-default/host-icon-sprite.png | Bin 1034 -> 1163 bytes >>> ui/js/src/kimchi.api.js | 110 >>> +++++++++++++++++++++++++ >>> ui/js/src/kimchi.grid.js | 2 +- >>> ui/js/src/kimchi.host.js | 93 >>> +++++++++++++++++++++ >>> ui/js/src/kimchi.host_add_main.js | 62 ++++++++++++++ >>> ui/js/src/kimchi.host_edit_main.js | 62 ++++++++++++++ >>> ui/js/src/kimchi.hosts.js | 116 >>> +++++++++++++++++++++++++++ >>> ui/js/src/kimchi.repository_edit_main.js | 62 ++++++++++++++ >>> ui/pages/guest-add.html.tmpl | 2 +- >>> ui/pages/guest-edit.html.tmpl | 2 +- >>> ui/pages/host-add.html.tmpl | 66 +++++++++++++++ >>> ui/pages/host-edit.html.tmpl | 66 +++++++++++++++ >>> ui/pages/hosts.html.tmpl | 41 ++++++++++ >>> ui/pages/i18n.html.tmpl | 16 ++++ >>> ui/pages/login-window.html.tmpl | 2 +- >>> ui/pages/report-add.html.tmpl | 2 +- >>> ui/pages/repository-edit.html.tmpl | 66 +++++++++++++++ >>> ui/pages/storagepool-add.html.tmpl | 2 +- >>> ui/pages/tabs/host.html.tmpl | 40 ++++++++- >>> ui/pages/template-add.html.tmpl | 2 +- >>> ui/pages/template-edit.html.tmpl | 2 +- >>> 28 files changed, 989 insertions(+), 25 deletions(-) >>> create mode 100644 ui/css/theme-default/host-add.css >>> create mode 100644 ui/css/theme-default/host-edit.css >>> create mode 100644 ui/css/theme-default/hosts.css >>> create mode 100644 ui/css/theme-default/repository-edit.css >>> create mode 100644 ui/js/src/kimchi.host_add_main.js >>> create mode 100644 ui/js/src/kimchi.host_edit_main.js >>> create mode 100644 ui/js/src/kimchi.hosts.js >>> create mode 100644 ui/js/src/kimchi.repository_edit_main.js >>> create mode 100644 ui/pages/host-add.html.tmpl >>> create mode 100644 ui/pages/host-edit.html.tmpl >>> create mode 100644 ui/pages/hosts.html.tmpl >>> create mode 100644 ui/pages/repository-edit.html.tmpl >>> >> >

1 0

[PATCH V6] Add nfs server and target UI in create storage pool
by zhoumeina 15 Jan '14

15 Jan '14

v5-v6 Fix bug in IE10. Fix bug in Firefox 17. v4-v5 Change some html nits. V3-V4 add value in jquery widget. move all storage all page style to css files. v2-v3 Make nfs server inputbox to combobox Edit jquery widgets to fix some small nits in it. change some parameter according to the changes from back end. v1-v2 Fix some bug in this patch, make it working and retest This patch is working adding a select box in create nfs pool, when user don't want to input the server ip or name, he can simply select "used the server I have used before" and choose a server in a select box, this is more convinent. In order to show server target I did a select box in UI, but sometimes maybe the export path number is large. So I made a filter-select widget to make user easier to choose the export path he want. This is the first jquery widget. And let us make all common widget to jquery widget from now on. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 28 ++++-- ui/css/theme-default/form.css | 6 ++ ui/css/theme-default/popover.css | 1 + ui/css/theme-default/storage.css | 29 ++++++- ui/js/Makefile.am | 4 +- ui/js/src/kimchi.api.js | 27 ++++++- ui/js/src/kimchi.popable.js | 2 +- ui/js/src/kimchi.storagepool_add_main.js | 65 +++++++++++--- ui/js/src/kimchi.utils.js | 11 +++ ui/js/widgets/combobox.js | 130 ++++++++++++++++++++++++++++ ui/js/widgets/filter-select.js | 139 ++++++++++++++++++++++++++++++ ui/js/widgets/select-menu.js | 86 ++++++++++++++++++ ui/pages/i18n.html.tmpl | 6 +- ui/pages/storagepool-add.html.tmpl | 59 +++++++------ 14 files changed, 538 insertions(+), 55 deletions(-) create mode 100644 ui/js/widgets/combobox.js create mode 100644 ui/js/widgets/filter-select.js create mode 100644 ui/js/widgets/select-menu.js diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index c7ed3f6..4d1a808 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -247,30 +247,38 @@ .btn-select { display: inline-block; position: relative; - height: 38px; + height: 30px; padding-right: 20px; - margin: 5px; vertical-align: top; -webkit-border-radius: 5px; -moz-border-radius: 5px; - border-radius: 5px; - background: #eee; - box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 2px 2px 2px rgba(0, 0, 0, .15) inset; + background: #fff; + box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 1px 1px 1px rgba(0, 0, 0, .15) inset; font-size: 13px; - line-height: 38px; + line-height: 30px; text-align: left; cursor: pointer; } -.btn-select .text { - padding: 0 10px; +.btn-select .input { + border: 0 solid #CCCCCC; + margin-right: 10px; + font-size: 16px; + height: 30px; + line-height: 30px; + width: 100%; + position: absolute; + padding: 0 5px; } +.btn-select input.invalid-field { + border: 1px solid #FF4444; +} .btn-select .arrow { position: absolute; width: 15px; - height: 38px; - line-height: 38px; + height: 30px; + line-height: 30px; top: 0; right: 5px; background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index 28e30a5..d1a3885 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -49,4 +49,10 @@ .form-section input.invalid-field[type="text"] { border-color: #FF4444; +} + +.text-help { + font-size: 12px; + color: #333; + margin: 0 0 5px 5px; } \ No newline at end of file diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 95eb183..e91ccc0 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -31,6 +31,7 @@ left: 0; display: none; cursor: default; + width: 100%; } .popover:BEFORE { diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index d81dc75..62e1540 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -529,7 +529,7 @@ width: 300px; display: inline-block; vertical-align: top; - padding: 5px 5px 5px 20px; + padding: 5px 5px 5px 22px; } .storage-type-wrapper-controls input[type="text"] { @@ -548,11 +548,36 @@ .storage-type-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 250px; + width: 150px; } .storage-type-wrapper-controls input[type="text"][disabled] { color: #bbb; background-color: #fafafa; cursor: not-allowed; +} + +.storage-add-input-width { + width: 285px; +} + +.form-section .storage-field { + overflow: visible; +} + +.storage-base-input-width { + width: 300px; +} + +.storage-window { + width: 600px; + height: 700px; +} + +.storage-port-width { + width:40px; +} + +.storage-auth-width { + width: 150px; } \ No newline at end of file diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 6808226..65254da 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = novnc -EXTRA_DIST = src +EXTRA_DIST = src widgets jsdir = $(datadir)/kimchi/ui/js @@ -31,7 +31,7 @@ dist_js_DATA = \ modernizr.custom.2.6.2.min.js \ $(NULL) -kimchi.min.js: src/*.js +kimchi.min.js: widgets/*.js src/*.js cat $(sort $^) > $@ CLEANFILES = kimchi.min.js diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index a4608ff..8d006d2 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -683,5 +683,30 @@ var kimchi = { success : suc, error : err }); + }, + + getStorageServers: function(type, suc, err) { + var url = kimchi.url + 'storageservers?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); + }, + + getStorageTargets: function(server,type, suc, err) { + var url = kimchi.url + 'storageservers/' + server + '/storagetargets?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); } -}; +}; \ No newline at end of file diff --git a/ui/js/src/kimchi.popable.js b/ui/js/src/kimchi.popable.js index 153d32c..2a843be 100644 --- a/ui/js/src/kimchi.popable.js +++ b/ui/js/src/kimchi.popable.js @@ -25,7 +25,7 @@ kimchi.popable = function() { $(document).on("click", ".popable", function(e) { var isOpen = $(this).hasClass('open'); $(".popable").removeClass('open'); - if (!isOpen) { + if (!isOpen && $(this).find('ul').html() !== '') { $(this).addClass('open'); } diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 24de979..a4d4648 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -23,12 +23,13 @@ kimchi.storagepool_add_main = function() { kimchi.initStorageAddPage(); $('#form-pool-add').on('submit', kimchi.addPool); - $('#form-nfs-pool-add').on('submit', kimchi.addnfsPool); $('#pool-doAdd').on('click', kimchi.addPool); - $('#pool-nfs-doAdd').on('click', kimchi.addnfsPool); }; kimchi.initStorageAddPage = function() { + $('#poolTypeId').selectMenu(); + $('#serverComboboxId').combobox(); + $('#targetFilterSelectId').filterselect(); var options = [ { label : "DIR", value : "dir" @@ -54,8 +55,53 @@ kimchi.initStorageAddPage = function() { }); $('.host-partition').html(listHtml); } - kimchi.select('storagePool-list', options); - $('#poolType').change(function() { + $('#poolTypeId').selectMenu("setData", options); + kimchi.getStorageServers('netfs', function(data) { + var serverContent = []; + if (data.length > 0) { + $.each(data, function(index, value) { + serverContent.push({ + label : value.addr, + value : value.addr + }); + }); + } + $('#serverComboboxId').combobox("setData", serverContent); + $('input[name=nfsServerType]').change(function() { + if ($(this).val() === 'input') { + $('#nfsServerInputDiv').removeClass('tmpl-html'); + $('#nfsServerChooseDiv').addClass('tmpl-html'); + } else { + $('#nfsServerInputDiv').addClass('tmpl-html'); + $('#nfsServerChooseDiv').removeClass('tmpl-html'); + } + }); + $('#nfsserverId').on("change",function() { + if ($(this).val() !== '' && kimchi.isServer($(this).val())) { + $('#nfspathId').prop('disabled',false); + $(this).removeClass("invalid-field"); + } else { + $(this).addClass("invalid-field"); + $('#nfspathId').prop( "disabled",true); + } + $('#targetFilterSelectId').filterselect('clear'); + }); + $('#nfspathId').focus(function() { + var targetContent = []; + kimchi.getStorageTargets($('#nfsserverId').val(), 'netfs', function(data) { + if (data.length > 0) { + $.each(data, function(index, value) { + targetContent.push({ + label : value.target, + value : value.target + }); + }); + } + $('#targetFilterSelectId').filterselect("setData", targetContent); + }); + }); + }); + $('#poolTypeInputId').change(function() { if ($(this).val() === 'dir') { $('.path-section').removeClass('tmpl-html'); $('.logical-section').addClass('tmpl-html'); @@ -93,7 +139,7 @@ kimchi.initStorageAddPage = function() { kimchi.validateForm = function() { var name = $('#poolId').val(); - var poolType = $("#poolType").val(); + var poolType = $("#poolTypeInputId").val(); if ('' === name) { kimchi.message.error(i18n['msg.pool.edit.name.blank']); return false; @@ -111,7 +157,6 @@ kimchi.validateForm = function() { } else { return kimchi.validateLogicalForm(); } - }; kimchi.validateDirForm = function () { @@ -162,11 +207,7 @@ kimchi.validateServer = function(serverField) { kimchi.message.error(i18n['msg.pool.edit.server.blank']); return false; } - var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}" - var ip = "(\\d{1,3}\.){3}\\d{1,3}" - regex = new RegExp('^' + domain + '|' + ip + '$') - - if (!regex.test(serverField)) { + if(!kimchi.isServer(serverField)) { kimchi.message.error(i18n['msg.validate.pool.edit.server']); return false; } @@ -186,7 +227,7 @@ kimchi.addPool = function(event) { if (kimchi.validateForm()) { var formData = $('#form-pool-add').serializeObject(); delete formData.authname; - var poolType = $("#poolType").val(); + var poolType = $('#poolTypeId').selectMenu('value'); if (poolType === 'dir') { formData.path = $('#pathId').val(); } else if (poolType === 'logical') { diff --git a/ui/js/src/kimchi.utils.js b/ui/js/src/kimchi.utils.js index a23bf51..3cf36b9 100644 --- a/ui/js/src/kimchi.utils.js +++ b/ui/js/src/kimchi.utils.js @@ -168,3 +168,14 @@ kimchi.isUnsignedNumeric = function(number) { var reg = /^d+(.d+)?$/ return reg.test(number); } + +kimchi.isServer = function(server) { + var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}"; + var ip = "(\\d{1,3}\.){3}\\d{1,3}"; + regex = new RegExp('^' + domain + '|' + ip + '$'); + if (!regex.test(server)) { + return false; + } else { + return true; + } +}; diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js new file mode 100644 index 0000000..2782f62 --- /dev/null +++ b/ui/js/widgets/combobox.js @@ -0,0 +1,130 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.combobox', { + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.target.width(this.selectDiv.width()+10); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function(options) { + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + if (options.length > 0) { + that.target.after($('<span class="arrow"></span>')); + that.listControl.on('click', itemTag, function(e) { + that.listControl.children().removeClass(selectedClass); + $(this).addClass(selectedClass); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if (oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + that.listControl.html(''); + var items = that._dataList(options); + $.each(items, function(index, item) { + that.listControl.append(item); + }) + }); + + that.target.keyup(function(event) { + that.listControl.html(''); + var items = that._dataList(options); + var temp = 0; + $.each(items, function(index, item) { + if (item.text().indexOf(that.target.val()) == 0) { + that.listControl.append(item); + temp++; + } + }); + if (temp > 0 && that.listControl.html() !== '') { + that._open(); + } else { + that._close(); + } + }); + } + }, + + value : function(value) { + if (value === undefined) { + return this.target.val(); + } + this.target.val(value); + }, + + _dataList : function(options) { + var item; + var itemTag = 'li'; + var selectedClass = 'active'; + var items = []; + var that = this; + $.each(options, function(index, option) { + item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); + item.data('value', option.value); + if (option.value === that.target.val()) { + item.addClass(selectedClass); + } + items.push(item); + }); + return items; + }, + + clear : function() { + this.target.val(""); + }, + + _open : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (!isOpen) { + this.selectDiv.addClass('open'); + } + }, + + _close : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (isOpen) { + this.selectDiv.removeClass('open'); + } + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover'); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js new file mode 100644 index 0000000..e636820 --- /dev/null +++ b/ui/js/widgets/filter-select.js @@ -0,0 +1,139 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.filterselect', { + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.target.width(this.selectDiv.width()+10); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function(options) { + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + if (options.length > 0) { + that.target.after($('<span class="arrow"></span>')); + that.listControl.on('click', itemTag, function(e) { + that.listControl.children().removeClass(selectedClass); + $(this).addClass(selectedClass); + that.target.val($(this).data('value')); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if (oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + that.listControl.html(''); + var items = that._dataList(options); + if (items.length === 0) { + that.listControl.html(i18n['msg.no.mapping.result']); + } else { + $.each(items, function(index, item) { + that.listControl.append(item); + }) + } + }); + + that.target.keyup(function(event) { + that.listControl.html(''); + var items = that._dataList(options); + var temp = 0; + $.each(items, function(index, item) { + if (item.text().indexOf(that.target.val()) == 0) { + that.listControl.append(item); + temp++; + } + }); + if (that.listControl.html() === '') { + that.target.addClass("invalid-field"); + that.listControl.html(i18n['msg.no.mapping.result']); + } else { + that.target.removeClass("invalid-field"); + } + if (temp > 0) { + that._open(); + } + }); + } + }, + + value : function(value) { + if (value === undefined) { + return this.target.val(); + } + this.target.val(value); + }, + + _dataList : function(options) { + var item; + var itemTag = 'li'; + var selectedClass = 'active'; + var items = []; + var that = this; + $.each(options, function(index, option) { + item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); + item.data('value', option.value); + if (option.value === that.target.val()) { + item.addClass(selectedClass); + } + items.push(item); + }); + return items; + }, + + clear : function() { + this.target.val(""); + }, + + _open : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (!isOpen) { + this.selectDiv.addClass('open'); + } + }, + + _close : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (isOpen) { + this.selectDiv.removeClass('open'); + } + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover') + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js new file mode 100644 index 0000000..c9a1b87 --- /dev/null +++ b/ui/js/widgets/select-menu.js @@ -0,0 +1,86 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +(function($) { + $.widget('kimchi.selectMenu', { + + _create : function() { + this.selectDiv = this.element; + this.listControl = this.selectDiv.find('ul').first(); + this.listControl.html(''); + this.target = this.selectDiv.find('input').first(); + this.label = this.selectDiv.find('span').first(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.target.addClass('input'); + this.label.addClass('input'); + this.listControl.addClass('select-list'); + this.listControl.parent().addClass('popover'); + }, + + setData : function (options) { + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + var item; + if (options.length > 0) { + $.each(options, function(index, option) { + item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); + item.data('value', option.value); + if(option.value === value) { + item.addClass(selectedClass); + that.label.text(option.label); + } + that.listControl.append(item); + }); + that.listControl.on('click', itemTag, function() { + that.listControl.children().removeClass(selectedClass); + $(this).addClass(selectedClass); + that.label.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if(oldValue !== newValue) { + that.target.change(); + } + }); + } else { + kimchi.message.error(i18n['selectmenu.data.error']); + } + }, + + value : function(data) { + if (data === undefined) { + return this.target.val(); + } + this.target.val(data.value); + this.label.val(data.label); + }, + + destroy : function() { + this.selectDiv.removeClass('btn-select dropdown popable'); + this.target.removeClass('input'); + this.label.removeClass('input'); + this.listControl.removeClass('select-list'); + this.listControl.parent().removeClass('popover'); + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 603f8d7..37b4114 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -122,7 +122,11 @@ var i18n = { " there, are you sure to continue? ")", 'msg.pool.edit.iscsitarget.blank': "$_("The iSCSI target can not be blank.")", 'msg.pool.edit.server.blank':"$_("Server name can not be blank.")", - 'msg.validate.pool.edit.server':"$_("This is not a valid Server Name or IP. please, modify it.")" + 'msg.validate.pool.edit.server':"$_("This is not a valid Server Name or IP. please, modify it.")", + 'select_default': "$_("Please choose")", + 'msg.no.mapping.result': "$_("No such data exsit.")", + 'msg.no.result' : "$_("No valid result")", + 'selectmenu.data.error' : "$_("options needed.")" }; </script> </body> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index e8dac43..714da3c 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -27,7 +27,7 @@ <!DOCTYPE html> <html> <body> - <div class="window" style="width: 600px; height: 700px;"> + <div class="window storage-window"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -40,18 +40,17 @@ <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" style="width: 300px" - name="name"> + <input id="poolId" required="required" type="text" class="text storage-base-input-width" name="name"> </div> </section> <section class="form-section"> <h2>2. $_("Storage Pool Type")</h2> <div class="storage-type-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="poolType" name="type" type="hidden" value="dir"/> - <span class="text" id="pool-type-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"> + <div id="poolTypeId"> + <input id="poolTypeInputId" name="type" type="hidden" value="dir"/> + <span id="pool-type-label"></span><span class="arrow"></span> + <div> + <ul id="storagePool-list"> </ul> </div> </div> @@ -65,30 +64,38 @@ $_("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" required="required" style="width: 300px"> + <input id="pathId" type="text" class="text storage-base-input-width"> </div> <div class="clear"></div> </section> </div> <div class="nfs-section tmpl-html"> <section class="form-section"> - <h2>3. $_("NFS server IP")</h2> - <div class="field"> + <h2>3. $_("NFS Server IP")</h2> + <div class="field storage-field"> <p class="text-help"> - $_("NFS server IP or hostname. It should not be empty.")</p> - <input id="nfsserverId" required="required" type="text" class="text" - style="width: 300px"> + $_("NFS server IP or hostname. It can be input or chosen from history.")</p> + <div id="serverComboboxId" class="storage-add-input-width"> + <input id="nfsserverId"/> + <div> + <ul id="nfs-server-used"> + </ul> + </div> + </div> </div> </section> <section class="form-section"> <h2>4. $_("NFS Path")</h2> - <div class="field"> - <p class="text-help">$_("The nfs exported path on nfs server")</p> - <input id="nfspathId" required="required" type="text" class="text" - style="width: 300px"> - <input type="hidden" id="localpathId" class="text" value="none"> - </div> - <div class="clear"></div> + <div class="field storage-field"> + <p class="text-help">$_("The nfs exported path on nfs server.")</p> + <div id="targetFilterSelectId" class="storage-add-input-width"> + <input id="nfspathId" class="input" disabled/> + <div> + <ul id="nfs-server-target"> + </ul> + </div> + </div> + </div> </section> </div> <div class="logical-section tmpl-html"> @@ -103,15 +110,15 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text" style="width: 300px"> - <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text" style="width:40px" maxlength='4'> + <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> <section class="form-section"> <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text" style="width: 300px"> + <input id="iscsiTargetId" type="text" class="text storage-base-input-width> </div> </section> <section class="form-section"> @@ -123,8 +130,8 @@ <section class="authenticationfield form-section tmpl-html"> <h2>5. $_("iSCSI Authentication")</h2> <div class="field"> - <input id="usernameId" placeholder="$_("User Name")" type="text" class="text" style="width: 150px"> - <input id="passwordId" placeholder="$_("Password")" type="text" class="text" style="width: 150px"> + <input id="usernameId" placeholder="$_("User Name")" type="text" class="text storage-auth-width"> + <input id="passwordId" placeholder="$_("Password")" type="text" class="text storage-auth-width"> </div> </section> </div> -- 1.7.1

2 1

[PATCH 0/5] cdrom: support add and query cdrom
by lvroyce＠linux.vnet.ibm.com 15 Jan '14

15 Jan '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add support for cdrom query and add a new cdrom: list: GET /vms/vm1/cdroms --> [{u'path': u'/home/royce/isorepo/Fedora-19-x86_64-DVD.iso', u'name': u'hdc'}] add: POST /vms/vm1/cdroms {'name':'hde', 'path': 'path-of-your-iso'} get detial: GET /vms/vm1/cdroms/hdc -->{u'path': u'/home/royce/isorepo/Fedora-19-x86_64-DVD.iso', u'name': u'hdc'} REF: https://github.com/kimchi-project/kimchi/wiki/customize-VM NOTE: Change media will be covered in cdrom update patch. This only covers query and add a new cdrom device. Royce Lv (5): cdrom: Update API.md for add cdrom and query cdrom cdrom: update controller cdrom: Add convinient functions to deal with xml parse cdrom: update model.py cdrom: Add model test to check cdrom operations docs/API.md | 15 ++++++++ src/kimchi/API.json | 16 +++++++++ src/kimchi/control/vms.py | 22 ++++++++++++ src/kimchi/model.py | 90 +++++++++++++++++++++++++++++++++++++++++++++-- src/kimchi/xmlutils.py | 5 +++ tests/test_model.py | 29 +++++++++++++++ 6 files changed, 175 insertions(+), 2 deletions(-) -- 1.8.1.2

4 16