December 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Fix for Multi-culture UI issues for kimchi plugin.
by rajgupta＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> 1. Fixed strings overlaps 2. Fixed button misalignments 3. Globalization text corrections Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- ui/css/kimchi.css | 156 +++++++++++++++++++++++---------- ui/css/src/modules/_edit-guests.scss | 32 +++++-- ui/css/src/modules/_guests.scss | 6 +- ui/css/src/modules/_network.scss | 4 + ui/css/src/modules/_storage.scss | 61 +++++++++---- ui/css/src/modules/_templates.scss | 19 ++-- ui/js/src/kimchi.guest_edit_main.js | 28 +++--- ui/js/src/kimchi.template_edit_main.js | 6 +- ui/pages/guest-edit.html.tmpl | 30 +++---- ui/pages/guest-storage-add.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 10 +++ ui/pages/tabs/guests.html.tmpl | 14 +-- ui/pages/tabs/storage.html.tmpl | 34 +++---- ui/pages/tabs/templates.html.tmpl | 24 ++--- ui/pages/template-edit.html.tmpl | 28 +++--- 15 files changed, 298 insertions(+), 156 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 1b2c1dd..64bae4f 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -506,7 +506,7 @@ #guest-content-container .wok-guest-gallery .wok-guest-list-item { padding: 0; - width: 240px; + width: 290px; height: 435px; display: inline-block; border: 0; @@ -620,7 +620,7 @@ padding-left: 20px; margin-right: 20px; display: block; - width: 220px; + width: 290px; white-space: nowrap; cursor: default; } @@ -671,7 +671,7 @@ } #guest-content-container .wok-guest-gallery .wok-guest-list-item .menu-flat { - width: 240px; + width: 290px; } #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn { @@ -1147,31 +1147,50 @@ body.wok-gallery { margin: 15px 0 0; } -#guest-edit-window form .header .column-actions, +#guest-edit-window form .header .cell.column-network { + display: inline-block; + overflow-x: hidden; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + /*width: 184px;*/ +} + +#guest-edit-window form .header, +#guest-edit-window form .header .cell.column-mac { + display: inline-block; + overflow-x: hidden; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + /*width: 174px;*/ +} + +#guest-edit-window form .column-actions, #guest-edit-window form .task .column-actions, #guest-edit-window form .body .column-actions { text-align: right; } -#guest-edit-window form .header .column-device, +#guest-edit-window form .column-device, #guest-edit-window form .task .column-device, #guest-edit-window form .body .column-device { width: 12.7%; } -#guest-edit-window form .header .column-path, +#guest-edit-window form .column-path, #guest-edit-window form .task .column-path, #guest-edit-window form .body .column-path { width: 60.25%; } -#guest-edit-window form .header .cell.column-network, +#guest-edit-window form .cell.column-network, #guest-edit-window form .task .cell.column-network, #guest-edit-window form .body .cell.column-network { - width: 18%; + width: 184px; } -#guest-edit-window form .header .cell.column-network > span, +#guest-edit-window form .cell.column-network > span, #guest-edit-window form .task .cell.column-network > span, #guest-edit-window form .body .cell.column-network > span { width: 100%; @@ -1180,74 +1199,77 @@ body.wok-gallery { overflow: hidden; } -#guest-edit-window form .header .cell.column-type, +#guest-edit-window form .cell.column-type, #guest-edit-window form .task .cell.column-type, #guest-edit-window form .body .cell.column-type { - width: 18%; + width: 184px; } -#guest-edit-window form .header .cell.column-mode, +#guest-edit-window form .cell.column-mode, #guest-edit-window form .task .cell.column-mode, #guest-edit-window form .body .cell.column-mode { - width: 16%; + width: 164px; } -#guest-edit-window form .header .cell.column-mac, +#guest-edit-window form .cell.column-mac, #guest-edit-window form .task .cell.column-mac, #guest-edit-window form .body .cell.column-mac { - width: 14%; + width: 174px; } -#guest-edit-window form .header .cell.column-ip, +#guest-edit-window form .cell.column-ip, #guest-edit-window form .task .cell.column-ip, #guest-edit-window form .body .cell.column-ip { - width: 12%; + width: 150px; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; } -#guest-edit-window form .header .cell.column-sel, +#guest-edit-window form .cell.column-sel, #guest-edit-window form .task .cell.column-sel, #guest-edit-window form .body .cell.column-sel { width: 1.77%; } -#guest-edit-window form .header .cell.column-snapshot-name, +#guest-edit-window form .cell.column-snapshot-name, #guest-edit-window form .task .cell.column-snapshot-name, #guest-edit-window form .body .cell.column-snapshot-name { width: 58%; } -#guest-edit-window form .header .cell.column-snapshot-created, +#guest-edit-window form .cell.column-snapshot-created, #guest-edit-window form .task .cell.column-snapshot-created, #guest-edit-window form .body .cell.column-snapshot-created { width: 16.5%; } -#guest-edit-window form .header .cell.column-pci-status, +#guest-edit-window form .cell.column-pci-status, #guest-edit-window form .task .cell.column-pci-status, #guest-edit-window form .body .cell.column-pci-status { width: 3.7%; } -#guest-edit-window form .header .cell.column-pci-status .fa, +#guest-edit-window form .cell.column-pci-status .fa, #guest-edit-window form .task .cell.column-pci-status .fa, #guest-edit-window form .body .cell.column-pci-status .fa { color: #8cc63f; font-size: 24px; } -#guest-edit-window form .header .cell.column-pci-name, +#guest-edit-window form .cell.column-pci-name, #guest-edit-window form .task .cell.column-pci-name, #guest-edit-window form .body .cell.column-pci-name { width: 21%; } -#guest-edit-window form .header .cell.column-product, +#guest-edit-window form .cell.column-product, #guest-edit-window form .task .cell.column-product, #guest-edit-window form .body .cell.column-product { width: 45%; } -#guest-edit-window form .header .cell.column-vendor, +#guest-edit-window form .cell.column-vendor, #guest-edit-window form .task .cell.column-vendor, #guest-edit-window form .body .cell.column-vendor { width: 24.1%; @@ -1612,7 +1634,7 @@ body.wok-gallery { #template-edit-window .template-edit-wrapper-controls { vertical-align: top; - width: 400px; + width: 480px; height: 35px; line-height: 35px; margin: 7px 0 8px; @@ -1722,15 +1744,15 @@ body.wok-gallery { } #template-edit-window .template-storage-cell.type { - width: 100px; + width: 110px; } #template-edit-window .template-storage-cell.disk { - width: 100px; + width: 133px; } #template-edit-window .template-storage-cell.format { - width: 250px; + width: 162px; } #template-edit-window .template-interface-cell.network { @@ -1899,6 +1921,10 @@ body.wok-gallery { } /* VM List View classes*/ +#templatestatusselect { + width: 240px !important; +} + #templates-root-container .grid-control input[type="text"] { height: 38px; display: inline-block; @@ -1985,6 +2011,10 @@ body.wok-gallery { border-bottom: none; border-top: 0; background-color: #fff; + width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } #templates-root-container .wok-vm-list .wok-vm-body { @@ -2004,6 +2034,7 @@ body.wok-gallery { font-size: 12.5pt; line-height: 2.42857; font-weight: 400; + width: 200px; } #templates-root-container .wok-vm-list .wok-vm-body .column-type { @@ -2058,7 +2089,7 @@ body.wok-gallery { } #templates-root-container .wok-vm-list .column-action { - width: 33.8000%; + width: 232px; } #templates-root-container .wok-vm-list .item-hidden { @@ -2281,6 +2312,10 @@ body.wok-gallery { display: block; } +#networkConfig .alert-dismissable .close, .alert-dismissible .close { + right: 7px !important; +} + #network-root-container .wok-nw-loading-icon { background: transparent url("../../../images/theme-default/spin5.svg") no-repeat 50% 50%; -webkit-animation: spin 3s infinite linear; @@ -2595,7 +2630,7 @@ body.wok-gallery { #storage-root-container .volumes .wok-gallery .volume-box-inner { padding: 0 16px; width: 409px; - height: 110px; + height: 150px; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -2657,13 +2692,17 @@ body.wok-gallery { #storage-root-container .volumes .wok-gallery span.column-format, #storage-root-container .volumes .wok-gallery span.column-type { order: 3; - width: 72px; + width: 142px; margin-top: -5px; } #storage-root-container .volumes .wok-gallery span.gallery-header { font-weight: 600; display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 90px; } #storage-root-container .volumes .wok-gallery span.column-progress { @@ -2754,7 +2793,7 @@ body.wok-gallery { @media (min-width: 992px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-format, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-format { - width: 95px; + width: 127px; } } @@ -2790,7 +2829,7 @@ body.wok-gallery { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-capacity, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-allocated, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-progress { - width: 95px; + width: 142px; } } @@ -2845,14 +2884,14 @@ body.wok-gallery { @media (min-width: 992px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 333px; + width: 250px; } } @media (min-width: 1200px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 444px; + width: 300px; } } @@ -2882,29 +2921,44 @@ body.wok-gallery { #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-state, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-state { - width: 3.0519%; + width: 2.0519%; text-align: center; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-name { - width: 12.7272%; + width: 126px; text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-type, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-type { - width: 11.6883%; + width: 101px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-location, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-location { - width: 21.4285%; + width: 171px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-usage, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-usage { - width: 9.41558%; + width: 152px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-usage .usage-icon, @@ -2933,23 +2987,35 @@ body.wok-gallery { #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-capacity, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-capacity { - width: 8.701298%; + width: 129px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-allocated, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-allocated { - width: 9.35064%; + width: 134px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-disks, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-disks { text-align: center; - width: 2.9870%; + width: 105px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } #storage-root-container .wok-datagrid > .wok-datagrid-header > span.column-action, #storage-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-action { - width: 20.64%; + width: 254px; text-align: right; } diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 6caa720..e3148bd 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -94,7 +94,24 @@ } form { margin: 15px 0 0; - .header, + .header{ + .cell.column-network{ + display: inline-block; + overflow-x: hidden; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + /*width: 184px;*/ + }, + .cell.column-mac{ + display: inline-block; + overflow-x: hidden; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + /*width: 174px;*/ + } + }, .task, .body { .column-actions { @@ -107,7 +124,7 @@ width: 60.25%; } .cell.column-network { - width: 18%; + width: 184px; > span { width: 100%; display: inline-block; @@ -116,16 +133,19 @@ } } .cell.column-type { - width: 18%; + width: 184px; } .cell.column-mode { - width: 16%; + width: 164px; } .cell.column-mac { - width: 14%; + width: 174px; } .cell.column-ip { - width: 12%; + width: 150px; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; } .cell.column-sel { width: 1.77%; diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 7893cb3..37654dd 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -223,7 +223,7 @@ } .wok-guest-list-item { padding: 0; - width: 240px; + width: 290px; height: 435px; display: inline-block; border: 0; @@ -323,7 +323,7 @@ padding-left: 20px; margin-right: 20px; display: block; - width: 220px; + width: 290px; white-space: nowrap; cursor: default; } @@ -366,7 +366,7 @@ background-repeat: no-repeat; } .menu-flat { - width: 240px; + width: 290px; } .btn { width: 100%; diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index b030ee4..12684ce 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -38,6 +38,10 @@ } +#networkConfig .alert-dismissable .close, .alert-dismissible .close{ + right: 7px !important; +} + #network-root-container { .wok-nw-loading-icon { diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index 0ccc816..70cb3fa 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -236,7 +236,7 @@ .volume-box-inner { padding: 0 16px; width: 409px; - height: 110px; + height: 150px; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -299,13 +299,17 @@ span.column-format, span.column-type { order: 3; - width: 72px; + width: 142px; margin-top: -5px; } span.gallery-header { font-weight: 600; display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 90px; } span.column-progress { @@ -406,7 +410,7 @@ > span.column-format { width: 57px; @media (min-width: $screen-md) { - width: 95px; + width: 127px; } @media (min-width: $screen-lg) { left: 173px; @@ -421,7 +425,7 @@ width: 79px; text-transform: capitalize; @media (min-width: $screen-md) { - width: 95px; + width: 142px; } @media (min-width: $screen-lg) { left: 165px; @@ -449,10 +453,10 @@ > span.column-name { width: 202px; @media (min-width: $screen-md) { - width: 333px; + width: 250px; } @media (min-width: $screen-lg) { - width: 444px; + width: 300px; } label { @@ -485,21 +489,36 @@ .wok-datagrid > .wok-datagrid-header, .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row { > span.column-state { - width: 3.0519%; + width: 2.0519%; text-align: center; } > span.column-name { - width: 12.7272%; + width: 126px; text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-type { - width: 11.6883%; + width: 101px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-location { - width: 21.4285%; + width: 171px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-usage { - width: 9.41558%; + width: 152px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; .usage-icon { padding-left: 35px; display: inline-block; @@ -518,17 +537,29 @@ } } > span.column-capacity { - width: 8.701298%; + width: 129px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-allocated { - width: 9.35064%; + width: 134px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-disks { text-align: center; - width: 2.9870%; + width: 105px; + text-overflow: ellipsis; + display: inline-block; + white-space: nowrap; + overflow: hidden !important; } > span.column-action { - width: 20.64%; + width: 254px; text-align: right; } } diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index f72efe9..c5d727e 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -77,7 +77,7 @@ $kimchi-icon-path: '../images'; } .template-edit-wrapper-controls { vertical-align: top; - width: 400px; + width: 480px; height: 35px; line-height: 35px; margin: 7px 0 8px; @@ -167,13 +167,13 @@ $kimchi-icon-path: '../images'; width: 180px !important; } .template-storage-cell.type { - width: 100px; + width: 110px; } .template-storage-cell.disk { - width: 100px; + width: 133px; } .template-storage-cell.format { - width: 250px; + width: 162px; } .template-interface-cell.network { width: 220px; @@ -318,7 +318,9 @@ $kimchi-icon-path: '../images'; /* VM List View classes*/ - +#templatestatusselect{ + width: 240px !important; +} #templates-root-container { .grid-control input[type="text"] { height: 38px; @@ -390,6 +392,10 @@ $kimchi-icon-path: '../images'; border-bottom: none; border-top: 0; background-color: $table-bg; + width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } .wok-vm-body { @@ -406,6 +412,7 @@ $kimchi-icon-path: '../images'; font-size: 12.5pt; line-height: (1 + $line-height-base); font-weight: 400; + width: 200px; } .column-type { padding-left: 40px !important; @@ -450,7 +457,7 @@ $kimchi-icon-path: '../images'; width: 1.6900%; } .column-action { - width: 33.8000%; + width: 232px; } .item-hidden { display: none !important; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 7667fad..bb82077 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -341,13 +341,13 @@ kimchi.guest_edit_main = function() { case 'ovs' : $("#label-type-" + data.id, item).text(result.type); $("#label-network-" + data.id, item).text(result.source); - $("#label-mode-" + data.id, item).text('None'); + $("#label-mode-" + data.id, item).text(i18n['KCHVMED6018M']); break; case 'network' : $("#label-type-" + data.id, item).text(result.type); $("#label-network-" + data.id, item).text(result.network); - $("#label-mode-" + data.id, item).text('None'); + $("#label-mode-" + data.id, item).text(i18n['KCHVMED6018M']); break; } @@ -397,7 +397,7 @@ kimchi.guest_edit_main = function() { break; case 'ovs': - $('#label-mode-' + data.id).html('None'); + $('#label-mode-' + data.id).html(i18n['KCHVMED6018M']); $('#label-mode-' + data.id).removeClass('hide'); $('span.column-mode .bootstrap-select', itemNode).toggleClass("hide", true); @@ -405,7 +405,7 @@ kimchi.guest_edit_main = function() { $("span.column-network select", itemNode).selectpicker('refresh'); break; case 'network': - $('#label-mode-' + data.id).html('None'); + $('#label-mode-' + data.id).html(i18n['KCHVMED6018M']); $('#label-mode-' + data.id).removeClass('hide'); $('span.column-mode .bootstrap-select', itemNode).toggleClass("hide", true); @@ -470,14 +470,14 @@ kimchi.guest_edit_main = function() { $('#form-guest-edit-interface > div.s390x').show(); var typeOptionsdata = [{ - label: "macvtap", - value: "macvtap" + label: i18n['KCHVMED6013M'], + value: 'macvtap' }, { - label: "ovs", - value: "ovs" + label: i18n['KCHVMED6014M'], + value: 'ovs' }, { - label: "network", - value: "network" + label: i18n['KCHVMED6015M'], + value: 'network' }]; var typeOptions = ''; @@ -487,11 +487,11 @@ kimchi.guest_edit_main = function() { } var modeOptionsdata = [{ - label: "Bridge", - value: "bridge" + label: i18n['KCHVMED6016M'], + value: 'bridge' }, { - label: "Vepa", - value: "vepa" + label: i18n['KCHVMED6017M'], + value: 'vepa' }]; var modeOptions = ''; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 414a108..05bf1f4 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -616,9 +616,9 @@ kimchi.template_edit_main = function() { //initialize type option var typeOptionsdata = {}; var typeOptions = ''; - typeOptionsdata.macvtap = 'macvtap'; - typeOptionsdata.ovs = 'ovs'; - typeOptionsdata.network = 'network'; + typeOptionsdata.macvtap = i18n['KCHTMPL6009M']; + typeOptionsdata.ovs = i18n['KCHTMPL6010M']; + typeOptionsdata.network = i18n['KCHTMPL6011M']; $.each(typeOptionsdata, function(key, value) { if (value === networkData.type) { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 9dd0c8f..09a2ac4 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> -<div id="guest-edit-window" class="window modal-content"> +<div id="guest-edit-window" class="window modal-content" style="width:1280px; right:80px;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">$_("Edit Guest")</h4> @@ -63,7 +63,7 @@ </div> <div class="form-group" id="guest-console-panel" style="display:none;"> <label for="guest-edit-console">$_("Console")</label> - <select id="guest-edit-console" name="console" class="form-control"> + <select id="guest-edit-console" data-none-selected-text="$_("Nothing selected")" name="console" class="form-control"> <option value="sclp">$_("sclp")</option> <option value="virtio">$_("virtio")</option> </select> @@ -83,18 +83,18 @@ <form role="tabpanel" class="guest-edit-interface tab-pane" id="form-guest-edit-interface"> <button class="add btn btn-primary"><i class="fa fa-plus-circle"></i>$_("Add")</button> <div class="header"> - <span class="cell column-network">$_("Network")</span> - <span class="cell column-type">$_("Type")</span> - <span class="cell column-mac">$_("MAC Address")</span> - <span class="cell column-ip">$_("IP Address")</span> + <span class="cell column-network" data-toggle="tooltip" title="$_('Network')">$_("Network")</span> + <span class="cell column-type" data-toggle="tooltip" title="$_('Type')">$_("Type")</span> + <span class="cell column-mac" data-toggle="tooltip" title="$_('MAC Address')">$_("MAC Address")</span> + <span class="cell column-ip" data-toggle="tooltip" title="$_('IP Address')">$_("IP Address")</span> <span class="cell column-actions"><span class="sr-only">$_("Actions")</span></span> </div> <div class="header s390x" style="display:none"> - <span class="cell column-type">$_("Type")</span> - <span class="cell column-network">$_("Network/Interface")</span> - <span class="cell column-mode">$_("Mode")</span> - <span class="cell column-mac">$_("MAC Address")</span> - <span class="cell column-ip">$_("IP Address")</span> + <span class="cell column-type" data-toggle="tooltip" title="$_('Type')">$_("Type")</span> + <span class="cell column-network" data-toggle="tooltip" title="$_('Network/Interface')">$_("Network/Interface")</span> + <span class="cell column-mode" data-toggle="tooltip" title="$_('Mode')">$_("Mode")</span> + <span class="cell column-mac" data-toggle="tooltip" title="$_('MAC Address')">$_("MAC Address")</span> + <span class="cell column-ip" data-toggle="tooltip" title="$_('IP Address')">$_("IP Address")</span> <span class="cell column-actions"><span class="sr-only">$_("Actions")</span></span> </div> <div class="body"></div> @@ -272,7 +272,7 @@ <div class="item" id="{mac}"> <span class="cell column-network"> <span id="label-network-{id}" class="{viewMode}">{network}</span> - <select class="{editMode}"></select> + <select class="{editMode}" data-none-selected-text="$_("Nothing selected")"></select> </span> <span class="cell column-type"> {type} @@ -299,15 +299,15 @@ <div class="item" id="{mac}"> <span class="cell column-type"> <span id="label-type-{id}" class="{viewMode}">{type}</span> - <select id="interface-s390x-type-{id}" class="{editMode}"></select> + <select id="interface-s390x-type-{id}" data-none-selected-text="$_("Nothing selected")" class="{editMode}"></select> </span> <span class="cell column-network"> <span id="label-network-{id}" class="{viewMode}">{network}{source}</span> - <select id="interface-s390x-network-{id}" class="{editMode}"></select> + <select id="interface-s390x-network-{id}" data-none-selected-text="$_("Nothing selected")" class="{editMode}"></select> </span> <span class="cell column-mode"> <span id="label-mode-{id}" class="{viewMode}">{mode}</span> - <select id="interface-s390x-mode-{id}" class="{editMode}"></select> + <select id="interface-s390x-mode-{id}" data-none-selected-text="$_("Nothing selected")" class="{editMode}"></select> </span> <span class="cell column-mac"> <span id="label-mac-{id}" class="{viewMode}">{mac}</span> diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index dad3c3b..3b60b14 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -95,7 +95,7 @@ </div> <div class="form-group volume"> <label>$_("Storage Volume")</label> - <select id="guest-disk-vol" class="selectpicker col-md-12 col-lg-12"> + <select id="guest-disk-vol" data-none-selected-text="$_("Nothing selected")" class="selectpicker col-md-12 col-lg-12"> </select> <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage volume to be attached")</p> </div> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index cd23fcb..4510921 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -54,6 +54,9 @@ "KCHTMPL6006M": "$_("Not Available")", "KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", "KCHTMPL6008M": "$_("Please check the invalid Storage Pools or Paths")", + "KCHTMPL6009M": "$_("macvtap")", + "KCHTMPL6010M": "$_("ovs")", + "KCHTMPL6011M": "$_("network")", "KCHVM6001M": "$_("This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "KCHVM6002M": "$_("Power off Confirmation")", @@ -90,6 +93,13 @@ "KCHVMED6010M": "$_("Successfully attached device to VM")", "KCHVMED6011M": "$_("Successfully detached device from VM")", "KCHVMED6012M": "$_("Following devices will be affected, confirm?")", + "KCHVMED6013M": "$_("macvtap")", + "KCHVMED6014M": "$_("ovs")", + "KCHVMED6015M": "$_("network")", + "KCHVMED6016M": "$_("Bridge")", + "KCHVMED6017M": "$_("Vepa")", + "KCHVMED6018M": "$_("None")", + "KCHNET6001M": "$_("unavailable")", "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")", diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 37c9ce2..5d49e1c 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -50,13 +50,13 @@ <ul class="wok-guest-list"> <li class="wok-guest-list-header"> <span class="column-state"><span class="sr-only">$_("State")</span></span><span class="column-name"><span>$_("Guest Name ID")</span></span><span class="column-type"><span>$_("OS Type")</span></span><span class="column-vnc"><span>$_("VNC")</span></span><span class="column-processors"><span>$_("Processors Utilization")</span></span><span class="column-memory"><span>$_("Memory Utilization")</span></span><span class="column-storage"><span>$_("Storage I/O")</span></span><span class="column-network"><span>$_("Network I/O")</span></span><span class="column-name"><span data-toggle="tooltip" title="$_('Guest Name ID')">$_("Guest Name ID")</span></span><span class="column-type"><span data-toggle="tooltip" title="$_('OS Type')">$_("OS Type")</span></span><span class="column-vnc"><span data-toggle="tooltip" title="$_('VNC')">$_("VNC")</span></span><span class="column-processors"><span data-toggle="tooltip" title="$_('Processors Utilization')">$_("Processors Utilization")</span></span><span class="column-memory"><span data-toggle="tooltip" title="$_('Memory Utilization')">$_("Memory Utilization")</span></span><span class="column-storage"><span data-toggle="tooltip" title="$_('Storage I/O')">$_("Storage I/O")</span></span><span class="column-network"><span data-toggle="tooltip" title="$_('Network I/O')">$_("Network I/O")</span></span><span class="column-action" style="display:none"> <span class="sr-only">$_("Actions")</span></span> diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 5468138..7c1ed39 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -41,13 +41,13 @@ <div id='storageGrid' class="hidden"> <div> <span class="column-state"><span class="sr-only">$_("State")</span></span><span class="column-name">$_("Name")</span><span class="column-type">$_("Type")</span><span class="column-location">$_("Location")</span><span class="column-usage">$_("%Used")</span><span class="column-allocated">$_("Allocated")</span><span class="column-capacity">$_("Capacity")</span><span class="column-disks">$_("Disks")</span><span class="column-name" data-taggle="tooltip" title="$_('Name')">$_("Name")</span><span class="column-type" data-taggle="tooltip" title="$_('Type')">$_("Type")</span><span class="column-location" data-taggle="tooltip" title="$_('Location')">$_("Location")</span><span class="column-usage" data-taggle="tooltip" title="$_('%Used')">$_("%Used")</span><span class="column-allocated" data-taggle="tooltip" title="$_('Allocated')">$_("Allocated")</span><span class="column-capacity" data-taggle="tooltip" title="$_('Capacity')">$_("Capacity")</span><span class="column-disks" data-taggle="tooltip" title="$_('Disks')">$_("Disks")</span><span class="column-action" display="none"><span class="sr-only">$_("Actions")</span></span> </div> <div id="storagepoolsList" class="list-storage empty-when-logged-off"></div> @@ -87,8 +87,8 @@ <span class='column-state' val="{state}"><span class='storage-state {state}'><i class="fa fa-power-off"></i></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-location' val="{path}">{path}</span><span class='column-usage {state}' val="{usage}" ><span class='usage-icon {icon}'>{usage}</span>%</span><span class='column-location' title="{path}" val="{path}">{path}</span><span class='column-usage {state}' val="{usage}" ><span class='usage-icon {icon}'>{usage}</span>$_("%")</span><span class='column-allocated' val="{allocated}">{allocated}</span><span class='column-capacity' val="{capacity}">{capacity}</span><span class="column-disks {state}"><div class="handle arrow-down"></div></span></span><span class="column-format volume-format-filter"><span class="gallery-header">$_('Format')</span><span class="format-text">{format}</span></span><span class="column-type volume-type-filter"><span class="gallery-header">$_('Type')</span>{type}</span><span class="column-format volume-format-filter"><span class="gallery-header" title="$_('Format')">$_('Format')</span><span class="format-text">{format}</span></span><span class="column-type volume-type-filter"><span class="gallery-header" title="$_('Type')">$_('Type')</span>{type}</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-allocated"><span class="gallery-header">$_('Allocation')</span>{allocation}</span><span class="column-capacity"><span class="gallery-header">$_('Capacity')</span>{capacity}</span><span class="column-allocated"><span class="gallery-header" title="$_('Allocation')">$_('Allocation')</span>{allocation}</span><span class="column-capacity"><span class="gallery-header" title="$_('Capacity')">$_('Capacity')</span>{capacity}</span><span class="column-progress hidden"><span class="progress-status"></span> <span class="progress-transferred"></span> </span> </div> diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 2207292..f947bc9 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -37,15 +37,15 @@ </div> <div class="form-group pull-right"> - <div class="btn-group bootstrap-select control"> - <button type="button" class="btn dropdown-toggle form-control selectpicker btn-default sort-button" data-toggle="dropdown" title="Status" aria-expanded="false"><span class="filter-option pull-left">$_("Status")</span> <span class="caret"></span></button> + <div class="btn-group bootstrap-select control" id="templatestatusselect"> + <button type="button" class="btn dropdown-toggle form-control selectpicker btn-default sort-button" data-toggle="dropdown" aria-expanded="false"><span class="filter-option pull-left" data-placement="auto bottom" data-toggle="tooltip" title="$_('Status')">$_("Status")</span> <span class="caret"></span></button> <div class="dropdown-menu open" style="max-height: 668px; overflow: hidden; min-height: 0px;padding: 0px;"> <ul class="dropdown-menu inner selectpicker" role="menu" style="max-height: 656px; overflow-y: auto; min-height: 0px;"> - <li nwAct="sort"><a href="#" class="sort" data-sort="name-filter">$_("Name")</a></li> - <li nwAct="clone"><a href="#" class="sort" data-sort="os-type-filter">$_("OS")</a></li> - <li nwAct="clone"><a href="#" class="sort" data-sort="os-version-filter">$_("Version")</a></li> - <li nwAct="clone"><a href="#" class="sort" data-sort="cpus-filter">$_("Current CPUs")</a></li> - <li nwAct="clone"><a href="#" class="sort" data-sort="memory-filter">$_("Memory")</a></li> + <li nwAct="sort"><a href="#" class="sort" data-sort="name-filter" data-placement="auto bottom" data-toggle="tooltip" title="$_('Name')">$_("Name")</a></li> + <li nwAct="clone"><a href="#" class="sort" data-sort="os-type-filter" data-placement="auto bottom" data-toggle="tooltip" title="$_('OS')">$_("OS")</a></li> + <li nwAct="clone"><a href="#" class="sort" data-sort="os-version-filter" data-placement="auto bottom" data-toggle="tooltip" title="$_('Version')">$_("Version")</a></li> + <li nwAct="clone"><a href="#" class="sort" data-sort="cpus-filter" data-placement="auto bottom" data-toggle="tooltip" title="$_('Current CPUs')">$_("Current CPUs")</a></li> + <li nwAct="clone"><a href="#" class="sort" data-sort="memory-filter" data-placement="auto bottom" data-toggle="tooltip" title="$_('Memory')">$_("Memory")</a></li> </ul> </div> </div> @@ -57,11 +57,11 @@ <div id="alert-container"></div> <ul id="templates-grid" class="wok-vm-list hidden empty-when-logged-off"> <li class="wok-vm-header"> - <span class="column-name">$_("Template Name (ID)")</span><span class="column-type">$_("OS")</span><span class="column-version">$_("Version")</span><span class="column-processors">$_("Current CPUs")</span><span class="column-memory">$_("Memory")</span><span class="column-type" data-placement="auto bottom" data-toggle="tooltip" title="$_('OS')">$_("OS")</span><span class="column-version" data-placement="auto bottom" data-toggle="tooltip" title="$_('Version')">$_("Version")</span><span class="column-processors" data-placement="auto bottom" data-toggle="tooltip" title="$_('Current CPUs')">$_("Current CPUs")</span><span class="column-memory" data-placement="auto bottom" data-toggle="tooltip" title="$_('Memory')">$_("Memory")</span><span class="column-action" style="display:none"><span class="sr-only">$_("Actions")</span></span> </li> <li> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 728ce6d..4b5a407 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -218,13 +218,13 @@ <span class="template-storage-cell source" style="display:none"> <input class="template-storage-source" value={storageSource} type="text" style="display:none" /> <select id="source"> - <option value="pool">pool</option> - <option value="path">path</option> + <option value="pool">$_("pool")</option> + <option value="path">$_("path")</option> </select> </span> <span class="template-storage-cell storage-pool"> <input class="template-storage-name" value="{storageName}" type="text" style="display:none" /> - <select id="selectStorageName-{storageIndex}" class="selectStorageName"></select> + <select id="selectStorageName-{storageIndex}" data-none-selected-text="$_('Nothing selected')" class="selectStorageName"></select> </span> <span class="template-storage-cell storage-path" style="display:none"> <input class="template-storage-path storage-path form-control" value="{storagePath}" type="text" /> @@ -238,12 +238,12 @@ <span class="template-storage-cell format"> <input class="template-storage-disk-format" value={storageDiskFormat} type="text" style="display:none" /> <select id="diskFormat"> - <option value="qcow2">qcow2</option> - <option value="raw">raw</option> - <option value="qcow">qcow</option> - <option value="qed">qed</option> - <option value="vmdk">vmdk</option> - <option value="vpc">vpc</option> + <option value="qcow2">$_("qcow2")</option> + <option value="raw">$_("raw")</option> + <option value="qcow">$_("qcow")</option> + <option value="qed">$_("qed")</option> + <option value="vmdk">$_("vmdk")</option> + <option value="vpc">$_("vpc")</option> </select> </span> <span class="pull-right"> @@ -254,7 +254,7 @@ <script id="template-interface-tmpl" type="text/html"> <div class="item" id={networkID}> <span class="template-interface-cell network"> - <select></select> + <select data-none-selected-text="$_('Nothing selected')"></select> </span> <span class="template-interface-cell type"> <input value={type} readonly=true class="form-control" type="text" /> @@ -270,13 +270,13 @@ <select></select> </span> <span class="template-interface-cell network"> - <select></select> + <select data-none-selected-text="$_('Nothing selected')"></select> </span> <span class="template-interface-cell mode"> - <span class="label-mode hide">None</span> + <span class="label-mode hide">$_("None")</span> <select> - <option value="bridge">bridge</option> - <option value="vepa">vepa</option> + <option value="bridge">$_("bridge")</option> + <option value="vepa">$_("vepa")</option> </select> </span> <span class="pull-right"> -- 2.1.0

4 3

[PATCH v2][Wok] Bug fix #185: make rpm fails on CentOS when firewalld isn't installed
by Ramon Medeiros 13 Dec '16

13 Dec '16

Add firewalld as build requirement in all distros Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Based on origin/stable-2.3.x contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index fdf3484..057d585 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -20,6 +20,7 @@ Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts Requires: logrotate +BuildRequires: firewalld BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 70c295b..8267f3e 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -21,6 +21,7 @@ Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts Requires: logrotate +BuildRequires: firewalld BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 260390e..fa99f30 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -20,7 +20,7 @@ Build Dependencies -------------------- $ sudo yum install gcc make autoconf automake gettext-devel git rpm-build \ - libxslt + libxslt firewalld Runtime Dependencies -------------------- diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 7fe1763..ad4ed92 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo zypper install gcc make autoconf automake gettext-tools git \ - rpm-build libxslt-tools + rpm-build libxslt-tools firewalld Runtime Dependencies -------------------- -- 2.7.4

2 1

[PATCH] [Kimchi] Add missing dependency to documentation
by Lucio Correia 13 Dec '16

13 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/ubuntu-deps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md index b0b1562..f88eb51 100644 --- a/docs/ubuntu-deps.md +++ b/docs/ubuntu-deps.md @@ -20,7 +20,7 @@ Runtime Dependencies python-ethtool sosreport python-ipaddr \ python-lxml open-iscsi python-guestfs \ libguestfs-tools spice-html5 python-magic \ - python-paramiko + python-paramiko python-imaging Packages required for UI development ------------------------------------ -- 2.7.4

2 1

[PATCH] [Kimchi] Add more details to error message when probing image
by Lucio Correia 13 Dec '16

13 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 2 +- imageinfo.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n.py b/i18n.py index 4a754b6..6b4b126 100644 --- a/i18n.py +++ b/i18n.py @@ -54,7 +54,7 @@ messages = { "Details: %(err)s" ), "KCHISO0009E": _("Unable to access remote ISO. Details: %(err)s"), - "KCHIMG0001E": _("An error occurred when probing image OS information."), + "KCHIMG0001E": _("Error probing image OS information: %(err)s"), "KCHIMG0003E": _("Unable to read image file %(filename)s"), "KCHIMG0004E": _("Image file must be an existing file on system. %(filename)s is not a valid input."), diff --git a/imageinfo.py b/imageinfo.py index 30c08ae..1328945 100644 --- a/imageinfo.py +++ b/imageinfo.py @@ -55,8 +55,8 @@ def probe_image(image_path): roots = g.inspect_os() except ImportError: return ("unknown", "unknown") - except: - raise ImageFormatError("KCHIMG0001E") + except Exception, e: + raise ImageFormatError("KCHIMG0001E", {'err': str(e)}) if len(roots) == 0: # If we are unable to detect the OS, still add the image -- 2.7.4

2 1

[PATCH] [Kimchi] Bug fix #1066: Do not stora guest storage volume information on objectstore
by Aline Manera 13 Dec '16

13 Dec '16

Since commit 2e111ef4 the storage volume used by each guest is not stored on objectstore. So we can safely remove any update about that information from code. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/vms.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/model/vms.py b/model/vms.py index d703c89..7dfec30 100644 --- a/model/vms.py +++ b/model/vms.py @@ -481,11 +481,6 @@ class VMModel(object): all_paths = xpath_get_text(xml, XPATH_DOMAIN_DISK) vir_conn = self.conn.get() - - def _delete_disk_from_objstore(path): - with self.objstore as session: - session.delete('storagevolume', path) - domain_name = xpath_get_text(xml, XPATH_DOMAIN_NAME)[0] for i, path in enumerate(all_paths): @@ -556,13 +551,6 @@ class VMModel(object): xml = xml_item_update(xml, XPATH_DOMAIN_DISK_BY_FILE % path, new_vol['path'], 'file') - # set the new disk's used_by - with self.objstore as session: - session.store('storagevolume', new_vol['path'], - {'used_by': [domain_name]}, - get_kimchi_version()) - rollback.prependDefer(_delete_disk_from_objstore, new_vol['path']) - # remove the new volume should an error occur later rollback.prependDefer(self.storagevolume.delete, new_pool_name, new_vol_name) @@ -1476,10 +1464,6 @@ class VMModel(object): pool_type = xpath_get_text(xml, "/pool/@type")[0] if pool_type not in READONLY_POOL_TYPE: vol.delete(0) - # Update objstore to remove the volume - with self.objstore as session: - session.delete('storagevolume', path, - ignore_missing=True) except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) -- 2.7.4

2 2

[PATCH][Wok] Bug fix #168: check_ui_code_errors.sh not found by make check on dist tarball (RHEL 7.2)
by Ramon Medeiros 13 Dec '16

13 Dec '16

Some files were not being added to dist tar.gz. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2d55be3..f770043 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,8 @@ EXTRA_DIST = \ CONTRIBUTE.md \ VERSION \ build-aux/pkg-version \ + check_ui_code_errors.sh \ + check_spec_errors.sh \ $(NULL) -- 2.7.4

3 2

[PATCH][Wok] Bug fix #186: make check-local fails inside tarball
by Ramon Medeiros 13 Dec '16

13 Dec '16

I18N_FILES was pointing to i18n.py at plugins, which are not available when running wok from tar.gz. Switching to i18n present at src/wok, the code can be run. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index bd7a563..2d55be3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,9 +42,7 @@ PEP8_BLACKLIST = *src/wok/plugins,*src/wok/config.py,*src/wok/i18n.py,*tests/tes SKIP_PYFLAKES_ERR = "\./src/wok/websocket\.py" -I18N_FILES = src/wok/plugins/*/i18n.py \ - src/wok/i18n.py \ - $(NULL) +I18N_FILES = src/wok/i18n.py $(NULL) check-local: PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES) -- 2.7.4

3 2

[PATCH v2] [WoK] Bug fix #187
by dhbarboza82＠gmail.com 13 Dec '16

13 Dec '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - patch reworked with the review comments of v1 Daniel Henrique Barboza (1): Bug fix #187: wok.main.js: parseTabs does not consider 'none' mode tabs ui/js/src/wok.main.js | 144 ++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 69 deletions(-) -- 2.7.4

2 2

[PATCH] [Wok] Issue #190: No activity logging is shown and its break if any one entry in activity log does not have proper key
by archus＠linux.vnet.ibm.com 13 Dec '16

13 Dec '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Currently activity logs breaks in UI, if an error code is changed with additional parameter. For example an error code does not have any parameter and its logged in user-requests.data with params as empty. And however same error code is changed to have a parameter, and hence while parsing activity log it is expected to have parameter in params. Due to which parsing fails with KeyError. This fix handle the KeyError and in case of KeyError the error message will be shown without replacing the parameter with its value. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/message.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wok/message.py b/src/wok/message.py index ff4cbc9..460d90d 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -86,7 +86,10 @@ class WokMessage(object): def get_text(self, prepend_code=True, translate=True): msg = self._get_text(translate) - msg = decode_value(msg) % self.args + try: + msg = decode_value(msg) % self.args + except KeyError: + msg = decode_value(msg) if prepend_code: return "%s: %s" % (self.code, msg) -- 2.7.4

3 2

[PATCH][Wok] Bug fix #185: make rpm fails on CentOS when firewalld isn't installed
by Ramon Medeiros 13 Dec '16

13 Dec '16

Add firewalld as build requirement in all distros Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 48492ea..0119381 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -21,6 +21,7 @@ Requires: fontawesome-fonts Requires: open-sans-fonts Requires: logrotate Requires: openssl +BuildRequires: firewalld BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 11c0464..8bed37a 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -22,6 +22,7 @@ Requires: fontawesome-fonts Requires: google-opensans-fonts Requires: logrotate Requires: openssl +BuildRequires: firewalld BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 260390e..fa99f30 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -20,7 +20,7 @@ Build Dependencies -------------------- $ sudo yum install gcc make autoconf automake gettext-devel git rpm-build \ - libxslt + libxslt firewalld Runtime Dependencies -------------------- diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 7fe1763..ad4ed92 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo zypper install gcc make autoconf automake gettext-tools git \ - rpm-build libxslt-tools + rpm-build libxslt-tools firewalld Runtime Dependencies -------------------- -- 2.7.4

2 2

[PATCH] [Wok 0/2] Bug fix #191
by Aline Manera 13 Dec '16

13 Dec '16

Aline Manera (2): Bug fix #191: Add updated lodash.min.js file Bug fix #191: Break lines content to be smaller than 512 characters .gitignore | 2 +- IBM-license-blacklist | 2 +- ui/js/wok.bootgrid.js | 8 ++- ui/libs/lodash/lodash.js | 127 ---------------------------------------- ui/libs/lodash/lodash.min.js | 136 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/login.html.tmpl | 2 +- ui/pages/wok-ui.html.tmpl | 2 +- 7 files changed, 147 insertions(+), 132 deletions(-) delete mode 100644 ui/libs/lodash/lodash.js create mode 100644 ui/libs/lodash/lodash.min.js -- 2.7.4

2 4

[PATCH] [WoK] Bug fix #187: Fixing redirect with non-root login
by dhbarboza82＠gmail.com 12 Dec '16

12 Dec '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> The 'WoK User Activity Log' tab isn't available when running as regular (non-root) user. But, at the same time, it is acting as the default URL when opening WoK. This patch redirects the default URL when logged as a regular user as follows: - if no plug-ins are installed, a warning message is displayed. - if at least one plug-in is installed, the default URL is redirected to the first plug-in. Considering the existing WoK plug-ins at the time this patch was created, it will be redirected to Gingerbase Dashboard. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 4b36400..260951c 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -209,9 +209,30 @@ wok.main = function() { * and clear location.hash to jump to home page. */ var tab = $('#tabPanel a[href="' + url + '"]'); - if (tab.length === 0 && url != 'wok-empty.html') { - location.hash = '#'; - return; + if (tab.length === 0) { + if (url === "tabs/settings.html") { + /* + * This scenario means that the WoK tab isn't avaiable for the + * current user (probably because it's a regular non-sudo user). + * If there are other tabs to fall back to, redirect to them. Otherwise, + * if running WoK without plug-ins, put an informative message. + */ + if ($('#tabPanel a').length === 0) { + var warning_msg = "Unable to access WoK User Activity Log feature as a non-root user.<br>No plugins installed currently. You can download the available plugins <a href='https://github.com/kimchi-project/kimchi'>Kimchi</a> and <a href='https://github.com/kimchi-project/ginger'>Ginger</a> from Github." + $('#main').html(warning_msg).addClass('noPluginMessage'); + } else { + location.hash = '#' + $('#tabPanel a').attr('href'); + var lastIndex = location.hash.lastIndexOf(".html"); + if (lastIndex != -1) { + location.hash = location.hash.substring(0, lastIndex); + } + } + return; + } + if (url != 'wok-empty.html') { + location.hash = '#'; + return; + } } //Remove the tab arrow indicator for no plugin if (url == 'wok-empty.html') { -- 2.7.4

4 4

Bizarre behaviour with libvirt on CentOS
by Ramon Medeiros 09 Dec '16

09 Dec '16

Hi, i was looking for root cause of this bug: "After creating a vepa network and adding it to a guest, the same is listed in Actions->Edit. If the guest is poweron, the interfaces is not listed". When offline, libvirt says vepa interface is "type" (i run a GET on vm/ifaces, see below): "network". When up, this parameter change to "macvtap", what is breaking UI: ui/js/src/kimchi.guest_edit_main.js 456 kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { 457 for (var i = 0; i < data.length; i++) { 458 data[i].viewMode = ""; 459 data[i].editMode = "hide"; 460 data[i].id = i; 461 if (data[i].type == 'network') 462 addItem(data[i]); 463 } 464 }); So, the if at 461 fails and the interface is not added. Need to figure out why libvirt is changing it. Here is a get at vms/ifaces: Poweroff: { "source":"eth0", "mac":"52:54:00:2f:48:f4", "model":"virtio", "type":"network", "mode":"vepa" } ] Poweron { "source":"eth0", "mac":"52:54:00:2f:48:f4", "model":"virtio", "type":"macvtap", "mode":"vepa" } Anyone know how to proceed? Can i open a bug against libvirt? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 0

[PATCH] [Kimchi] Bug fix #1015: Rename "Guest Name ID" header to "Guest Name"
by Aline Manera 09 Dec '16

09 Dec '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/pages/tabs/guests.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 37c9ce2..2ca3ede 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -50,7 +50,7 @@ <ul class="wok-guest-list"> <li class="wok-guest-list-header"> <span class="column-state"><span class="sr-only">$_("State")</span></span><span class="column-name"><span>$_("Guest Name ID")</span></span><span class="column-name"><span>$_("Guest Name")</span></span><span class="column-type"><span>$_("OS Type")</span></span><span class="column-vnc"><span>$_("VNC")</span></span><span class="column-processors"><span>$_("Processors Utilization")</span></span><!-- -- 2.7.4

2 2

[PATCH] [Kimchi] Issue #190: No activity logging is shown and its break if any one entry in activity log does not have proper key
by archus＠linux.vnet.ibm.com 08 Dec '16

08 Dec '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Currently activity logs breaks in UI, if an error code is changed with additional parameter. For example an error code does not have any parameter and its logged in user-requests.data with params as empty. And however same error code is changed to have a parameter, and hence while parsing activity log it is expected to have parameter in params. Due to which parsing fails with KeyError. This fix handle the KeyError and in case of KeyError the error message will be shown without replacing the parameter with its value. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/message.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wok/message.py b/src/wok/message.py index ff4cbc9..460d90d 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -86,7 +86,10 @@ class WokMessage(object): def get_text(self, prepend_code=True, translate=True): msg = self._get_text(translate) - msg = decode_value(msg) % self.args + try: + msg = decode_value(msg) % self.args + except KeyError: + msg = decode_value(msg) if prepend_code: return "%s: %s" % (self.code, msg) -- 2.7.4

2 1

[PATCH V2] [Kimchi] Issue #1063: Upon migrating guest to remote server, password less ssh is permanent
by archus＠linux.vnet.ibm.com 08 Dec '16

08 Dec '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Changes to ensure that password less login is removed if its setup by kimchi. It also provide option for user to specify if user want to keep the password less login setup by kimchi, if not specified password less login setup by kimchi will be removed. However if password less login is not setup by kimchi, code does not remove the password less login. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- docs/API.md | 2 + model/vms.py | 180 ++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 131 insertions(+), 51 deletions(-) diff --git a/docs/API.md b/docs/API.md index b29108d..7952984 100644 --- a/docs/API.md +++ b/docs/API.md @@ -219,6 +219,8 @@ mode without block migration. * remote_host: IP address or hostname of the remote server. * user *(optional)*: User to log on at the remote server. * password *(optional)*: password of the user in the remote server. + * remove_passless_login *(optional)*: If not provided, default is True that means + it removes password less setup made by Kimchi. ### Sub-resource: Virtual Machine Screenshot diff --git a/model/vms.py b/model/vms.py index d703c89..2dcf507 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1797,58 +1797,59 @@ class VMModel(object): if password is None: raise OperationFailed("KCHVM0056E", {'host': remote_host, 'user': user}) - else: - self._set_password_less_login(remote_host, user, password) + return False + return True - def _set_password_less_login(self, remote_host, user, passwd): - home_dir = '/root' if user is 'root' else '/home/%s' % user + def _read_id_rsa_pub_file(self, id_rsa_pub_file): + data = None + with open(id_rsa_pub_file, "r") as id_file: + data = id_file.read() + return data - id_rsa_file = "%s/.ssh/id_rsa" % home_dir - id_rsa_pub_file = id_rsa_file + '.pub' - ssh_port = 22 - ssh_client = None + def _create_root_ssh_key_if_required(self, user, id_rsa_pub_file, + id_rsa_file): + if os.path.isfile(id_rsa_pub_file): + return - def read_id_rsa_pub_file(): - data = None - with open(id_rsa_pub_file, "r") as id_file: - data = id_file.read() - return data + with open("/dev/zero") as zero_input: + cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file] + proc = subprocess.Popen( + cmd, + stdin=zero_input, + stdout=open(os.devnull, 'wb') + ) + out, err = proc.communicate() - def create_root_ssh_key_if_required(): - if os.path.isfile(id_rsa_pub_file): - return + if not os.path.isfile(id_rsa_pub_file): + raise OperationFailed("KCHVM0070E") - with open("/dev/zero") as zero_input: - cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file] - proc = subprocess.Popen( - cmd, - stdin=zero_input, - stdout=open(os.devnull, 'wb') + if user != 'root': + id_rsa_content = self._read_id_rsa_pub_file(id_rsa_pub_file) + updated_content = id_rsa_content.replace( + ' root@', ' %s@' % user ) - out, err = proc.communicate() + with open(id_rsa_pub_file, 'w+') as f: + f.write(updated_content) - if not os.path.isfile(id_rsa_pub_file): - raise OperationFailed("KCHVM0070E") + user_uid = pwd.getpwnam(user).pw_uid + user_gid = pwd.getpwnam(user).pw_gid + os.chown(id_rsa_pub_file, user_uid, user_gid) + os.chown(id_rsa_file, user_uid, user_gid) - if user is not 'root': - id_rsa_content = read_id_rsa_pub_file() - updated_content = id_rsa_content.replace( - ' root@', ' %s@' % user - ) - with open(id_rsa_pub_file, 'w+') as f: - f.write(updated_content) + def _get_ssh_client(self, remote_host, user, passwd, ssh_port): + ssh_client = paramiko.SSHClient() + ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + ssh_client.connect(remote_host, ssh_port, username=user, + password=passwd, timeout=4) + return ssh_client - user_uid = pwd.getpwnam(user).pw_uid - user_gid = pwd.getpwnam(user).pw_gid - os.chown(id_rsa_pub_file, user_uid, user_gid) - os.chown(id_rsa_file, user_uid, user_gid) + def _set_password_less_login(self, remote_host, user, passwd): + home_dir = '/root' if user == 'root' else '/home/%s' % user - def get_ssh_client(remote_host, user, passwd): - ssh_client = paramiko.SSHClient() - ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - ssh_client.connect(remote_host, ssh_port, username=user, - password=passwd, timeout=4) - return ssh_client + id_rsa_file = "%s/.ssh/id_rsa" % home_dir + id_rsa_pub_file = id_rsa_file + '.pub' + ssh_port = 22 + ssh_client = None def append_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data): sftp_client = ssh_client.open_sftp() @@ -1874,9 +1875,11 @@ class VMModel(object): sftp_client.close() try: - create_root_ssh_key_if_required() - id_rsa_data = read_id_rsa_pub_file() - ssh_client = get_ssh_client(remote_host, user, passwd) + self._create_root_ssh_key_if_required(user, id_rsa_pub_file, + id_rsa_file) + id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file) + ssh_client = self._get_ssh_client(remote_host, user, passwd, + ssh_port) append_id_rsa_to_remote_authorized_keys( ssh_client, id_rsa_data @@ -1915,17 +1918,21 @@ class VMModel(object): def migration_pre_check(self, remote_host, user, password): self._check_if_host_not_localhost(remote_host) - self._check_if_password_less_login_enabled( + default_passless_status = self._check_if_password_less_login_enabled( remote_host, user, password ) - self._check_remote_libvirt_conn(remote_host, user) + if not default_passless_status: + self._set_password_less_login(remote_host, user, password) + self._check_if_migrating_same_arch_hypervisor(remote_host, user) if platform.machine() in ['ppc64', 'ppc64le']: self._check_ppc64_subcores_per_core(remote_host, user) + return default_passless_status + def _check_if_path_exists_in_remote_host(self, path, remote_host, user): username_host = "%s@%s" % (user, remote_host) cmd = ['ssh', '-oStrictHostKeyChecking=no', username_host, @@ -2007,15 +2014,22 @@ class VMModel(object): user ) - def migrate(self, name, remote_host, user=None, password=None): + def migrate(self, name, remote_host, user=None, password=None, + remove_passless_login=True): name = name.decode('utf-8') remote_host = remote_host.decode('utf-8') if user is None: user = 'root' + user = user.encode('utf-8') + + default_passless_status = self.migration_pre_check(remote_host, user, + password) - self.migration_pre_check(remote_host, user, password) - dest_conn = self._get_remote_libvirt_conn(remote_host, user) + if default_passless_status: + remove_passless_login = False + + dest_conn = self._get_remote_libvirt_conn(remote_host) non_shared = self._check_if_nonshared_migration( name, @@ -2027,18 +2041,80 @@ class VMModel(object): 'dest_conn': dest_conn, 'non_shared': non_shared, 'remote_host': remote_host, - 'user': user} + 'user': user, + 'password': password, + 'remove_passless_login': remove_passless_login} task_id = AsyncTask('/plugins/kimchi/vms/%s/migrate' % name, self._migrate_task, params).id return self.task.lookup(task_id) + def _remove_password_less_login(self, remote_host, user, passwd): + home_dir = '/root' if user == 'root' else '/home/%s' % user + + id_rsa_file = "%s/.ssh/id_rsa" % home_dir + id_rsa_pub_file = id_rsa_file + '.pub' + ssh_port = 22 + ssh_client = None + + def remove_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data): + sftp_client = ssh_client.open_sftp() + ssh_dir = '%s/.ssh' % home_dir + + try: + sftp_client.chdir(ssh_dir) + except IOError: + raise OperationFailed( + "KCHVM0089E", + {'host': remote_host, 'user': user, 'sshdir': ssh_dir} + ) + file_handler = sftp_client.file( + '%s/.ssh/authorized_keys' % home_dir, + mode='r', + bufsize=1 + ) + lines = file_handler.readlines() + try: + lines.remove(id_rsa_data) + except ValueError: + pass + file_handler = sftp_client.file( + '%s/.ssh/authorized_keys' % home_dir, + mode='w', + bufsize=1 + ) + file_handler.writelines(lines) + file_handler.flush() + file_handler.close() + sftp_client.close() + + try: + self._create_root_ssh_key_if_required(user, id_rsa_pub_file, + id_rsa_file) + id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file) + ssh_client = self._get_ssh_client(remote_host, user, passwd, + ssh_port) + remove_id_rsa_to_remote_authorized_keys( + ssh_client, + id_rsa_data + ) + except Exception, e: + raise OperationFailed( + "KCHVM0068E", + {'host': remote_host, 'user': user, 'error': e} + ) + finally: + if ssh_client: + ssh_client.close() + def _migrate_task(self, cb, params): name = params['name'].decode('utf-8') dest_conn = params['dest_conn'] non_shared = params['non_shared'] remote_host = params['remote_host'] user = params['user'] + password = params['password'] + remove_passless_login = params['remove_passless_login'] cb('starting a migration') @@ -2072,6 +2148,8 @@ class VMModel(object): raise OperationFailed('KCHVM0058E', {'err': e.message, 'name': name}) finally: + if remove_passless_login: + self._remove_password_less_login(remote_host, user, password) dest_conn.close() cb('Migrate finished', True) -- 2.7.4

1 0

[PATCH] [Kimchi] Fix checking for libvirt daemon on Ubuntu
by Lucio Correia 07 Dec '16

07 Dec '16

Starting with Ubuntu 16.10, it also comes with libvirtd and differentiate it from other distros is not necessary anymore. It also fixes an issue on libvirt service status verification causing failure on Kimchi plugin loading: dev@u1610:$ systemctl is-active libvirt-bin.service inactive dev@u1610:$ systemctl is-active libvirtd.service active Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- utils.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/utils.py b/utils.py index 26d3cf6..1e2c951 100644 --- a/utils.py +++ b/utils.py @@ -20,7 +20,6 @@ import contextlib import json -import platform import re import sqlite3 import time @@ -264,11 +263,6 @@ def is_libvirtd_up(): """ Checks if libvirtd.service is up. """ - distro, _, _ = platform.linux_distribution() - if distro.lower() == 'ubuntu': - cmd = ['systemctl', 'is-active', 'libvirt-bin.service'] - else: - cmd = ['systemctl', 'is-active', 'libvirtd.service'] - + cmd = ['systemctl', 'is-active', 'libvirtd.service'] output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False -- 2.7.4

3 2

[PATCH] [Kimchi] Fixed resize volume click input number in virtualization->storag
by rajgupta＠linux.vnet.ibm.com 07 Dec '16

07 Dec '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Added on change event and size validation Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- ui/js/src/kimchi.storagepool_resize_volume_main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_resize_volume_main.js b/ui/js/src/kimchi.storagepool_resize_volume_main.js index 791cc1d..1f5b4db 100644 --- a/ui/js/src/kimchi.storagepool_resize_volume_main.js +++ b/ui/js/src/kimchi.storagepool_resize_volume_main.js @@ -23,8 +23,8 @@ kimchi.sp_resize_volume_main = function() { var form = $('form#form-sp-resize-volume'); $(addButton).prop('disabled',true); - $(size).on('keyup', function(){ - if($(this).val().length !==0) { + $(size).on('keyup change', function(){ + if($(this).val() > 0) { addButton.prop('disabled', false); } else{ addButton.prop('disabled',true); -- 2.1.0

3 2

[PATCH] [Kimchi] Recognize openSUSE 42.2 ISO
by Aline Manera 01 Dec '16

01 Dec '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- isoinfo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/isoinfo.py b/isoinfo.py index e5725e2..6876672 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -111,8 +111,7 @@ iso_dir = [ 'openSUSE-DVD-i586-Build0039|openSUSE-DVD-x86_640039'), ('opensuse', '12.2', 'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'), - ('opensuse', '42.1', - 'openSUSE-Leap-42.1-DVD-x86_64026|openSUSE-Leap-42.1-NET-x86_64026'), + ('opensuse', lambda m: m.group(1), 'openSUSE-Leap-(\d+\.\d+)'), ('rhel', '4.8', 'RHEL/4-U8'), ('rhel', lambda m: m.group(2), 'RHEL(-LE)?[_/-](\d+\.\d+)'), ('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'), -- 2.7.4

2 1

RFC – Hypervisor Performance Manager for s390x (KVM IBM z Systems)
by Chandra Shekhar Reddy Potula 01 Dec '16

01 Dec '16

Proposal of introducing a new plugin – Hypervisor Performance Manager(HPM) for s390x (KVM IBM z Systems). *Abstract* z Systems Hypervisor Performance Manager (zHPM) can be used to bring a goal-oriented approach to the performance management of a hypervisor. zHPM dynamically manages resource allocation when contention occurs based on user-specified policies associated with performance objectives. *Introduction about HPM:* zHPM provides the following capabilities: ·APIs to enable a virtualization management solution for fully operating zHPM. ·These APIs are provided using RESTful web services. The zHPM APIs provide the following functions: –Definition of workload resource groups and performance policy. –Collection of virtual server and hypervisor performance metrics related to understanding of performance goal achievement. –Operational controls. ·A command line interface that provides similar functions as the zHPM APIs. ·Collection of hypervisor level and virtual server level performance metrics to help set up performance goals, and support virtual server CPU management. ·Management of CPU resource allocation to virtual servers in order to meet goals Workload resource groups A workload resource group is a collection of virtual servers that host a business application. The workload resource group provides a "management view" of these virtual servers. By defining a workload resource group you can manage hypervisor resources based on the requirements of the business applications deployed on the KVM for IBM z Systems hypervisor. Performance policies In zHPM, a performance policy defines goals for virtual servers in a workload resource group. You can define performance policies and express a business goal and an importance level for the virtual servers that are part of a workload resource group. zHPM then monitors and manages hypervisor resources allocated to the virtual servers based on these performance policies. Service class the service class a virtual server is associated with. *Use Cases:* New plugin Hypervisor Performance Manager(HPM) UI toprovide the following operations support: 1.Performance Policies a.List b.Add/Update/Remove c.Import/Export 2.Workload Resource Group (WRG) configuration a.List WRG’s b.Get/Create/Edit/Delete WRG c.Add/Remove Virtual Server from WRG 3.Service Classes a.Details of Service Class b.Fetch or update Virtual Server information 4.Virtual Server CPU Management a.Get/Enable/Disable CPU management b.Report dynamic CPU resource adjustments REST API’s Supported by HPM. 1.Workload Resource Group a.GET /zhpm/wsapi/v1/workload-resource-groups b.GET /zhpm/wsapi/v1/workload-resource-groups/detail c.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} d.POST /zhpm/wsapi/v1/workload-resource-groups e.DELETE /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} f.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}/actions 2.Performance Policies a.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} b.POST /zhpm/wsapi/v1/workload-resource-groups/default c.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-ids d.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} e.GET /zhpm/wsapi/v1/workload-resource-groups/detail 3.Virtual Servers a.GET /zhpm/wsapi/v1/virtual-servers b.GET /zhpm/wsapi/v1/virtual-servers/{vs-resource-id} c.POST /zhpm/wsapi/v1/virtual-servers/{vs-resource-id} d.GET /zhpm/wsapi/v1/virtual-servers/detail 4.Metrics a.GET /zhpm/wsapi/v1/metrics/raw/hypervisor b.GET /zhpm/wsapi/v1/metrics/calculated/hypervisor c.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups d.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups e.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/default f.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/default g.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/{wrg-resource-id} a.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/{wrg-resource-id} 5.CPU Management a.GET /zhpm/wsapi/v1/mgmt-levels b.POST /zhpm/wsapi/v1/mgmt-levels c.GET /zhpm/wsapi/v1/dynamic-resource-adjustments 6.Memory Management TBD The following code changes will be made in support of plugin: 1.Plugin infrastructure 2.Backend python code support for Kimchi/Ginger for the REST API development 3.Frontend HTML5/JavaScript code. More details to be followed like detailed use cases, REST API and mock-ups ... Further documentation can be found @ http://www.ibm.com/support/knowledgecenter/SSNW54_1.1.1/com.ibm.kvm.v111.ad… Please feel free to comment !!! Thanks and Regards Chandra

2 1

[PATCH ][Wok] Fix for Multi-culture UI issue in wok settings tab
by nagamanc＠linux.vnet.ibm.com 01 Dec '16

01 Dec '16

From: Nagamani Chennuboina <nagamanc(a)linux.vnet.ibm.com> Issue is, text in table header/cells are truncated in settings tab. Changed required HTML,css and JS files Nagamani Chennuboina (1): Fix for Multi-culture UI issue in wok settings tab ui/css/settings.css | 1 + ui/css/src/settings.scss | 3 ++- ui/css/wok.css | 2 +- ui/js/wok.bootgrid.js | 21 +++++++++++++++++++++ ui/js/wok.user-log.js | 18 +++++++++++++++--- ui/pages/wok-ui.html.tmpl | 4 ++-- 6 files changed, 42 insertions(+), 7 deletions(-) -- 2.1.0

2 2

[PATCH] [Wok] Fix to provide date convertion as per locale
by jkatta＠linux.vnet.ibm.com 01 Dec '16

01 Dec '16

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> This fix provides template and utils methods for the date convertion as per the locale settings from UI login page Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- src/wok/template.py | 26 +++++++++++++++++++++++++- src/wok/utils.py | 10 ++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/wok/template.py b/src/wok/template.py index 43a34db..e8d083e 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -22,10 +22,13 @@ import cherrypy import errno import json +import threading import time +import locale + from Cheetah.Template import Template from glob import iglob - +from contextlib import contextmanager from wok import config as config from wok.config import paths @@ -133,3 +136,24 @@ def render(resource, data): return render_cheetah_file(resource, data) else: raise cherrypy.HTTPError(406) + + +def get_locale(): + cookie = cherrypy.request.cookie + if "wokLocale" in cookie.keys(): + return [cookie["wokLocale"].value] + langs = get_lang() + return langs + + +LOCALE_LOCK = threading.Lock() + + +@contextmanager +def setlocale(name): + with LOCALE_LOCK: + saved = locale.setlocale(locale.LC_TIME) + try: + yield locale.setlocale(locale.LC_TIME, name) + finally: + locale.setlocale(locale.LC_TIME, saved) diff --git a/src/wok/utils.py b/src/wok/utils.py index 9a08001..807893d 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -42,6 +42,7 @@ from threading import Timer from wok.config import paths, PluginPaths from wok.exception import InvalidParameter, TimeoutExpired from wok.stringutils import decode_value +from wok.template import get_locale, setlocale wok_log = cherrypy.log.error_log @@ -619,3 +620,12 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def dateNtime_to_locale(dateNtime): + dt = datetime.strptime(dateNtime, "%Y-%m-%d %H:%M:%S") + cokies_locale = get_locale() + cokies_locale = cokies_locale[0].replace("-", "_") + with setlocale(cokies_locale): + dt_locale = (dt.strftime('%c')) + return dt_locale -- 2.7.4

2 1

[PATCH] [Wok] Fix non-relative paths
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/wok.user-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index bac5439..f7659ee 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -173,7 +173,7 @@ wok.initUserLog = function() { $(".content-area", "#wokSettings").css("height", "100%"); wok.initUserLogConfig(); $('#advanced-search-button').on('click',function(){ - wok.window.open('/tabs/settings-search.html'); + wok.window.open('tabs/settings-search.html'); }); $("#download-button").on('click',function(){ -- 2.7.4

2 1

[PATCH] [Wok] Fix ip-address.js directory
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/libs/datatables/js/plugins/ip-address/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/libs/datatables/js/plugins/ip-address/Makefile.am b/ui/libs/datatables/js/plugins/ip-address/Makefile.am index f823bae..b48f817 100644 --- a/ui/libs/datatables/js/plugins/ip-address/Makefile.am +++ b/ui/libs/datatables/js/plugins/ip-address/Makefile.am @@ -16,6 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address/ip-address.js +datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address dist_datatablesipaddressjs_DATA = $(wildcard *.js) $(NULL) -- 2.7.4

2 1

[PATCH] Do not install firewalld conf in Debian
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e7ab86e..5f91a62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,9 +95,6 @@ install-deb: install $(DESTDIR)/etc/init/wokd.conf; \ fi $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/ - $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services - cp -R $(top_srcdir)/src/firewalld.xml \ - $(DESTDIR)/usr/lib/firewalld/services/wokd.xml deb: contrib/make-deb.sh -- 2.7.4

2 5