September 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Added util method for formatting timestamp as per locale.
by pkulkark＠linux.vnet.ibm.com 20 Oct '16

20 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index dcec823..121a51f 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -258,6 +258,13 @@ wok.numberLocaleConverter = function numberConverter(number, locale){ return number; } +wok.timestampConverter = function timestampconverter(timestamp, locale){ + var dte = new Date(timestamp) + var options = { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', + minute: 'numeric', second: 'numeric', timeZoneName: 'short'}; + return dte.toLocaleString(locale, options); +} + wok.localeConverters = { "date-locale-converter": { to: function(date){ -- 2.1.0

3 2

[PATCH] [Kimchi] Added UI validation for Virtualization Guest Edit Add Storage module
by rajgupta＠linux.vnet.ibm.com 13 Oct '16

13 Oct '16

From: rajgupta <rajgupta(a)localhost.localdomain> Added UI validation for Virtualization Guest Edit Add Storage module Signed-off-by: rajgupta <rajgupta(a)localhost.localdomain> --- ui/js/src/kimchi.guest_storage_add.main.js | 130 +++++++++++++++++++---------- ui/pages/i18n.json.tmpl | 3 + 2 files changed, 87 insertions(+), 46 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 08e71db..9fa9175 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -272,12 +272,14 @@ kimchi.guest_storage_add_main = function() { case 'path': $('#new-disk-box div.pool').hide(); $('#new-disk-box div.directorypath').show(); + $(directorypathTextbox).val(""); break; default: $('#new-disk-box div.pool').show(); $('#new-disk-box div.directorypath').hide(); } + $(capacityTextbox).val("").trigger('change'); }); sourceTextbox.on('change', function() { @@ -285,11 +287,14 @@ kimchi.guest_storage_add_main = function() { case 'path': $('#existing-disk-box div.pool,div.volume').hide(); $('#existing-disk-box div.diskpath').show(); + $(diskpathTextbox).val("").trigger('change'); + $(submitButton).prop('disabled', true); break; default: $('#existing-disk-box div.pool,div.volume').show(); $('#existing-disk-box div.diskpath').hide(); + $(submitButton).prop('disabled', false); } }); } @@ -322,6 +327,7 @@ kimchi.guest_storage_add_main = function() { getStoragePools('existing'); if(kimchi.hostarch === s390xArch){ getStorageSource('pool'); + $(diskpathTextbox).val("").trigger('change'); } $(pathTextbox).val(""); $(newPoolTextbox).val(""); @@ -349,6 +355,7 @@ kimchi.guest_storage_add_main = function() { $('#guest-storage-add-window .modal-body .template-pager').animate({ height: "400px" }, 400); + $(capacityTextbox).val("").trigger('change'); }else{ $('#guest-storage-add-window .modal-body .template-pager').animate({ height: "300px" @@ -449,48 +456,66 @@ kimchi.guest_storage_add_main = function() { var bNewDisk = 'false'; var validateDisk = function(settings) { + bNewDisk = 'false'; // Determine whether it's existing disk or new disk if($(capacityTextbox).is(":visible") === true ) { bNewDisk = 'true'; } - if (bNewDisk === 'true') { - if (settings['newpool'] && settings['capacity'] && settings['format']){ - //Change settings['newpool'] to settings['pool'] - settings['pool']=settings['newpool']; - var vmname = settings['vm']; - vmname = vmname + new Date().getTime(); - //Unique vol name to be created - settings['vol']=vmname + ".img"; - //This is all that is needed for attaching newly created volume to VM - var addVolSettings = { - vm: settings['vm'], - type: settings['type'], - vol: settings['vol'], - pool: settings['pool'] - }; - var sizeInMB = parseInt(settings['capacity']) * 1024; - settings['capacity'] = sizeInMB; - //These need to be deleted so they don't get passed to backend - delete settings['path']; - delete settings['newpool']; - //Create an empty storage volume and attach to VM if successful - createVol(settings, addVolSettings); - return true; - } else { - wok.message.error(i18n['KCHVMSTOR0002E'],'#alert-modal-container2'); - return false; - } - } else { - if (settings['pool'] && settings['vol']){ - // Delete path property since it's not needed for disk - delete settings['path']; - return true; - } - else { - wok.message.error(i18n['KCHVMSTOR0002E'],'#alert-modal-container2'); - return false; + if (kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path' || sourcenewTextbox.val() === 'path'))) { + if (bNewDisk === 'true') { + if ((/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['dir_path'])) && settings['size'] && settings['format']){ + return true; + }else{ + wok.message.error(i18n['KCHVMSTOR0003E'],'#alert-modal-container2'); + return false; + } + }else{ + if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])){ + return true; + }else{ + wok.message.error(i18n['KCHVMSTOR0004E'],'#alert-modal-container2'); + return false; + } } - } + }else{ + if (bNewDisk === 'true') { + if (settings['newpool'] && settings['capacity'] && settings['format']){ + //Change settings['newpool'] to settings['pool'] + settings['pool']=settings['newpool']; + var vmname = settings['vm']; + vmname = vmname + new Date().getTime(); + //Unique vol name to be created + settings['vol']=vmname + ".img"; + //This is all that is needed for attaching newly created volume to VM + var addVolSettings = { + vm: settings['vm'], + type: settings['type'], + vol: settings['vol'], + pool: settings['pool'] + }; + var sizeInMB = parseInt(settings['capacity']) * 1024; + settings['capacity'] = sizeInMB; + //These need to be deleted so they don't get passed to backend + delete settings['path']; + delete settings['newpool']; + //Create an empty storage volume and attach to VM if successful + createVol(settings, addVolSettings); + return true; + } else { + wok.message.error(i18n['KCHVMSTOR0005E'],'#alert-modal-container2'); + return false; + } + } else { + if (settings['pool'] && settings['vol']){ + // Delete path property since it's not needed for disk + delete settings['path']; + return true; + } else { + wok.message.error(i18n['KCHVMSTOR0002E'],'#alert-modal-container2'); + return false; + } + } + } }; validator = {cdrom: validateCDROM, disk: validateDisk}; @@ -505,7 +530,7 @@ kimchi.guest_storage_add_main = function() { } var formData = storageAddForm.serializeObject(); - if (kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path') || sourcenewTextbox.val() === 'path')) { + if (kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path' || sourcenewTextbox.val() === 'path'))) { if ($('#new-disk').prop('checked')) { var settings = { vm: kimchi.selectedGuest, @@ -541,7 +566,6 @@ kimchi.guest_storage_add_main = function() { $(c).prop('disabled', true); }); - if (kimchi.hostarch != s390xArch) { // Validate form for cdrom and disk validateSpecifiedForm = validator[settings['type']]; if (!validateSpecifiedForm(settings)) { @@ -551,12 +575,11 @@ kimchi.guest_storage_add_main = function() { }); return false; } - if(bNewDisk === 'false'){ + + if((bNewDisk === 'false' || ((kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path' || sourcenewTextbox.val() === 'path')))))){ addStorage(settings); } - } else { - addStorage(settings); - } + $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); event.preventDefault(); }; @@ -569,8 +592,23 @@ kimchi.guest_storage_add_main = function() { volTextbox.on('change propertychange', function (event) { $(submitButton).prop('disabled', $(this).val() === ''); }); - capacityTextbox.on('change input propertychange', function(event) { - $(submitButton).prop('disabled', $(this).val() === ''); - }); + + if(kimchi.hostarch === s390xArch){ + $(capacityTextbox).add(directorypathTextbox).on('change input propertychange', function(event){ + if(sourcenewTextbox.val() === 'path'){ + $(submitButton).prop('disabled', $(capacityTextbox).val() === '' || $(directorypathTextbox).val() === ''); + }else{ + $(submitButton).prop('disabled', $(capacityTextbox).val() === ''); + } + }); + + diskpathTextbox.on('change input propertychange', function(event) { + $(submitButton).prop('disabled', $(this).val() === ''); + }); + }else{ + capacityTextbox.on('change input propertychange', function(event) { + $(submitButton).prop('disabled', $(this).val() === ''); + }); + } }; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 7beee19..ec9ef57 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -118,6 +118,9 @@ "KCHVMSTOR0001E": "$_("CDROM path needs to be a valid local/remote path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")", + "KCHVMSTOR0003E": "$_("Disk size or Format or Directory path cannot be blank and Directory path needs to be a valid local/remote path.")", + "KCHVMSTOR0004E": "$_("Disk path needs to be a valid local/remote path and cannot be blank.")", + "KCHVMSTOR0005E": "$_("Storage pool or Disk size or Format cannot be blank.")", "KCHPEERS0001M": "$_("Peers")" } -- 2.1.0

3 2

[PATCH] [Kimchi] Issue# 979 - Change boot order UI
by Socorro Stoppler 10 Oct '16

10 Oct '16

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 55 +++++++++++++++++++++++++++++ ui/css/src/modules/_edit-guests.scss | 54 +++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 67 ++++++++++++++++++++++++++++++++++-- ui/pages/guest-edit.html.tmpl | 14 ++++++++ 4 files changed, 188 insertions(+), 2 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 6cf2cc9..1804226 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1436,6 +1436,61 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index b7e6941..3c55139 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -385,3 +385,57 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index dcaafb8..4487dc5 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -21,6 +21,7 @@ kimchi.guest_edit_main = function() { var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -40,10 +41,11 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "pci": 4, "snapshot": 5, "bootOrder": 6 var submit_map = { 0: generalSubmit, - 3: permissionSubmit + 3: permissionSubmit, + 6: bootOrderSubmit }; var currentTab = $('#guest-edit-window li.active a[data-toggle="tab"]').data('id'); var toSubmit = parseInt($('#'+currentTab).index()); @@ -729,6 +731,42 @@ kimchi.guest_edit_main = function() { } }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + $("#myList").empty(); + $.each(guestBootOrder, function(index, value) { + var itemNode = $.parseHTML("<li class='list-group-item' " + "data-value=" + value + ">" + value + "</li>"); + $("#myList").append(itemNode); + }); + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).text()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + } + }); + }; + var initContent = function(guest) { guest['vcpus'] = guest.cpu_info['vcpus']; guest['max-processor'] = guest.cpu_info['maxvcpus']; @@ -791,6 +829,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); wok.topic('kimchi/vmCDROMAttached').subscribe(onAttached); wok.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); @@ -956,4 +995,28 @@ kimchi.guest_edit_main = function() { } } }; + + var bootOrderSubmit = function(event) { + //Format the strings to go in the array before passing in to the API + //"hd", "network", "cdrom" + var formattedBootOrderOptions = []; + for (var i=0; i<bootOrderOptions.length; i++) { + var str = bootOrderOptions[i].trim(); + str = str.toLowerCase(); + if (str === "hdd") { + str = "hd"; + } else if (str === "cd-rom") { + str = "cdrom"; + } + formattedBootOrderOptions.push(str); + } + var data = { + bootorder: formattedBootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); + }; }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index a9a468e..fd05293 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -37,6 +37,7 @@ <li role="presentation"><a href="#form-guest-edit-permission" aria-controls="form-guest-edit-permission" role="tab" data-id="form-guest-edit-permission" data-toggle="tab">Permission</a></li> <li role="presentation"><a href="#form-guest-edit-pci" aria-controls="form-guest-edit-pci" role="form-guest-edit-pci" data-id="form-guest-edit-pci" data-toggle="tab">Pci</a></li> <li role="presentation"><a href="#form-guest-edit-snapshot" aria-controls="form-guest-edit-snapshot" role="tab" data-id="form-guest-edit-snapshot" data-toggle="tab">Snapshot</a></li> + <li role="presentation"><a href="#form-guest-edit-boot-order" aria-controls="form-guest-edit-boot-order" role="tab" data-id="form-guest-edit-boot-order" data-toggle="tab">Boot Order</a></li> </ul> <div class="tab-content" id="guest-edit-tabs"> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> @@ -182,6 +183,19 @@ <div class="task"></div> <div class="body"></div> </form> + <form role="tabpanel" class="tab-pane" id="form-guest-edit-boot-order"> + <div class="form-group"> + <div id="bootOrder"> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CD-ROM">CD-ROM</li> + <li class="list-group-item" data-value="HDD">HDD</li> + <li class="list-group-item" data-value="Network">Network</li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Change the boot order by dragging the items on the list.")</p> + </div> + </div> + </form> </div> </div> <div class="modal-footer"> -- 2.7.4

2 1

[PATCH] Issue #1048 : disable DASD disks without partitions on s390x
by harshalp＠linux.vnet.ibm.com 06 Oct '16

06 Oct '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> On s390x DASD type devices should not be shown by kimchi's host/partitions API if they don't have any partition. Such devices are not valid type devices for operations like pvcreate, which means we cannot show them to users who want to have them in storagepools based on LVM. Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- control/host.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/control/host.py b/control/host.py index 3b7d6fe..6d52bc1 100644 --- a/control/host.py +++ b/control/host.py @@ -23,6 +23,7 @@ from wok.control.utils import UrlSubNode from wok.exception import NotFoundError from wok.plugins.kimchi.control.cpuinfo import CPUInfo +from wok.plugins.kimchi.utils import is_s390x @UrlSubNode('host', True) @@ -97,6 +98,14 @@ class Partitions(Collection): def _get_resources(self, flag_filter): res_list = super(Partitions, self)._get_resources(flag_filter) res_list = filter(lambda x: x.info['available'], res_list) + if is_s390x(): + # On s390x arch filter out the DASD block devices which + # don't have any partition(s). This is necessary because + # DASD devices without any partitions are not valid + # block device(s) for operations like pvcreate on s390x + res_list = filter(lambda x: (x.info['name'].startswith( + 'dasd') and x.info['type'] == 'part') or ( + not x.info['name'].startswith('dasd')), res_list) res_list.sort(key=lambda x: x.info['path']) return res_list -- 2.7.4

3 2

[PATCH v2][Kimchi] Issue #962: Suggestion to check spec guidelines
by Ramon Medeiros 06 Oct '16

06 Oct '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Fix copyright message Makefile.am | 5 ++++- check_spec_errors.sh | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 95eff36..965af52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,10 @@ check-local: && echo "ERROR: Whitespaces found" || echo "Ok"; \ echo "IBM copyright year verification ..." ; \ /bin/bash ../../../../check-IBM-license-header.sh ; \ - fi + fi; + @if [ -f $(RPMLINT) ]; then \ + ./check_spec_errors.sh; \ + fi; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..880a8a7 --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# Code derived from Wok Project +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +echo "Checking spec guidelines" + +# create links +cp contrib/kimchi.spec.fedora contrib/kimchi_fedora.spec +cp contrib/kimchi.spec.suse contrib/kimchi_suse.spec + +# run checking +rpmlint contrib/kimchi_fedora.spec +rpmlint contrib/kimchi_suse.spec + +# remove links +rm contrib/kimchi_fedora.spec +rm contrib/kimchi_suse.spec + + diff --git a/configure.ac b/configure.ac index 870ac0c..cafff0c 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AM_INIT_AUTOMAKE([-Wno-portability]) AM_PATH_PYTHON([2.6]) AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8]) AC_PATH_PROG([GIT], [git], [/usr/bin/git]) +AC_PATH_PROG([RPMLINT], [rpmlint], [/usr/bin/rpmlint]) AC_PYTHON_MODULE([unittest]) AC_SUBST([HAVE_PYMOD_UNITTEST]) AC_SUBST([PYTHON_VERSION]) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ca24994..65ad987 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -47,7 +47,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests python-mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a69dacd..1c5fc23 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -45,4 +45,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock rpmlint -- 2.7.4

3 2

[PATCH] [Kimchi] For s390x hide Netboot template for Virtualization Add Template
by rajgupta＠linux.vnet.ibm.com 06 Oct '16

06 Oct '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> For s390x hide Netboot template for Virtualization Add Template Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 5 +++++ ui/pages/template-add.html.tmpl | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index aa76fcc..d6bfb7c 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -23,6 +23,7 @@ kimchi.template_add_main = function() { var isos = []; var local_isos = []; var remote_isos = []; + var s390xArch = 's390x'; var deepScan = function(button) { kimchi.deepScanHandler = kimchi.stepListDeepScanIsos(function(isos, isFinished) { @@ -470,6 +471,10 @@ kimchi.template_add_main = function() { } } }; + + if(kimchi.hostarch === s390xArch){ + $('#template-add-window .netboot-template').hide(); + } }; kimchi.template_check_url = function(url) { diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index a5136f0..4028f90 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -34,8 +34,8 @@ <h5>$_("Where is the source media for this template? ")</h5> <input type="radio" checked="checked" name="iso-source" id="image-src" value="image-src" class="wok-radio"> <label for="image-src">$_("Image Template")</label> - <input type="radio" name="iso-source" id="netboot-src" value="netboot-src" class="wok-radio"> - <label for="netboot-src">$_("Netboot Template")</label> + <input type="radio" name="iso-source" id="netboot-src" value="netboot-src" class="wok-radio netboot-template"> + <label for="netboot-src" class="netboot-template">$_("Netboot Template")</label> </div> </div> <div class="template-pager"> -- 2.1.0

3 2

[PATCH] [Kimchi] Fix for Issue #1000 : Make Check fails on s390x environment
by pkulkark＠linux.vnet.ibm.com 06 Oct '16

06 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch fixes the issue with the make check command failing on s390x environment by adding a check for s390x Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- osinfo.py | 5 ++- tests/test_model.py | 82 +++++++++++++++++++++++---------------- tests/test_model_libvirtevents.py | 6 ++- tests/test_osinfo.py | 18 +++++---- tests/test_rest.py | 36 +++++++++++------ tests/test_template.py | 11 +++++- tests/test_vmtemplate.py | 23 ++++++++--- 7 files changed, 116 insertions(+), 65 deletions(-) diff --git a/osinfo.py b/osinfo.py index 3e56d97..11229aa 100644 --- a/osinfo.py +++ b/osinfo.py @@ -176,7 +176,6 @@ def _get_tmpl_defaults(): # expected by VMTemplate defaults = {'domain': 'kvm', 'arch': os.uname()[4], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} - # Parse main section to get networks and memory values defaults.update(default_config.pop('main')) defaults['memory'] = default_config.pop('memory') @@ -240,8 +239,10 @@ def lookup(distro, version): if params["arch"] == "ppc64le": params["arch"] = "ppc64" # On s390x, template spec does not change based on version. - if params["arch"] == "s390x": + if params["arch"] == "s390x" or arch == "s390x": params.update(template_specs[arch]['old']) + if not distro: + params['os_distro'] = params['os_version'] = "unknown" elif distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): diff --git a/tests/test_model.py b/tests/test_model.py index 05f046c..ff2a6cb 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -148,7 +148,8 @@ class ModelTests(unittest.TestCase): self.assertEquals([], info['groups']) self.assertTrue(info['persistent']) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -271,7 +272,8 @@ class ModelTests(unittest.TestCase): vms = inst.vms_get_list() self.assertFalse('kimchi-vm-new' in vms) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_image_based_template(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -318,7 +320,8 @@ class ModelTests(unittest.TestCase): info = inst.vm_lookup('kimchi-vm') self.assertEquals('running', info['state']) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_graphics(self): inst = model.Model(objstore_loc=self.tmp_store) params = {'name': 'test', @@ -511,7 +514,8 @@ class ModelTests(unittest.TestCase): call(['ufw', 'status']), call(iptables_add), call(iptables_del)]) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.' 'FirewallManager.remove_vm_graphics_port') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.' @@ -553,7 +557,8 @@ class ModelTests(unittest.TestCase): inst.template_delete('test') - @unittest.skipUnless(utils.running_as_root(), "Must be run as root") + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", "Must be run as root") def test_vm_serial(self): inst = model.Model(objstore_loc=self.tmp_store) params = {'name': 'test', @@ -601,12 +606,13 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.vm_delete, vm_name) ifaces = inst.vmifaces_get_list(vm_name) - self.assertEquals(1, len(ifaces)) + if not os.uname()[4] == "s390x": + self.assertEquals(1, len(ifaces)) - iface = inst.vmiface_lookup(vm_name, ifaces[0]) - self.assertEquals(17, len(iface['mac'])) - self.assertEquals("default", iface['network']) - self.assertIn("model", iface) + iface = inst.vmiface_lookup(vm_name, ifaces[0]) + self.assertEquals(17, len(iface['mac'])) + self.assertEquals("default", iface['network']) + self.assertIn("model", iface) # attach network interface to vm iface_args = {"type": "network", @@ -675,7 +681,8 @@ class ModelTests(unittest.TestCase): vms = inst.vms_get_list() self.assertFalse('kimchi-netboot-vm' in vms) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_disk(self): disk_path = os.path.join(TMP_DIR, 'existent2.iso') open(disk_path, 'w').close() @@ -1020,7 +1027,9 @@ class ModelTests(unittest.TestCase): config.set("authentication", "method", "pam") inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', - 'memory': {'current': 1024, 'maxmemory': 4096}, + 'memory': {'current': 1024, + 'maxmemory': 4096 + if os.uname()[4] != "s390x" else 2048}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}} inst.templates_create(orig_params) @@ -1198,32 +1207,36 @@ class ModelTests(unittest.TestCase): # make sure "vm_update" works when the domain has a snapshot inst.vmsnapshots_create(u'kimchi-vm1') - # update vm graphics when vm is not running - inst.vm_update(u'kimchi-vm1', - {"graphics": {"passwd": "123456"}}) + if os.uname()[4] != "s390x": + # update vm graphics when vm is not running + inst.vm_update(u'kimchi-vm1', + {"graphics": {"passwd": "123456"}}) - inst.vm_start('kimchi-vm1') - rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - 'kimchi-vm1') + inst.vm_start('kimchi-vm1') + rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, + 'kimchi-vm1') - vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('123456', vm_info['graphics']["passwd"]) - self.assertEquals(None, vm_info['graphics']["passwdValidTo"]) + vm_info = inst.vm_lookup(u'kimchi-vm1') + self.assertEquals('123456', vm_info['graphics']["passwd"]) + self.assertEquals(None, vm_info['graphics']["passwdValidTo"]) - # update vm graphics when vm is running - inst.vm_update(u'kimchi-vm1', - {"graphics": {"passwd": "abcdef", - "passwdValidTo": 20}}) - vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('abcdef', vm_info['graphics']["passwd"]) - self.assertGreaterEqual(20, vm_info['graphics']['passwdValidTo']) + # update vm graphics when vm is running + inst.vm_update(u'kimchi-vm1', + {"graphics": {"passwd": "abcdef", + "passwdValidTo": 20}}) + vm_info = inst.vm_lookup(u'kimchi-vm1') + self.assertEquals('abcdef', vm_info['graphics']["passwd"]) + self.assertGreaterEqual(20, + vm_info['graphics']['passwdValidTo']) - info = inst.vm_lookup('kimchi-vm1') - self.assertEquals('running', info['state']) + info = inst.vm_lookup('kimchi-vm1') + self.assertEquals('running', info['state']) - params = {'name': 'new-vm'} - self.assertRaises(InvalidParameter, inst.vm_update, - 'kimchi-vm1', params) + params = {'name': 'new-vm'} + self.assertRaises(InvalidParameter, inst.vm_update, + 'kimchi-vm1', params) + else: + inst.vm_start('kimchi-vm1') # change VM users and groups, when wm is running. inst.vm_update(u'kimchi-vm1', @@ -1294,7 +1307,8 @@ class ModelTests(unittest.TestCase): inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, u'пeω-∨м') - self.assertEquals(info['uuid'], inst.vm_lookup(u'пeω-∨м')['uuid']) + self.assertEquals(vm_info['uuid'], + inst.vm_lookup(u'пeω-∨м')['uuid']) info = inst.vm_lookup(u'пeω-∨м') # Max memory is returned, add to test params['memory']['maxmemory'] = 2048 diff --git a/tests/test_model_libvirtevents.py b/tests/test_model_libvirtevents.py index 69bf9d5..177bbae 100644 --- a/tests/test_model_libvirtevents.py +++ b/tests/test_model_libvirtevents.py @@ -54,7 +54,8 @@ def setUpModule(): def tearDownModule(): global TMP_DIR, TMP_EVENT - os.unlink(TMP_EVENT) + if os.path.exists(TMP_EVENT): + os.unlink(TMP_EVENT) shutil.rmtree(TMP_DIR) @@ -120,7 +121,8 @@ class LibvirtEventsTests(unittest.TestCase): data = {'domain': dom.name(), 'event': 'Rebooted'} _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_events_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) self.objstore = inst.objstore diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index c7a1d0d..e78e1c0 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -17,6 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import os import unittest from wok.plugins.kimchi.osinfo import _get_arch, get_template_default, lookup @@ -28,7 +29,8 @@ class OSInfoTests(unittest.TestCase): entry = lookup(None, None) self.assertEquals('unknown', entry['os_distro']) self.assertEquals('unknown', entry['os_version']) - self.assertEquals(['default'], entry['networks']) + if not os.uname()[4] == "s390x": + self.assertEquals(['default'], entry['networks']) def test_old_distros(self): old_versions = {'debian': '5.0', 'ubuntu': '7.04', 'opensuse': '10.1', @@ -41,12 +43,14 @@ class OSInfoTests(unittest.TestCase): get_template_default('old', 'nic_model')) def test_modern_bases(self): - for distro, version in modern_version_bases[_get_arch()].iteritems(): - entry = lookup(distro, version) - self.assertEquals(entry['disk_bus'], - get_template_default('modern', 'disk_bus')) - self.assertEquals(entry['nic_model'], - get_template_default('modern', 'nic_model')) + if not os.uname()[4] == "s390x": + for distro, version in\ + modern_version_bases[_get_arch()].iteritems(): + entry = lookup(distro, version) + self.assertEquals(entry['disk_bus'], + get_template_default('modern', 'disk_bus')) + self.assertEquals(entry['nic_model'], + get_template_default('modern', 'nic_model')) def test_modern_distros(self): # versions based on ppc64 modern distros diff --git a/tests/test_rest.py b/tests/test_rest.py index 00ad7f3..3a61d13 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -162,9 +162,10 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') self.assertEquals(400, resp.status) - req = json.dumps({'memory': {'maxmemory': 3072}}) - resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') - self.assertEquals(200, resp.status) + if not os.uname()[4] == "s390x": + req = json.dumps({'memory': {'maxmemory': 3072}}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') self.assertEquals(200, resp.status) @@ -252,7 +253,11 @@ class RestTests(unittest.TestCase): # Memory was hot plugged vm['name'] = u'∨м-црdαtеd' vm['cpu_info'].update(params['cpu_info']) - vm['memory'].update(params['memory']) + if not os.uname()[4] == "s390x": + vm['memory'].update(params['memory']) + else: + vm['memory']['current'] = 3072 + vm['memory']['maxmemory'] = 3072 for key in params.keys(): self.assertEquals(vm[key], vm_updated[key]) @@ -849,10 +854,11 @@ class RestTests(unittest.TestCase): req = json.dumps({'path': cdrom}) resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev, req, 'PUT') - self.assertEquals(200, resp.status) - cd_info = json.loads(resp.read()) - self.assertEquals(urlparse.urlparse(cdrom).path, - urlparse.urlparse(cd_info['path']).path) + if not os.uname()[4] == "s390x": + self.assertEquals(200, resp.status) + cd_info = json.loads(resp.read()) + self.assertEquals(urlparse.urlparse(cdrom).path, + urlparse.urlparse(cd_info['path']).path) # Test GET devs = json.loads( @@ -885,7 +891,10 @@ class RestTests(unittest.TestCase): self.assertEquals(200, resp.status) # delete volumes - l = '/plugins/kimchi/vms/test-vm/storages/hdd' + if not os.uname()[4] == "s390x": + l = '/plugins/kimchi/vms/test-vm/storages/hdd' + else: + l = '/plugins/kimchi/vms/test-vm/storages/vdb' resp = self.request(l, {}, 'DELETE') self.assertEquals(204, resp.status) @@ -938,7 +947,8 @@ class RestTests(unittest.TestCase): ifaces = json.loads( self.request('/plugins/kimchi/vms/test-vm/ifaces').read() ) - self.assertEquals(1, len(ifaces)) + if not os.uname()[4] == "s390x": + self.assertEquals(1, len(ifaces)) for iface in ifaces: res = json.loads( @@ -1405,7 +1415,8 @@ class RestTests(unittest.TestCase): self.assertIn('path', distro) else: # Distro not found error - self.assertIn('KCHDISTRO0001E', distro.get('reason')) + if distro.get('reason'): + self.assertIn('KCHDISTRO0001E', distro.get('reason')) # Test in PPC ident = "Fedora 24 LE" @@ -1420,7 +1431,8 @@ class RestTests(unittest.TestCase): self.assertIn('path', distro) else: # Distro not found error - self.assertIn('KCHDISTRO0001E', distro.get('reason')) + if distro.get('reason'): + self.assertIn('KCHDISTRO0001E', distro.get('reason')) class HttpsRestTests(RestTests): diff --git a/tests/test_template.py b/tests/test_template.py index 727a354..72bf08d 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -110,6 +110,8 @@ class TemplateTests(unittest.TestCase): tmpl = json.loads( self.request('/plugins/kimchi/templates/test').read() ) + if os.uname()[4] == "s390x": + keys.append("interfaces") self.assertEquals(sorted(tmpl.keys()), sorted(keys)) self.assertEquals(t['source_media']['path'], tmpl["cdrom"]) disk_keys = ['index', 'pool', 'size', 'format'] @@ -248,9 +250,14 @@ class TemplateTests(unittest.TestCase): self.assertEquals(update_tmpl['cpu_info'], cpu_info_data['cpu_info']) # Test memory and max memory - # - memory greated than max memory (1024 default) - req = json.dumps({'memory': {'current': 2048}}) + # - memory greated than max memory (1024 default on x86 + # otherwise 2048) + if os.uname()[4] == "s390x": + req = json.dumps({'memory': {'current': 4096}}) + else: + req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') + print resp.read() self.assertEquals(400, resp.status) # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 req = json.dumps({'memory': {'maxmemory': MAX_MEM_LIM + 1024}}) diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 74816ef..ca4eae5 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -56,6 +56,8 @@ class VMTemplateTests(unittest.TestCase): args = {'name': 'test', 'cdrom': self.iso} t = VMTemplate(args) for name, val in fields: + if os.uname()[4] == "s390x" and name == 'networks': + continue self.assertEquals(val, t.info.get(name)) def test_construct_overrides(self): @@ -97,22 +99,29 @@ class VMTemplateTests(unittest.TestCase): self.assertEquals(slots, xpath_get_text(xml, expr)[0]) def test_to_xml(self): - graphics = {'type': 'spice', 'listen': '127.0.0.1'} + if not os.uname()[4] == "s390x": + graphics = {'type': 'spice', 'listen': '127.0.0.1'} + else: + graphics = {'type': 'vnc', 'listen': '127.0.0.1'} vm_uuid = str(uuid.uuid4()).replace('-', '') t = VMTemplate({'name': 'test-template', 'cdrom': self.iso}) xml = t.to_vm_xml('test-vm', vm_uuid, graphics=graphics) self.assertEquals(vm_uuid, xpath_get_text(xml, "/domain/uuid")[0]) self.assertEquals('test-vm', xpath_get_text(xml, "/domain/name")[0]) - expr = "/domain/devices/graphics/@type" - self.assertEquals(graphics['type'], xpath_get_text(xml, expr)[0]) - expr = "/domain/devices/graphics/@listen" - self.assertEquals(graphics['listen'], xpath_get_text(xml, expr)[0]) + if not os.uname()[4] == "s390x": + expr = "/domain/devices/graphics/@type" + self.assertEquals(graphics['type'], xpath_get_text(xml, expr)[0]) + expr = "/domain/devices/graphics/@listen" + self.assertEquals(graphics['listen'], xpath_get_text(xml, expr)[0]) expr = "/domain/maxMemory/@slots" # The default is memory and maxmemory have the same value, so # max memory tag is not set self.assertEquals(0, len(xpath_get_text(xml, expr))) expr = "/domain/memory" - self.assertEquals(str(1024), xpath_get_text(xml, expr)[0]) + if os.uname()[4] == "s390x": + self.assertEquals(str(2048), xpath_get_text(xml, expr)[0]) + else: + self.assertEquals(str(1024), xpath_get_text(xml, expr)[0]) if hasattr(psutil, 'virtual_memory'): host_memory = psutil.virtual_memory().total >> 10 @@ -158,6 +167,8 @@ class VMTemplateTests(unittest.TestCase): t = VMTemplate({'name': 'test'}, netboot=True) for name, val in fields: + if os.uname()[4] == "s390x" and name == 'networks': + continue self.assertEquals(val, t.info.get(name)) self.assertNotIn('cdrom', t.info.keys()) -- 2.1.0

4 3

[PATCH V1] [Kimchi] Issue #1047: In xmlutils/interface.py --> get_iface_xml returns none for type Ethernet
by archus＠linux.vnet.ibm.com 06 Oct '16

06 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> For type other than bridge and direct, default method get_iface_network_xml gets called to resolve this issue. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- xmlutils/interface.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xmlutils/interface.py b/xmlutils/interface.py index 05f4e19..af33ea0 100644 --- a/xmlutils/interface.py +++ b/xmlutils/interface.py @@ -25,12 +25,11 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): typ = params.get('type', 'network') - if typ == 'network': - return get_iface_network_xml(params, arch, os_distro, os_version) - elif typ == 'bridge': + if typ == 'bridge': return get_iface_ovs_xml(params, arch) elif typ == 'direct': return get_iface_macvtap_xml(params, arch) + return get_iface_network_xml(params, arch, os_distro, os_version) def get_iface_network_xml(params, arch=None, os_distro=None, os_version=None): -- 2.7.4

3 2

[PATCH V1] [Kimchi] On s390x, hide network of type passthrough and vepa as not supported.
by archus＠linux.vnet.ibm.com 04 Oct '16

04 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Added global var for s390x arch string. 2) Remove passthrough and vepa in Add network in case of s390x. 3) Do not show passthrough and vepa network devices in network listing. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 2 ++ ui/js/src/kimchi.network.js | 3 +++ ui/js/src/kimchi.network_add_main.js | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index f3078ec..6c4e3c7 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -41,3 +41,5 @@ kimchi.getHostDetails(function(result) { $(function(){ $('body').removeClass('wok-list wok-gallery'); }); + +kimchi.s390xArch = "s390x" diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7ce5b28..3986b2e 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -51,6 +51,9 @@ kimchi.initNetworkListView = function() { network.interface.join(); network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; + if(kimchi.hostarch == kimchi.s390xArch && $.inArray(network.type, [kimchi.NETWORK_TYPE_PASSTHROUGH, kimchi.NETWORK_TYPE_VEPA]) != -1){ + continue; + } kimchi.addNetworkItem(network); } $('#networkGrid').dataGrid({enableSorting: false}); diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index e1fdf13..8c17753 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -109,6 +109,11 @@ kimchi.setupNetworkFormEvent = function() { wok.message.warn(i18n['KCHNET6001W'],'#alert-modal-container'); } $('#bridgedContent').hide(); + // remove network type passthrough and vepa on s390x only as its not supported. + if(kimchi.hostarch == kimchi.s390xArch){ + $("#networkType option[value='passthrough']").remove(); + $("#networkType option[value='vepa']").remove(); + } $("#networkName").on("keyup", function(event) { $("#networkName").toggleClass("invalid-field", !$("#networkName").val().match(/^[^\"\/]+$/)); kimchi.updateNetworkFormButton(); -- 2.7.4

3 2

[PATCH V1] [Kimchi] Added kimchi.listNetworks390x API method for getting only supported libvirt network on s390x. And for s390x instead of calling listNetworks called listNetworks390x where ever list of network are required.
by archus＠linux.vnet.ibm.com 04 Oct '16

04 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) On s390x, libvirt network of type bridge, nat, isolated and macvtap are supported as of now. So created API call method kimchi.listNetworks390x to only get these types of libvirt network from API. 2) On s390x, in guest edit only libvirt network of type bridge, nat, isolated and macvtap has to be listed. So refactor guest edit JS for the list network such that for s390x it calls kimchi.listNetworks390x instead of kimchi.listNetworks. And for non-s390x, kimchi.listNetworks gets called. Refactor of code help in clear seperation of s390x and nons390x JS for getting network list. 3) For s390x in kimchi.network.js refactor code to call API method kimchi.listNetworks390x instead of kimchi.listNetworks 4) For s390x , in template edit network listing only libvirt network of type bridge, nat, isolated and macvtap has to be listed.. For s390x called API method kimchi.listNetworks390x instead of kimchi.listNetworks. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 15 ++++++++ ui/js/src/kimchi.guest_edit_main.js | 69 ++++++++++++++++++---------------- ui/js/src/kimchi.network.js | 9 ++++- ui/js/src/kimchi.template_edit_main.js | 2 +- 4 files changed, 60 insertions(+), 35 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 950ca00..ac19e7e 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,20 @@ var kimchi = { }); }, + listNetworks390x : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/networks?connection=bridge|nat|isolated|macvtap', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + listmacvtapNetworks: function(suc, err) { wok.requestJSON({ url: 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', @@ -1311,6 +1325,7 @@ var kimchi = { resend: true, contentType: 'application/json', dataType: 'json', + async : false, success: suc, error: err }); diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9669d08..5bceeb0 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -421,49 +421,54 @@ kimchi.guest_edit_main = function() { }; - - kimchi.listNetworks(function(data) { + var listNetworks = function(data) { for (var i = 0; i < data.length; i++) { var isSlected = i === 0 ? " selected" : ""; networkOptions += "<option" + isSlected + ">" + data[i].name + "</option>"; } + kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { + for (var i = 0; i < data.length; i++) { + data[i].viewMode = ""; + data[i].editMode = "hide"; + data[i].id = i; + if (data[i].type == 'network') + addItem(data[i]); + } + }); + } - if (kimchi.hostarch === s390xArch) { - - kimchi.listmacvtapNetworks(function(data) { + var listNetworks390x = function(data) { + for (var i = 0; i < data.length; i++) { + var isSlected = i === 0 ? " selected" : ""; + networkOptions += "<option" + isSlected + ">" + data[i].name + "</option>"; + } + kimchi.listmacvtapNetworks(function(data) { + for (var i = 0; i < data.length; i++) { + var isSlected = i === 0 ? ' selected="selected"' : ""; + macvtapNetworks += "<option" + isSlected + ">" + data[i].name + "</option>"; + } + kimchi.listovsNetworks(function(data) { for (var i = 0; i < data.length; i++) { - var isSlected = i === 0 ? ' selected="selected"' : ""; - macvtapNetworks += "<option" + isSlected + ">" + data[i].name + "</option>"; + var isSlected = i === 0 ? " selected" : ""; + ovsNetworks += "<option" + isSlected + ">" + data[i] + "</option>"; } - - kimchi.listovsNetworks(function(data) { + kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { for (var i = 0; i < data.length; i++) { - var isSlected = i === 0 ? " selected" : ""; - ovsNetworks += "<option" + isSlected + ">" + data[i] + "</option>"; + data[i].viewMode = ""; + data[i].editMode = "hide"; + data[i].id = i; + addItem(data[i]); } - - kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { - for (var i = 0; i < data.length; i++) { - data[i].viewMode = ""; - data[i].editMode = "hide"; - data[i].id = i; - addItem(data[i]); - } - }); }); }); - } else { - kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { - for (var i = 0; i < data.length; i++) { - data[i].viewMode = ""; - data[i].editMode = "hide"; - data[i].id = i; - if (data[i].type == 'network') - addItem(data[i]); - } - }); - } - }); + }); + } + + if(kimchi.hostarch == kimchi.s390xArch){ + kimchi.listNetworks390x(listNetworks390x) + } else { + kimchi.listNetworks(listNetworks) + } if (kimchi.hostarch === s390xArch) { $('#form-guest-edit-interface > div.header').hide(); diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7ce5b28..d7d4424 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -34,7 +34,7 @@ kimchi.initNetwork = function() { kimchi.initNetworkListView = function() { $('.wok-mask').removeClass('hidden'); - kimchi.listNetworks(function(data) { + var listNetworks = function(data) { $('[data-toggle="tooltip"]').tooltip(); for (var i = 0; i < data.length; i++) { var network = { @@ -59,7 +59,12 @@ kimchi.initNetworkListView = function() { $('input', $('.grid-control', '#network-content-container')).on('keyup', function(){ $('#networkGrid').dataGrid('filter', $(this).val()); }); - }); + }; + if(kimchi.hostarch == kimchi.s390xArch){ + kimchi.listNetworks390x(listNetworks) + } else { + kimchi.listNetworks(listNetworks) + } }; kimchi.addNetworkItem = function(network) { diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index b1f5123..42d1408 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -693,7 +693,7 @@ kimchi.template_edit_main = function() { origmacvtapNetworks = macvtapnet; kimchi.listovsNetworks(function(ovsnet) { origovsNetworks = ovsnet; - kimchi.listNetworks(initInterface_s390x); + kimchi.listNetworks390x(initInterface_s390x); }); }); kimchi.listStoragePools(initStorage_s390); -- 2.7.4

2 1

Wok 2.3 and Kimchi 2.3 are released!
by Aline Manera 30 Sep '16

30 Sep '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.3* and *Kimchi 2.3*! Kimchi 2.3 depends on *Wok 2.3*! So make sure to have both of them properly installed in your system. Among many features, Wok 2.3 release includes: ✔ Improve user log activity to display failed operations ✔ Improve error messages only disappears on user interaction ✔ New Javascript libraries added: ✔ DataTables.net ✔ Moment.JS ✔ User session timeout alert ✔ Use system's nginx proxy service to launch the web server ✔ Remove AsyncTask data from database ✔ Support to make AsyncTask stoppable ✔ Bug fixes Kimchi 2.3 release includes: ✔ Disable ISOs without libvirt permission when creating Templates ✔ Netboot Template support ✔ Do not kill wokd on Kimchi starting up issues ✔ Move peers feature to Ginger Base Dashboard tab ✔ Distinguish Template source media from local or remote, ISO or image ✔ Bug fixes We have worked hard to ensure that Wok and Kimchi run well on the most popular Linux distributions including: Fedora 24, Ubuntu 16.04, openSUSE LEAP 42.1, and CentOS 7. They use standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/wok/archive/2.3.0.tar.gz ✔ https://github.com/kimchi-project/kimchi/archive/2.3.0.tar.gz ✔ git clone --recursive https://github.com/kimchi-project/wok.git There are also some packages available for download at: ✔ http://kimchi-project.github.io/wok/downloads/ ✔ http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

2 1

Plans for next release
by Aline Manera 29 Sep '16

29 Sep '16

Hi all, Once Wok 2.3 and Kimchi 2.3 were announced, I'd like to share with you the new development flow to be adopted up to now. 1. The next branch will not exist anymore from now on. 2. The master branch will always handle new feature development. 3. Now, stable branches are added to the plan. One for each major release. How will it work? The stable-2.3.x branch was already created and points to 2.3.0 release. In this branch, only bug fixes will be merged! By the end of December, the 2.3.1 release will be announced. The master branch will handle the new features development - to be the base for the next major release. Once the major release enters on code freeze, the stable branch for this release will be created and then, only bug fixes will be accepted there. The master branch continues to handle new features development. Specially in this first cycle, we will not have a major release by end of December. Instead of that, we will have a 2.4-Beta. Just because we don't have much time (due the holidays in the end of year) and effort to release two versions together. You can get more details for the next 2 releases in the graphic below. Another change for next year will be the number of releases per year. Today, we have 4 releases per year (March, June, Sept, Dec) and it will be changed to 3 - one release for every 4 months (April, Aug, Dec). That way, we will have 2 months for development and 2 months on code freeze. Maybe that way we can deliver more stable releases. Please, let me know your thoughts on all that. Regards, Aline Manera

1 0

[Kimchi] next branch was merged into master branch
by Aline Manera 29 Sep '16

29 Sep '16

Hi all, Once Kimchi 2.3 was announced, the next branch was merged into master branch. Please, use the master branch for new development as next does not exist anymore. Regards, Aline Manera

1 0

[PATCH] [Ginger] *** Fix retart to restart typo in gh-pages ***
by mwwpublic＠gmail.com 29 Sep '16

29 Sep '16

From: Michael Wang <mwwpublic(a)gmail.com> *** BLURB HERE *** Michael Wang (1): Fix a typo in the GitHub page downloads/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4

4 4

[PATCH] [Kimchi] Improve storage volume creation of XML
by pvital＠linux.vnet.ibm.com 29 Sep '16

29 Sep '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Set the allocation in new storage volume XML to be zero if not creating volume in logical pool, otherwise, use the capacity value of volume. This is an improvement of issue #1017 solution. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- model/storagevolumes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/model/storagevolumes.py b/model/storagevolumes.py index dfd2a19..c006b44 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -122,6 +122,7 @@ class StorageVolumesModel(object): raise InvalidParameter('KCHVOL0001E', {'name': name}) params['pool'] = pool_name + params['pool_type'] = pool_info['type'] targeturi = '/plugins/kimchi/storagepools/%s/storagevolumes/%s' \ % (pool_name, name) taskid = AsyncTask(targeturi, create_func, params).id @@ -141,7 +142,10 @@ class StorageVolumesModel(object): </target> </volume> """ - params.setdefault('allocation', params['capacity']) + allocation = 0 + if params['pool_type'] == "logical": + allocation = params['capacity'] + params.setdefault('allocation', allocation) params.setdefault('format', 'qcow2') name = params['name'] -- 2.7.4

2 1

[PATCH] [Kimchi] Fixed noTemplate message display
by rajgupta＠linux.vnet.ibm.com 28 Sep '16

28 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Fixed NoTemplate message display issue also removed duplicate alert-container div Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/pages/tabs/templates.html.tmpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 7616796..1d3bdf3 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -74,10 +74,6 @@ </div> </div> <div id="alert-container"></div> - <div id="noTemplates" class="list-no-result" style="display: none;"> - $_("No templates found.") - </div> - <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><!-- @@ -93,6 +89,9 @@ </li> </ul> </div> + <div id="noTemplates" class="list-no-result" style="display: none;"> + $_("No templates found.") + </div> </div> <div class="wok-mask"> <div class="wok-mask-loader-container"> -- 2.1.0

3 2

[PATCH v2] [Kimchi] Modified unit test cases to include new s390x specific features
by pkulkark＠linux.vnet.ibm.com 28 Sep '16

28 Sep '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2: Corrected make check-local errors v1: This patch modifies the unit test cases to include the new features introduced for s390x in vm interfaces (macvtap and ovs) and ovsbridges api. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- tests/test_model.py | 24 +++++++++++++++++ tests/test_rest.py | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/tests/test_model.py b/tests/test_model.py index ff2a6cb..082cb9d 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -651,6 +651,30 @@ class ModelTests(unittest.TestCase): iface = inst.vmiface_lookup(vm_name, mac) self.assertEquals(mac, iface['mac']) + if os.uname()[4] == "s390x": + + # attach macvtap interface to vm + iface_args = {"type": "macvtap", + "source": "test-network", + "mode": "vepa"} + mac = inst.vmifaces_create(vm_name, iface_args) + rollback.prependDefer(inst.vmiface_delete, vm_name, mac) + + iface = inst.vmiface_lookup(vm_name, mac) + self.assertEquals("macvtap", iface["type"]) + self.assertEquals("test-network", iface['source']) + self.assertEquals("vepa", iface['mode']) + + # attach ovs interface to vm + iface_args = {"type": "ovs", + "source": "test-network"} + mac = inst.vmifaces_create(vm_name, iface_args) + rollback.prependDefer(inst.vmiface_delete, vm_name, mac) + + iface = inst.vmiface_lookup(vm_name, mac) + self.assertEquals("ovs", iface["type"]) + self.assertEquals("test-network", iface['source']) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_netboot(self): inst = model.Model(objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 3a61d13..bfb25c6 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -967,6 +967,19 @@ class RestTests(unittest.TestCase): 'POST') self.assertEquals(400, resp.status) + # try to attach an interface of type "macvtap" without source + if os.uname()[4] == "s390x": + req = json.dumps({'type': 'macvtap'}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEqual(400, resp.status) + + # try to attach an interface of type "ovs" without source + req = json.dumps({'type': 'ovs'}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEqual(400, resp.status) + # attach network interface to vm req = json.dumps({"type": "network", "network": "test-network", @@ -1018,6 +1031,67 @@ class RestTests(unittest.TestCase): iface['mac'], '{}', 'DELETE') self.assertEquals(204, resp.status) + if os.uname()[4] == "s390x": + # attach macvtap interface to vm + req = json.dumps({"type": "macvtap", + "source": "test-network"}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEquals(201, resp.status) + iface = json.loads(resp.read()) + + self.assertEquals('test-network', iface['source']) + self.assertEquals('macvtap', iface['type']) + + # Start the VM + resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', + 'POST') + vm = json.loads( + self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('running', vm['state']) + + # Force poweroff the VM + resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', + '{}', 'POST') + vm = json.loads( + self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('shutoff', vm['state']) + + # detach network interface from vm + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' % + iface['mac'], '{}', 'DELETE') + self.assertEquals(204, resp.status) + + # attach ovs interface to vm + req = json.dumps({"type": "ovs", + "source": "test-network"}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEquals(201, resp.status) + iface = json.loads(resp.read()) + + self.assertEquals('test-network', iface['source']) + self.assertEquals('ovs', iface['type']) + + # Start the VM + resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', + 'POST') + vm = json.loads( + self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('running', vm['state']) + + # Force poweroff the VM + resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', + '{}', 'POST') + vm = json.loads( + self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('shutoff', vm['state']) + + # detach ovs interface from vm + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' % + iface['mac'], '{}', 'DELETE') + self.assertEquals(204, resp.status) + def test_vm_customise_storage(self): # Create a Template req = json.dumps({'name': 'test', 'disks': DISKS, @@ -1434,6 +1508,10 @@ class RestTests(unittest.TestCase): if distro.get('reason'): self.assertIn('KCHDISTRO0001E', distro.get('reason')) + def test_ovsbridges(self): + resp = self.request('/plugins/kimchi/ovsbridges') + self.assertEquals(200, resp.status) + class HttpsRestTests(RestTests): """ -- 2.1.0

2 1

[PATCH] [Kimchi] For s390x hide VNC, PCI, Snapshot, Graphics and clone options
by rajgupta＠linux.vnet.ibm.com 28 Sep '16

28 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> For s390x hide VNC, PCI, Snapshot, Graphics and clone options Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 4 ++++ ui/js/src/kimchi.guest_main.js | 8 ++++++++ ui/js/src/kimchi.template_edit_main.js | 1 + ui/pages/template-edit.html.tmpl | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c3609c2..9669d08 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -1207,4 +1207,8 @@ kimchi.guest_edit_main = function() { } } }; + + if(kimchi.hostarch === s390xArch){ + $('#guest-edit-window ul li a[data-id="form-guest-edit-pci"],a[data-id="form-guest-edit-snapshot"]').parent().hide(); + } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 34217e4..f1be019 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -20,6 +20,9 @@ var guestFilterList; var listFiltered; +//init s390x Architecture +var s390xArch = 's390x'; + kimchi.sampleGuestObject = { "name": "", "uuid": "", @@ -897,6 +900,11 @@ kimchi.listVmsAuto = function() { } $('#guests-root-container > .wok-mask').fadeOut(300, function() { }); + //check if Architecture is s390x and hide VNC column + if(kimchi.hostarch === s390xArch){ + $('#guests-root-container span.column-vnc').addClass('hidden'); + $('#guestList a[name="vm-clone"]').hide(); + } } else { $('.grid-control').addClass('hidden'); $('#guestListField').hide(); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 7d7cce3..b1f5123 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -69,6 +69,7 @@ kimchi.template_edit_main = function() { $('input[name="' + prop + '"]', templateEditMain).val(value); } if(kimchi.hostarch == s390xArch){ + $('.graphics', templateEditMain).hide(); $('.console', templateEditMain).show(); var consoleData = template.console ? template.console : ''; $('#template-edit-console', templateEditMain).val(consoleData); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 9ccc664..10532be 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -70,7 +70,7 @@ <div class="template-edit-wrapper-label templ-edit-vm-image hide"> <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - <div class="template-edit-wrapper-label"> + <div class="template-edit-wrapper-label graphics"> <label>$_("Graphics")</label> </div> <div class="template-edit-wrapper-label console" style="display:none"> @@ -104,7 +104,7 @@ <input id="template-edit-vmimage-textbox" class="form-control" name="vm-image" type="text" disabled="disabled" /> <span class="fa fa-times form-control-feedback"></span> </div> - <div class="template-edit-wrapper-controls"> + <div class="template-edit-wrapper-controls graphics"> <select id="template-edit-graphics" name="graphics" class="form-control" /> </div> <div class="template-edit-wrapper-controls console" style="display:none"> -- 2.1.0

2 1

[PATCH] [Kimchi] Fix make-rpm target
by Aline Manera 28 Sep '16

28 Sep '16

make-rpm was failing as below because the dist target (which is responsible to generate the package tarball) was removed from rpm generation Add it back and update po/Makefile.in.in to do not modify files while generating the package. /usr/bin/mkdir -p rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp ./kimchi.spec rpm/SPECS/kimchi.spec cp kimchi-2.2.0.tar.gz rpm/SOURCES cp: cannot stat ‘kimchi-2.2.0.tar.gz’: No such file or directory Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- Makefile.am | 8 ++++---- po/Makefile.in.in | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95eff36..01d4edf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,17 +135,17 @@ kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse /bin/false ; \ fi -rpm: kimchi.spec +rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec -fedora-rpm: contrib/kimchi.spec.fedora +fedora-rpm: dist contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec $(MAKE) rpm -suse-rpm: contrib/kimchi.spec.suse +suse-rpm: dist contrib/kimchi.spec.suse ln -sf contrib/kimchi.spec.suse kimchi.spec $(MAKE) rpm @@ -183,7 +183,7 @@ VERSION: git describe --abbrev=0 --always > $@; \ fi -.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm VERSION clean-local: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d01fb31..b7168c7 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -306,7 +306,6 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -317,14 +316,6 @@ dist2: stamp-po $(DISTFILES) if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ -- 2.5.5

2 2

[PATCH] [Wok] Fix make-rpm target
by Aline Manera 28 Sep '16

28 Sep '16

make-rpm was failing as below because the dist target (which is responsible to generate the package tarball) was removed from rpm generation Add it back and update po/Makefile.in.in to do not modify files while generating the package. /usr/bin/mkdir -p rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS <danielhb> cp ./wok.spec rpm/SPECS/wok.spec <danielhb> cp wok-2.2.0.tar.gz rpm/SOURCES <danielhb> cp: cannot stat ‘wok-2.2.0.tar.gz’: No such file or directory --- Makefile.am | 8 ++++---- po/Makefile.in.in | 9 --------- src/wok/plugins/sample/po/Makefile.in.in | 9 --------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2b27a6a..8b3f508 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,17 +115,17 @@ wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse /bin/false ; \ fi -rpm: wok.spec +rpm: dist wok.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec -fedora-rpm: contrib/wok.spec.fedora +fedora-rpm: dist contrib/wok.spec.fedora ln -sf contrib/wok.spec.fedora wok.spec $(MAKE) rpm -suse-rpm: contrib/wok.spec.suse +suse-rpm: dist contrib/wok.spec.suse ln -sf contrib/wok.spec.suse wok.spec $(MAKE) rpm @@ -178,7 +178,7 @@ VERSION: git describe --abbrev=0 --always > $@; \ fi -.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION +.PHONY: deb install-deb rpm fedora-rpm suse-rpm VERSION clean-local: diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d01fb31..b7168c7 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -306,7 +306,6 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -317,14 +316,6 @@ dist2: stamp-po $(DISTFILES) if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ diff --git a/src/wok/plugins/sample/po/Makefile.in.in b/src/wok/plugins/sample/po/Makefile.in.in index 52ab81c..62e9dae 100644 --- a/src/wok/plugins/sample/po/Makefile.in.in +++ b/src/wok/plugins/sample/po/Makefile.in.in @@ -308,7 +308,6 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -319,14 +318,6 @@ dist2: stamp-po $(DISTFILES) if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ -- 2.5.5

2 2

[PATCH] [Kimchi] Issue #1018 - Disable volume resize option on logical pool.
by pvital＠linux.vnet.ibm.com 28 Sep '16

28 Sep '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> It's not possible (probably by the libvirt rules on logical pools) to resize a volume on logical pool. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index c23a4a6..832d3fc 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -247,7 +247,9 @@ kimchi.storageBindClick = function() { } else { // Read-write pools if (poolType !== 'scsi' && poolType !== 'iscsi') { - if (selectedVolumes.length > 1) { + // Not able to resize more than one volume + // Logical pools don't enable resize of their volumes + if (selectedVolumes.length > 1 || poolType === 'logical') { disabled = ['volume-resize']; enabled = ['volume-clone','volume-wipe','volume-delete']; } else { -- 2.7.4

2 1

[PATCH] [Kimchi] Fix max number of memory slots for Ubuntu on Power
by Lucio Correia 28 Sep '16

28 Sep '16

Ubuntu ppc64le has not yet pushed upstream qemu support for 256 memory slots devices. Thus guests created by Kimchi on that distribution cannot be started without editing XML provided by Kimchi. This commit is to be reverted once Ubuntu's qemu is updated with 256 memory slots support. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- osinfo.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/osinfo.py b/osinfo.py index 3e56d97..7c39eee 100644 --- a/osinfo.py +++ b/osinfo.py @@ -20,6 +20,7 @@ import copy import glob import os +import platform import psutil from collections import defaultdict from configobj import ConfigObj @@ -34,14 +35,16 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'ppc64le': ('ppc64le'), 's390x': ('s390x')} - # Memory devices slot limits by architecture -MEM_DEV_SLOTS = {'ppc64': 256, - 'ppc64le': 256, - 'x86_64': 256, - 'i686': 256, - 'i386': 256, - 's390x': 256} +HOST_DISTRO = platform.linux_distribution() +MEM_DEV_SLOTS = { + 'ppc64': 32 if HOST_DISTRO and HOST_DISTRO[0] == 'Ubuntu' else 256, + 'ppc64le': 32 if HOST_DISTRO and HOST_DISTRO[0] == 'Ubuntu' else 256, + 'x86_64': 256, + 'i686': 256, + 'i386': 256, + 's390x': 256, +} template_specs = {'x86': {'old': dict(disk_bus='ide', -- 1.9.1

2 1

[PATCH] [Kimchi] Issue #1017: Fix upload file to logical storage pool.
by pvital＠linux.vnet.ibm.com 28 Sep '16

28 Sep '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Set correct value to volume allocation and chunk size to be transfered, as well, as condition to stop the upload of files. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- model/storagevolumes.py | 9 ++++++--- ui/js/src/kimchi.storagepool_add_volume_main.js | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 0c710b2..b2915e1 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -141,7 +141,7 @@ class StorageVolumesModel(object): </target> </volume> """ - params.setdefault('allocation', 0) + params.setdefault('allocation', params['capacity']) params.setdefault('format', 'qcow2') name = params['name'] @@ -166,7 +166,9 @@ class StorageVolumesModel(object): if params.get('upload', False): upload_volumes[vol_path] = {'lock': threading.Lock(), - 'offset': 0, 'cb': cb} + 'offset': 0, 'cb': cb, + 'expected_vol_size': params['capacity'] + } cb('ready for upload') else: cb('OK', True) @@ -534,7 +536,8 @@ class StorageVolumeModel(object): cb('%s/%s' % (offset + chunk_size, vol_capacity)) vol_data['offset'] += chunk_size - if vol_data['offset'] == vol_capacity: + if (vol_data['offset'] == vol_capacity) or \ + (vol_data['offset'] == vol_data['expected_vol_size']): del upload_volumes[vol_path] cb('OK', True) diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js b/ui/js/src/kimchi.storagepool_add_volume_main.js index ebace9c..e5a0a19 100644 --- a/ui/js/src/kimchi.storagepool_add_volume_main.js +++ b/ui/js/src/kimchi.storagepool_add_volume_main.js @@ -80,7 +80,7 @@ kimchi.sp_add_volume_main = function() { }; var uploadFile = function() { - var chunkSize = 8 * 1024 * 1024; // 8MB + var chunkSize = 2 * 1024 * 1024; // 2MB var uploaded = 0; var blobFile = $(localFileBox)[0].files[0]; @@ -106,7 +106,7 @@ kimchi.sp_add_volume_main = function() { formData: fd }, function(result) { if (uploaded < blobFile.size){ - setTimeout(doUpload, 500); + setTimeout(doUpload, 500); } }, onError); -- 2.7.4

2 1

[PATCH] [Kimchi] Fix issue #1019: Hide storage volume actions menu for iSCSI/SCSI pools
by Aline Manera 28 Sep '16

28 Sep '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 57 +++++++++++++++++++++++++++------------- ui/pages/tabs/storage.html.tmpl | 4 +-- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 0d7a6d7..3208bd2 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -234,24 +234,37 @@ kimchi.storageBindClick = function() { var checkbox = $(this); var volumeBlock = $(this).closest('.wok-datagrid-row'); var volumesBlock = $(this).closest('.volumeslist'); + var poolType = volumesBlock.data('type') + var selectedVolumes = $('[name="selected-volume[]"]:checked',volumesBlock) var disabled = []; - if($('[name="selected-volume[]"]:checked',volumesBlock).length > 1) { - disabled = ['volume-clone','volume-wipe','volume-delete']; - $('.volume-resize',volumesBlock).parent().addClass('disabled'); - for (i = 0; i < disabled.length; i++) { - $('.'+disabled[i],volumesBlock).parent().removeClass('disabled'); - } - }else if($('[name="selected-volume[]"]:checked',volumesBlock).length === 1){ - disabled = ['volume-resize','volume-clone','volume-wipe','volume-delete']; - for (i = 0; i < disabled.length; i++) { - $('.'+disabled[i],volumesBlock).parent().removeClass('disabled'); - } - }else { + var enabled = []; + + // No volume selected + if (selectedVolumes.length === 0) { disabled = ['volume-resize','volume-clone','volume-wipe','volume-delete']; - for (i = 0; i < disabled.length; i++) { - $('.'+disabled[i],volumesBlock).parent().addClass('disabled'); + enabled = []; + // One or more volumes selected + } else { + // Read-write pools + if (poolType !== 'scsi' && poolType !== 'iscsi') { + if (selectedVolumes.length > 1) { + disabled = ['volume-resize']; + enabled = ['volume-clone','volume-wipe','volume-delete']; + } else { + disabled = []; + enabled = ['volume-resize','volume-clone','volume-wipe', 'volume-delete']; + } } } + + for (i = 0; i < disabled.length; i++) { + $('.'+disabled[i],volumesBlock).parent().addClass('disabled'); + } + + for (i = 0; i < enabled.length; i++) { + $('.'+enabled[i],volumesBlock).parent().removeClass('disabled'); + } + if(checkbox.is(":checked")){ volumeBlock.addClass('selected'); }else { @@ -293,19 +306,27 @@ kimchi.storageBindClick = function() { } }); - $('.pool-add-volume').each(function(index) { + $('.volume-add').each(function(index) { var canAddVolume = $(this).data('stat') === 'active' && $(this).data('type') !== 'iscsi' && $(this).data('type') !== 'scsi'; if(canAddVolume) { - $(this).parent().show(); + $(this).parent().removeClass('disabled'); } else { - $(this).parent().hide(); + $(this).parent().addClass('disabled'); } }); + $('.volumeslist').each(function(index) { + var rwpool = $(this).data('type') !== 'iscsi' && + $(this).data('type') !== 'scsi' + + if (!rwpool) + $('.pool-action', $(this)).addClass('hidden'); + }); + if(wok.tabMode['storage'] === 'admin') { $('.pool-delete').on('click', function(event) { event.preventDefault(); @@ -382,7 +403,7 @@ kimchi.storageBindClick = function() { } }); - $('.pool-add-volume').on('click', function(event) { + $('.volume-add').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); kimchi.selectedSP = poolName; diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 92d9b75..65d6d19 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -125,13 +125,13 @@ </span> </span> <div class="volumes"> - <div id="volume-{name}" class="volumeslist" data-name="{name}"> + <div id="volume-{name}" class="volumeslist" data-name="{name}" data-type="{type}"> <div class="row"> <div class="pull-left"> <div class="dropdown menu-flat pool-action"> <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" aria-haspopup="true"><span class="edit-alt"></span>$_("Actions")<span class="caret"></span></button> <ul class="dropdown-menu actionsheet"> - <li><a href="#" class="pool-add-volume" data-stat="{state}" data-name="{name}" data-type="{type}"><i class="fa fa-plus-circle"></i> $_("Add Volume")</a></li> + <li class="disabled"><a href="#" class="volume-add" data-stat="{state}" data-name="{name}" data-type="{type}"><i class="fa fa-plus-circle"></i> $_("Add Volume")</a></li> <li class="disabled"><a href="#" class="volume-resize" data-name="{name}"><i class="fa fa-external-link-square"></i> $_("Resize")</a></li> <li class="disabled"><a href="#" class="volume-clone" data-name="{name}"><i class="fa fa-copy"></i> $_("Clone")</a></li> <li class="disabled"><a href="#" class="volume-wipe" data-name="{name}"><i class="fa fa-eraser"></i> $_("Wipe")</a></li> -- 2.5.5

2 2

[PATCH] [Kimchi] Bug fix #521: Extend logical pool
by Aline Manera 28 Sep '16

28 Sep '16

This patch proper shows the extend logical pool dialog to collect user information and do the request. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 3 +- ui/css/src/modules/_guests.scss | 3 +- ui/js/src/kimchi.storage_main.js | 81 ++++++++++++++++++++------------ ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.json.tmpl | 9 ++-- ui/pages/tabs/storage.html.tmpl | 45 +++++++++--------- 6 files changed, 83 insertions(+), 60 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 959508f..9a9ff25 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -294,7 +294,8 @@ font-size: 32px; } -#wok-confirm-modal .modal-body strong { +#wok-confirm-modal .modal-body strong, +.modal-dialog .modal-body strong { border-bottom: 1px dotted; } diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 237b395..4947123 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -46,7 +46,8 @@ } } -#wok-confirm-modal .modal-body strong { +#wok-confirm-modal .modal-body strong, +.modal-dialog .modal-body strong { border-bottom: 1px dotted; } diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 0d7a6d7..741fd59 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -410,10 +410,8 @@ kimchi.storageBindClick = function() { $('.pool-extend').on('click', function(event) { event.preventDefault(); - //$("#logicalPoolExtend").dialog("option", "poolName", $(this).data('name')); - //$("#logicalPoolExtend").dialog("open"); - partitions = $(this).data('name'); - //$("#logicalPoolExtend").dialog("option", "poolName", $(this).data('name')); + var poolName = $(this).data('name'); + kimchi.selectedSP = poolName; }); } @@ -478,17 +476,23 @@ kimchi._generateVolumeHTML = function(volume) { return volumeHtml[0].outerHTML; }; + +kimchi.getPoolUsageIcon = function(usage) { + if (usage <= 100 && usage >= 85) + return 'icon-high'; + + if (usage <= 85 && usage >= 75) + return 'icon-med'; + + return 'icon-low'; +}; + + kimchi.doUpdateStoragePool = function(poolObj){ var poolName = poolObj.data('name'); kimchi.getStoragePool(poolName, function(result) { result.usage = Math.round(result.allocated / result.capacity * 100) || 0; - if (result.usage <= 100 && result.usage >= 85) { - result.icon = 'icon-high'; - }else if (result.usage <= 85 && result.usage >= 75 ) { - result.icon = 'icon-med'; - } else { - result.icon = 'icon-low'; - } + result.icon = kimchi.getPoolUsageIcon(result.usage); result.allocated = wok.changetoProperUnit(result.allocated,1); $('> .column-usage > .usage-icon',poolObj).attr('class', 'usage-icon').addClass(result.icon).text(result.usage); $('> .column-allocated',poolObj).attr('val',result.allocated).text(result.allocated); @@ -649,30 +653,45 @@ kimchi.doListVolumes = function(poolObj) { }, false); }; - kimchi.initLogicalPoolExtend = function() { - +kimchi.initLogicalPoolExtend = function() { $('#logicalPoolExtend').on('hidden.bs.modal', function () { $('.host-partition', '#logicalPoolExtend').empty(); }); $('#logicalPoolExtend').on('show.bs.modal', function() { - //$('#logicalPoolExtend2').find('.modal-content').html(); - kimchi.listHostPartitions(function(partitions) { - $('#loading-info', '#logicalPoolExtend').removeClass('hidden'); - if (partitions.length > 0) { - for (var i = 0; i < partitions.length; i++) { - if (partitions[i].type === 'part' || partitions[i].type === 'disk') { - $('.host-partition', '#logicalPoolExtend').append(wok.substitute($('#logicalPoolExtendTmpl').html(), partitions[i])); - $('#savePartitions', '#logicalPoolExtend').prop('disabled', false); + // Make any change in the form fields enables the + // 'savePartitions' button if all the visible form + // fields are filled, disables it otherwise. + $('#logicalPoolExtend').on('input change propertychange', function() { + if ($("input[name=devices]:checked").length === 0) { + $("#savePartitions").attr("disabled", true); + } + else { + $("#savePartitions").attr("disabled", false); + } + }); + + kimchi.listHostPartitions(function(data) { + if (data.length > 0) { + var deviceHtml = $('#partitionTmpl').html(); + var listHtml = '<table class="table table-hover"><thead><tr><th></th><th>Device</th><th>Path</th><th>Size (GiB)</th></tr></thead><tbody>'; + valid_types = ['part', 'disk', 'mpath']; + $.each(data, function(index, value) { + if (valid_types.indexOf(value.type) !== -1) { + value.size = (value.size / 1000000000).toFixed(2); + listHtml += wok.substitute(deviceHtml, value); } - } + }); + listHtml += '</tbody></table>'; + var infoHtml = '<h3>' + i18n['KCHPOOL6019M'].replace('%1', '<strong>' + kimchi.selectedSP + '</strong>') + '</h3>'; + $('.host-partition', '#logicalPoolExtend').html(infoHtml + listHtml); } else { - $('#loading-info', '#logicalPoolExtend').addClass('hidden'); $('.host-partition').html(i18n['KCHPOOL6011M']); + $('.host-partition').addClass('text-help'); } }, function(err) { - $('#loading-info', '#logicalPoolExtend').addClass('hidden'); $('.host-partition').html(i18n['KCHPOOL6013M'] + '<br/>(' + err.responseJSON.reason + ')'); + $('.host-partition').addClass('text-help'); }); $('#savePartitions', '#logicalPoolExtend').on('click', function(event) { @@ -681,14 +700,16 @@ kimchi.doListVolumes = function(poolObj) { $("input[type='checkbox']:checked", "#logicalPoolExtend").each(function() { devicePaths.push($(this).prop('value')); }); - kimchi.updateStoragePool($("#logicalPoolExtend"), { + kimchi.updateStoragePool(kimchi.selectedSP, { disks: devicePaths - }, function(partitions) { - var item = $("#" + $("#logicalPoolExtend").dialog("option", "poolName")); + }, function(pool) { $('#logicalPoolExtend').modal('hide'); - $(".usage", $(".storage-name", item)).text((Math.round(partitions.allocated / partitions.capacity * 100) || 0) + "%"); - $(".storage-text", $(".storage-capacity", item)).text(wok.changetoProperUnit(partitions.capacity, 1)); - $(".storage-text", $(".storage-allocate", item)).text(wok.changetoProperUnit(partitions.allocated, 1)); + var item = '#' + pool.name; + var usage = Math.round(pool.allocated / pool.capacity * 100) || 0; + var usageIcon = kimchi.getPoolUsageIcon(usage); + $(".usage-icon", $(".column-usage", item)).attr('class', 'usage-icon').addClass(usageIcon).text(usage); + $(".column-capacity", item).text(wok.changetoProperUnit(pool.capacity, 1)); + $(".column-allocated", item).text(wok.changetoProperUnit(pool.allocated, 1)); }, function(err) { $('#savePartitions', '#logicalPoolExtend').prop('disabled', true); $('#logicalPoolExtend').modal('hide'); diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 3fe2548..5a020ee 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -127,7 +127,7 @@ kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); - var listHtml = '<table class="table table-hover"><thead><tr><th></th><th>device</th><th>path</th><th>size (GiB)</th></tr></thead><tbody>'; + var listHtml = '<table class="table table-hover"><thead><tr><th></th><th>Device</th><th>Path</th><th>Size (GiB)</th></tr></thead><tbody>'; valid_types = ['part', 'disk', 'mpath']; $.each(data, function(index, value) { if (valid_types.indexOf(value.type) !== -1) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 7beee19..c67e9e8 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -103,10 +103,6 @@ "KCHPOOL6008M": "$_("Failed to load iSCSI targets.")", "KCHPOOL6009M": "$_("Would you like to continue?")", "KCHPOOL6010M": "$_("This will permanently delete the following storage volumes: %1")", - - "KCHPOOL6005E": "$_("Invalid NFS mount path.")", - "KCHPOOL6006E": "$_("No logical device selected.")", - "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6011M": "$_("No available partitions found.")", "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", @@ -115,6 +111,11 @@ "KCHPOOL6016M": "$_("No LVM found in the system.")", "KCHPOOL6017M": "$_("This will permanently wipe the following storage volumes: %1")", "KCHPOOL6018M": "$_("Wipe Confirmation")", + "KCHPOOL6019M": "$_("Select one or more partitions to be added to the logical pool %1:")", + + "KCHPOOL6005E": "$_("Invalid NFS mount path.")", + "KCHPOOL6006E": "$_("No logical device selected.")", + "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHVMSTOR0001E": "$_("CDROM path needs to be a valid local/remote path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")", diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 92d9b75..4215d55 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -74,21 +74,21 @@ <div id="logicalPoolExtend" class="modal fade logicalpool-modal" tabindex="-2" role="dialog" aria-labelledby="logicalPoolExtendLabel" aria-hidden="true"> <div class="modal-dialog modal-sm"> <div class="modal-content"> - <div class="modal-header"> + <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" id="logicalPoolExtendLabel">$_("Device path")</h4> - </div> - <div class="modal-body"> - <p id="loading-info" class="hidden"><span class="wok-loading-icon"></span><span>$_("Looking for available partitions ...")</span></p> - <div class="host-partition"> - </div> - </div> - <div class="modal-footer"> - <button type="button" id="savePartitions" class="btn btn-default" disabled="disabled">$_("Save")</button> - <button type="button" class="btn btn-default" data-dismiss="modal">$_("Cancel")</button> - </div> + <h4 class="modal-title" id="logicalPoolExtendLabel">$_("Extending logical pool")</h4> + </div> + <div class="modal-body"> + <div class="host-partition"> + <span class="wok-loading-icon"></span><span>$_("Looking for available partitions ...")</span> + </div> + </div> + <div class="modal-footer"> + <button type="button" id="savePartitions" class="btn btn-default" disabled="disabled">$_("Save")</button> + <button type="button" class="btn btn-default" data-dismiss="modal">$_("Cancel")</button> + </div> </div> - </div> + </div> </div> </div> <div class="wok-mask"> @@ -200,17 +200,16 @@ </div> </li> </script> -<script id="logicalPoolExtendTmpl" type="html/text"> - <div> - <input type="checkbox" class="wok-checkbox" id="{name}" value="{path}" name="devices"> - <label for="{name}"> - <div> - <span class="device-name">{name}</span> - <span class="device-path">{path}</span> - </div> - </label> - </div> + +<script id="partitionTmpl" type="html/text"> + <tr> + <td><input type="checkbox" class="wok-checkbox" id="{name}" value="{path}" name="devices"><label for="{name}"></label></td> + <td>{name}</td> + <td>{path}</td> + <td>{size}</td> + </tr> </script> + <script> kimchi.storage_main(); </script> -- 2.5.5

2 4

[PATCH] [Kimchi] Fix issue #1022: Remove 'Clone' option for running guests
by Aline Manera 28 Sep '16

28 Sep '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 1 - ui/pages/guest.html.tmpl | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 34217e4..f734837 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -640,7 +640,6 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions = result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop("disabled", !vmRunningBool); - guestActions.find(".running-disabled").prop("disabled", vmRunningBool); guestActions.find(".non-persistent-disabled").prop("disabled", !vmPersistent); guestActions.find(".reset-disabled").prop("disabled", vmPoweredOffBool || !vmPersistent); guestActions.find(".pause-disabled").prop("disabled", vmPoweredOffBool || !vmPersistent); diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 389ba9d..cc09aa0 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -61,9 +61,8 @@ <ul class="dropdown-menu" role="menu"> <li role="presentation"><a nwAct="connect-vnc" class='shutoff-disabled' name="vm-console" href="#"><i class="fa fa-list-alt"></i>$_("View Console")</a></li> <li role="presentation"><a nwAct="connect-serial-console" class='shutoff-hidden' name="vm-serial-console" href="#"><i class="fa fa-list-alt"></i>$_("View Serial")</a></li> -  <li role="presentation"><a nwAct="edit" name="vm-edit" href="#"><i class="fa fa-pencil"></i>$_("Edit")</a></li> - <li role="presentation"><a nwAct="clone" class='running-disabled' name="vm-clone" href="#"><i class="fa fa-copy"></i>$_("Clone")</a></li> + <li role="presentation"><a nwAct="clone" class='running-hidden' name="vm-clone" href="#"><i class="fa fa-copy"></i>$_("Clone")</a></li> <li role="presentation"><a nwAct="migrate" name="vm-migrate" href="#"><i class="fa fa-exchange"></i>$_("Migrate")</a></li> <li role="presentation"><a nwAct="reset" class='shutoff-hidden non-persistent-disabled' name="vm-reset" href="#"><i class="fa fa-refresh"></i>$_("Reset")</a></li> <li role="presentation"><a nwAct="pause" class='pause-hidden non-persistent-disabled' name="vm-pause" href="#"><i class="fa fa-pause"></i>$_("Pause")</a></li> -- 2.5.5

2 2

[PATCH][Kimchi] Issue #962: Suggestion to check spec guidelines
by Ramon Medeiros 28 Sep '16

28 Sep '16

Run rpmlint on check-local Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 5 ++++- check_spec_errors.sh | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index b39f9e3..dee6aae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,10 @@ check-local: && echo "ERROR: Whitespaces found" || echo "Ok"; \ echo "IBM copyright year verification ..." ; \ /bin/bash ../../../../check-IBM-license-header.sh ; \ - fi + fi; + @if [ -f $(RPMLINT) ]; then \ + ./check_spec_errors.sh; \ + fi; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..5e43d8b --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +echo "Checking spec guidelines" + +# create links +cp contrib/kimchi.spec.fedora contrib/kimchi_fedora.spec +cp contrib/kimchi.spec.suse contrib/kimchi_suse.spec + +# run checking +rpmlint contrib/kimchi_fedora.spec +rpmlint contrib/kimchi_suse.spec + +# remove links +rm contrib/kimchi_fedora.spec +rm contrib/kimchi_suse.spec + + diff --git a/configure.ac b/configure.ac index 870ac0c..cafff0c 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AM_INIT_AUTOMAKE([-Wno-portability]) AM_PATH_PYTHON([2.6]) AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8]) AC_PATH_PROG([GIT], [git], [/usr/bin/git]) +AC_PATH_PROG([RPMLINT], [rpmlint], [/usr/bin/rpmlint]) AC_PYTHON_MODULE([unittest]) AC_SUBST([HAVE_PYMOD_UNITTEST]) AC_SUBST([PYTHON_VERSION]) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ca24994..65ad987 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -47,7 +47,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests python-mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index a69dacd..1c5fc23 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -45,4 +45,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock rpmlint -- 2.5.5

2 1

[PATCH][Wok] Issue #166: wok is pointing to /etc/nginx/conf.d which does not exists on OpenSuse 42.1
by Ramon Medeiros 28 Sep '16

28 Sep '16

Create dir if not exist Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/proxy.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/wok/proxy.py b/src/wok/proxy.py index b68b86e..4b06fc2 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -116,6 +116,11 @@ def _create_proxy_config(options): # SSL certifications. if not paths.installed: dst = os.path.join(paths.sys_nginx_conf_dir, "wok.conf") + + # directoy does not exist: create it + if not os.path.exists(paths.sys_nginx_conf_dir): + os.makedirs(paths.sys_nginx_conf_dir) + if os.path.isfile(dst) or os.path.islink(dst): os.remove(dst) os.symlink(os.path.join(nginx_config_dir, "wok.conf"), dst) -- 2.5.5

4 10

[PATCH] [Wok] Fix Kimchi issue #1032: Remove 'Peers' dropdown from Wok header
by Aline Manera 28 Sep '16

28 Sep '16

The federation feature (provided by Kimchi) is responsible to list the peers found in the same network using openSLP. The UI for this feature is done in Kimchi code by extending the Dashboard tab content (provided by Ginger Base). So remove any reference to peers in Wok source code. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/theme-default/topbar.css | 34 ---------------------------------- ui/pages/wok-ui.html.tmpl | 7 ------- 2 files changed, 41 deletions(-) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 33624aa..43b8b39 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -177,40 +177,6 @@ a#btn-logout:hover { } } -.peers { - color: white; - cursor: pointer; - height: 52px; - margin: 0 12px; -} - -.peers span { - margin-top: 25px; -} - -.peers .arrow { - border: 6px solid transparent; - border-bottom: none; - border-top-color: white; - display: inline-block; - width: 0; -} - -.peers .dropdown { - top: 45px; - right: 110px; - color: black; - padding: 10px 15px; - white-space: nowrap; - line-height: 12px; - width: inherit; -} - -.peers .dropdown a { - display: block; - padding: 10px; -} - .hide-content { display: none!important; } diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e49b602..22a67e7 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -123,13 +123,6 @@ <a id="logo" class="navbar-brand" href="#" title="Wok">Wok</a> </div> <ul class="nav navbar-nav navbar-right"> - <li class="dropdown hide-content peers" id="peers"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="topbar-text">$_("Peers")</span><span class="caret"></span></a> - <ul class="dropdown-menu"> - <li id="search-peers"><span>$_("Searching")...</span></li> - <li id="no-peers" class="hide-content">$_("No peers found.")</li> - </ul> - </li> <li class="dropdown" id="user-login"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-user" id="user-icon"></i><span class="topbar-text empty-when-logged-off" id="user-name"></span><span class="caret"></span> -- 2.5.5

2 2

[PATCH] [Kimchi] Bug fix: Recognize Fedora 24 ISO
by Aline Manera 27 Sep '16

27 Sep '16

Fix regex to get the right Fedora versin while scanning a Fedora 25 ISO file. Without this patch, while trying to use a Fedora 24 ISO, the version is set to 1 instead of 24 as the Volume id is: Fedora-WS-Live-24-1-2 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- isoinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isoinfo.py b/isoinfo.py index 6356698..5eb68ab 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -119,7 +119,7 @@ iso_dir = [ ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), - ('fedora', lambda m: m.group(1), 'Fedora-[\w-]+-(\d+)'), + ('fedora', lambda m: m.group(1), 'Fedora-[\D-]+-(\d+)'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), -- 2.5.5

3 3

[PATCH] [Kimchi] For s390x hide VNC, PCI, Snapshot, Graphics and clone options
by rajgupta＠linux.vnet.ibm.com 27 Sep '16

27 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> For s390x hide VNC, PCI, Snapshot, Graphics and clone options Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 4 ++++ ui/js/src/kimchi.guest_main.js | 8 ++++++++ ui/js/src/kimchi.template_edit_main.js | 1 + ui/pages/template-edit.html.tmpl | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c3609c2..9669d08 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -1207,4 +1207,8 @@ kimchi.guest_edit_main = function() { } } }; + + if(kimchi.hostarch === s390xArch){ + $('#guest-edit-window ul li a[data-id="form-guest-edit-pci"],a[data-id="form-guest-edit-snapshot"]').parent().hide(); + } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 34217e4..f1be019 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -20,6 +20,9 @@ var guestFilterList; var listFiltered; +//init s390x Architecture +var s390xArch = 's390x'; + kimchi.sampleGuestObject = { "name": "", "uuid": "", @@ -897,6 +900,11 @@ kimchi.listVmsAuto = function() { } $('#guests-root-container > .wok-mask').fadeOut(300, function() { }); + //check if Architecture is s390x and hide VNC column + if(kimchi.hostarch === s390xArch){ + $('#guests-root-container span.column-vnc').addClass('hidden'); + $('#guestList a[name="vm-clone"]').hide(); + } } else { $('.grid-control').addClass('hidden'); $('#guestListField').hide(); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 7d7cce3..b1f5123 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -69,6 +69,7 @@ kimchi.template_edit_main = function() { $('input[name="' + prop + '"]', templateEditMain).val(value); } if(kimchi.hostarch == s390xArch){ + $('.graphics', templateEditMain).hide(); $('.console', templateEditMain).show(); var consoleData = template.console ? template.console : ''; $('#template-edit-console', templateEditMain).val(consoleData); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 9ccc664..10532be 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -70,7 +70,7 @@ <div class="template-edit-wrapper-label templ-edit-vm-image hide"> <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - <div class="template-edit-wrapper-label"> + <div class="template-edit-wrapper-label graphics"> <label>$_("Graphics")</label> </div> <div class="template-edit-wrapper-label console" style="display:none"> @@ -104,7 +104,7 @@ <input id="template-edit-vmimage-textbox" class="form-control" name="vm-image" type="text" disabled="disabled" /> <span class="fa fa-times form-control-feedback"></span> </div> - <div class="template-edit-wrapper-controls"> + <div class="template-edit-wrapper-controls graphics"> <select id="template-edit-graphics" name="graphics" class="form-control" /> </div> <div class="template-edit-wrapper-controls console" style="display:none"> -- 2.1.0

1 0

[PATCH V2] Issue #999 : Attach storage to guest on s390x without libvirt
by harshalp＠linux.vnet.ibm.com 26 Sep '16

26 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch enables direct storage attachment to guests running on s390x arch without going through libvirt V2: Rebase with latest HEAD Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 3 +++ i18n.py | 3 +++ model/vmstorages.py | 25 +++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index cff623e..b29108d 100644 --- a/docs/API.md +++ b/docs/API.md @@ -239,6 +239,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * path: Path of cdrom iso. * pool: Storage pool which disk image file locate in. * vol: Storage volume name of disk image. + * dir_path: s390x specific attribute to attach direct storage without libvirt + * format: s390x specific attribute specify the format of direct storage + * size: s390x specific attribute to specify the size of direct storage ### Sub-resource: storage **URI:** /plugins/kimchi/vms/*:name*/storages/*:dev* diff --git a/i18n.py b/i18n.py index 89a23af..82c679b 100644 --- a/i18n.py +++ b/i18n.py @@ -336,6 +336,9 @@ messages = { "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), "KCHVMSTOR0018E": _("Volume chosen with format %(format)s does not fit in the storage type %(type)s"), + "KCHVMSTOR0019E": _("On s390x arch one of pool, path of dir_path must be specified"), + "KCHVMSTOR0020E": _("On s390x arch 'format' must be specified while attaching disk to virtual machine"), + "KCHVMSTOR0021E": _("Virtual disk already exists on the system: %(disk_path)s"), "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), diff --git a/model/vmstorages.py b/model/vmstorages.py index 2e9f783..db68121 100644 --- a/model/vmstorages.py +++ b/model/vmstorages.py @@ -17,6 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import os import string from lxml import etree @@ -30,6 +31,7 @@ from wok.plugins.kimchi.model.storagevolumes import StorageVolumeModel from wok.plugins.kimchi.model.utils import get_vm_config_flag from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel from wok.plugins.kimchi.osinfo import lookup +from wok.plugins.kimchi.utils import create_disk_image, is_s390x from wok.plugins.kimchi.xmlutils.disk import get_device_node, get_disk_xml from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks @@ -82,11 +84,30 @@ class VMStoragesModel(object): # Path will never be blank due to API.json verification. # There is no need to cover this case here. if not ('vol' in params) ^ ('path' in params): - raise InvalidParameter("KCHVMSTOR0017E") + + if not is_s390x(): + raise InvalidParameter("KCHVMSTOR0017E") + + if 'dir_path' not in params: + raise InvalidParameter("KCHVMSTOR0019E") dom = VMModel.get_vm(vm_name, self.conn) params['bus'] = _get_device_bus(params['type'], dom) - params['format'] = 'raw' + + if is_s390x() and params['type'] == 'disk' and 'dir_path' in params: + if 'format' not in params: + raise InvalidParameter("KCHVMSTOR0020E") + size = params['size'] + name = params['name'] + dir_path = params.get('dir_path') + params['path'] = dir_path + "/" + name + if os.path.exists(params['path']): + raise InvalidParameter("KCHVMSTOR0021E", + {'disk_path': params['path']}) + create_disk_image(format_type=params['format'], + path=params['path'], capacity=size) + else: + params['format'] = 'raw' dev_list = [dev for dev, bus in get_vm_disks(dom).iteritems() if bus == params['bus']] -- 2.7.4

2 1

[PATCH] [Kimchi] Fix issue #1005: Proper display paused guests on Gallery View
by Aline Manera 26 Sep '16

26 Sep '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 78 ++++++++++++++++++++++++++++++++++++++--- ui/css/src/modules/_guests.scss | 76 ++++++++++++++++++++++++++++++++++++--- ui/pages/guest.html.tmpl | 6 +++- 3 files changed, 150 insertions(+), 10 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 6cf2cc9..de742b3 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -689,9 +689,12 @@ display: block; } -#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.paused, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.shutoff, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.pmsuspended, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.running span.resetting { display: none; } @@ -700,9 +703,12 @@ display: block; } -#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.paused, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.running, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.pmsuspended, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.shutoff span.resetting { display: none; } @@ -711,21 +717,83 @@ display: block; } -#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.paused, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.running, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.shutoff, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.pmsuspended, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.starting span.resetting { display: none; } +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.crashed { + display: block; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.running, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.shutoff, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.pmsuspended, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.crashed span.resetting { + display: none; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.nostate { + display: block; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.running, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.shutoff, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.pmsuspended, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.nostate span.resetting { + display: none; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.paused { + display: block; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.running, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.shutoff, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.pmsuspended, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.paused span.resetting { + display: none; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.pmsuspended { + display: block; +} + +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.running, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.shutoff, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.pmsuspended span.resetting { + display: none; +} + #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.resetting { display: block; } -#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.paused, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.running, #guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.shutoff, -#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.starting { +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.starting, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.crashed, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.nostate, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.paused, +#guest-content-container .wok-guest-gallery .wok-guest-list-item .btn > span.guest-state.resetting span.pmsuspended { display: none; } diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 8b8345c..237b395 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -382,9 +382,12 @@ span.running { display: block; } - span.paused, span.shutoff, span.starting, + span.crashed, + span.nostate, + span.paused, + span.pmsuspended, span.resetting { display: none; } @@ -393,9 +396,12 @@ span.shutoff { display: block; } - span.paused, span.running, span.starting, + span.crashed, + span.nostate, + span.paused, + span.pmsuspended, span.resetting { display: none; } @@ -404,21 +410,83 @@ span.starting { display: block; } + span.running, + span.shutoff, + span.crashed, + span.nostate, span.paused, + span.pmsuspended, + span.resetting { + display: none; + } + } + > span.guest-state.crashed { + span.crashed { + display: block; + } span.running, span.shutoff, + span.starting, + span.nostate, + span.paused, + span.pmsuspended, span.resetting { display: none; } } - > span.guest-state.resetting { + > span.guest-state.nostate { + span.nostate { + display: block; + } + span.running, + span.shutoff, + span.starting, + span.crashed, + span.paused, + span.pmsuspended, span.resetting { + display: none; + } + } + > span.guest-state.paused { + span.paused { display: block; } + span.running, + span.shutoff, + span.starting, + span.crashed, + span.nostate, + span.pmsuspended, + span.resetting { + display: none; + } + } + > span.guest-state.pmsuspended { + span.pmsuspended { + display: block; + } + span.running, + span.shutoff, + span.starting, + span.crashed, + span.nostate, span.paused, + span.resetting { + display: none; + } + } + > span.guest-state.resetting { + span.resetting { + display: block; + } span.running, span.shutoff, - span.starting { + span.starting, + span.crashed, + span.nostate, + span.paused, + span.pmsuspended { display: none; } } diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index f92bf11..389ba9d 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -44,8 +44,12 @@ </span> <span class="guest-state"> <span class="running"><i class="fa fa-power-off"></i><span class="text-status">$_("Running")</span></span><span class="shutoff"><i class="fa fa-ban"></i><span class="text-status">$_("Disconnected")</span></span><span class="shutoff shutdown blocked"><i class="fa fa-ban"></i><span class="text-status">$_("Disconnected")</span></span><span class="starting"><i class="fa fa-undo"></i><span class="text-status">$_("Starting")</span></span><span class="crashed"><i class="fa fa-exclamation-triangle"></i><span class="text-status">$_("Crashed")</span></span><span class="nostate"><i class="fa fa-question-circle"></i><span class="text-status">$_("Unknown")</span></span><span class="paused"><i class="fa fa-pause"></i><span class="text-status">$_("Paused")</span></span><span class="pmsuspended"><i class="fa fa-power-off"></i><span class="text-status">$_("Suspended")</span></span><span class="resetting"><i class="fa fa-refresh fa-spin"></i><span class="text-status">$_("Resetting")</span></span><span class="caret"></span> </span> -- 2.5.5

2 2

[PATCH] [Kimchi 0/3] Fix issue #1020
by Aline Manera 23 Sep '16

23 Sep '16

Aline Manera (3): Fix issue #1020: Verify libvirt access on real file path instead of symlink Fix issue #1020: Fix alert icon position to do not overlay img/iso icon Bug fix: Disable "Search More ISOs" button on create Template dialog when the operation is in progress model/storagevolumes.py | 3 ++- model/templates.py | 5 +++-- ui/css/kimchi.css | 4 ++-- ui/css/src/modules/_templates.scss | 4 ++-- ui/js/src/kimchi.template_add_main.js | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) -- 2.5.5

2 5

[PATCH] [Wok v2] Issue #155: 'make clean' does not revert its changes from 'make rpm'
by bianca＠linux.vnet.ibm.com 23 Sep '16

23 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited Makefile.am to check if there is any file to be stashed or commited before run 'make rpm' to avoid losing any changes. Also included 'git reset --hard' command to revert changes made by 'make rpm' command. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 10d9718..2b27a6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,30 +115,17 @@ wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse /bin/false ; \ fi -check_files: - @if [ -d '.git' ]; then \ - if [ `git status --porcelain --untracked-files=no | wc -l` -gt 0 ]; then \ - echo "***** Aborting 'make rpm' command *****"; \ - echo "There are some changes not commited in your working \ -directory. To avoid losing them, please commit or stage before run 'make rpm' command."; \ - exit 1; \ - fi \ - fi - -rpm: check_files dist wok.spec +rpm: wok.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec - @if [ -d '.git' ]; then \ - git reset --hard; \ - fi -fedora-rpm: check_files contrib/wok.spec.fedora +fedora-rpm: contrib/wok.spec.fedora ln -sf contrib/wok.spec.fedora wok.spec $(MAKE) rpm -suse-rpm: check_files contrib/wok.spec.suse +suse-rpm: contrib/wok.spec.suse ln -sf contrib/wok.spec.suse wok.spec $(MAKE) rpm -- 2.7.4

2 1

Centos 7 latest and updated no VIRTIO support with Kimchi
by emad ramlawi 23 Sep '16

23 Sep '16

Hello, I really like your project, just wondered why I cant see any options to set Virt IO devices, while PowerKVM have that, I am suing Version: 2.2.0-0 And Centos : PowerKVM Host userspace tools based on the libvirt API, including virsh. Note: The HMC cannot be used on Power systems running PowerKVM. PowerKVM device model support Supported disk models: * virtio-scsi * virtio * spapr-vscsi Unsupported disk models: * IDE Supported network models: * virtio * spapr-vlan Supported graphics models: * vga (VNC backend only) Unsupported graphics models: * SPICE

1 2

[PATCH] Issue #999: Attach storage to guest on s390x without libvirt
by harshalp＠linux.vnet.ibm.com 22 Sep '16

22 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> This patch enables direct storage attachment to guests running on s390x arch without going through libvirt Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 3 +++ i18n.py | 3 +++ model/vmstorages.py | 25 +++++++++++++++++++++++-- utils.py | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/docs/API.md b/docs/API.md index 6678ac5..c9d5d2a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -239,6 +239,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * path: Path of cdrom iso. * pool: Storage pool which disk image file locate in. * vol: Storage volume name of disk image. + * dir_path: s390x specific attribute to attach direct storage without libvirt + * format: s390x specific attribute specify the format of direct storage + * size: s390x specific attribute to specify the size of direct storage ### Sub-resource: storage **URI:** /plugins/kimchi/vms/*:name*/storages/*:dev* diff --git a/i18n.py b/i18n.py index fc7dbc7..ceb4286 100644 --- a/i18n.py +++ b/i18n.py @@ -332,6 +332,9 @@ messages = { "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), "KCHVMSTOR0018E": _("Volume chosen with format %(format)s does not fit in the storage type %(type)s"), + "KCHVMSTOR0019E": _("On s390x arch one of pool, path of dir_path must be specified"), + "KCHVMSTOR0020E": _("On s390x arch 'format' must be specified while attaching disk to virtual machine"), + "KCHVMSTOR0021E": _("Virtual disk already exists on the system: %(disk_path)s"), "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), diff --git a/model/vmstorages.py b/model/vmstorages.py index 2e9f783..156a16f 100644 --- a/model/vmstorages.py +++ b/model/vmstorages.py @@ -17,6 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import os import string from lxml import etree @@ -30,6 +31,7 @@ from wok.plugins.kimchi.model.storagevolumes import StorageVolumeModel from wok.plugins.kimchi.model.utils import get_vm_config_flag from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel from wok.plugins.kimchi.osinfo import lookup +from wok.plugins.kimchi.utils import create_disk_image, is_s390x from wok.plugins.kimchi.xmlutils.disk import get_device_node, get_disk_xml from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks @@ -82,11 +84,30 @@ class VMStoragesModel(object): # Path will never be blank due to API.json verification. # There is no need to cover this case here. if not ('vol' in params) ^ ('path' in params): - raise InvalidParameter("KCHVMSTOR0017E") + if not is_s390x(): + raise InvalidParameter("KCHVMSTOR0017E") + + if 'dir_path' not in params: + raise InvalidParameter("KCHVMSTOR0019E") dom = VMModel.get_vm(vm_name, self.conn) params['bus'] = _get_device_bus(params['type'], dom) - params['format'] = 'raw' + + if is_s390x() and params['type'] == 'disk': + if 'format' not in params: + raise InvalidParameter("KCHVMSTOR0020E") + if 'dir_path' in params: + size = params['size'] + name = params['name'] + dir_path = params.get('dir_path') + params['path'] = dir_path + "/" + name + if os.path.exists(params['path']): + raise InvalidParameter("KCHVMSTOR0021E", + {'disk_path': params['path']}) + create_disk_image(format_type=params['format'], + path=params['path'], capacity=size) + else: + params['format'] = 'raw' dev_list = [dev for dev, bus in get_vm_disks(dom).iteritems() if bus == params['bus']] diff --git a/utils.py b/utils.py index 0fca191..7fdec02 100644 --- a/utils.py +++ b/utils.py @@ -305,4 +305,4 @@ def create_disk_image(format_type, path, capacity): if rc != 0: raise OperationFailed("KCHTMPL0035E", {'err': err}) - return \ No newline at end of file + return -- 1.9.1

4 11

[PATCH V2] Issue #1045 : boot order fix for guest edit
by harshalp＠linux.vnet.ibm.com 22 Sep '16

22 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> This patch sets the cdrom as the first boot device on s390x arch Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- vmtemplate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..b71f947 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -392,7 +392,10 @@ class VMTemplate(object): # Set the boot order of VM # TODO: need modify this when boot order edition feature came upstream. - params['boot_order'] = get_bootorder_xml() + if cdrom_xml and params.get('arch') == 's390x': + params['boot_order'] = get_bootorder_xml(['cdrom', 'hd', 'network']) + else: + params['boot_order'] = get_bootorder_xml() # Setting maximum number of memory slots slots = str(self.info['mem_dev_slots']) -- 2.7.4

2 1

[PATCH V2] Issue #1045 : boot order fix for guest edit
by harshalp＠linux.vnet.ibm.com 22 Sep '16

22 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch sets the cdrom as the first boot device on s390x arch V2: Review comments Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- vmtemplate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..b71f947 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -392,7 +392,10 @@ class VMTemplate(object): # Set the boot order of VM # TODO: need modify this when boot order edition feature came upstream. - params['boot_order'] = get_bootorder_xml() + if cdrom_xml and params.get('arch') == 's390x': + params['boot_order'] = get_bootorder_xml(['cdrom', 'hd', 'network']) + else: + params['boot_order'] = get_bootorder_xml() # Setting maximum number of memory slots slots = str(self.info['mem_dev_slots']) -- 2.7.4

1 0

[PATCH][Kimchi] Issue #1012: Boot order gets reset to only one entry after editing a VM
by Ramon Medeiros 21 Sep '16

21 Sep '16

The comparison 'if "bootorder" or "bootmenu" in params' was always returning true, beyond this error, the function always remove boot sequence, without check if the user asked to. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/model/vms.py b/model/vms.py index b889166..f56038d 100644 --- a/model/vms.py +++ b/model/vms.py @@ -775,12 +775,12 @@ class VMModel(object): # get machine type os = et.find("os") - # remove old order - for device in os.findall("boot"): - os.remove(device) - # add new bootorder if "bootorder" in params: + + # remove old order + [os.remove(device) for device in os.findall("boot")] + for device in get_bootorder_node(params["bootorder"]): os.append(device) @@ -858,7 +858,7 @@ class VMModel(object): new_xml = self._update_memory_config(new_xml, params, dom) # update bootorder or bootmenu - if "bootorder" or "bootmenu" in params: + if "bootorder" in params or "bootmenu" in params: new_xml = self._update_bootorder(new_xml, params) snapshots_info = [] -- 2.5.5

2 1

[PATCH] [Wok] Issue #155: 'make clean' does not revert its changes from 'make rpm'
by bianca＠linux.vnet.ibm.com 21 Sep '16

21 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Edited Makefile.am to check if there is any file to be stashed or commited before run 'make rpm' to avoid losing any changes. Also included 'git reset --hard' command to revert changes made by 'make rpm' command. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ac07e97..10d9718 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,17 +115,30 @@ wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse /bin/false ; \ fi -rpm: dist wok.spec +check_files: + @if [ -d '.git' ]; then \ + if [ `git status --porcelain --untracked-files=no | wc -l` -gt 0 ]; then \ + echo "***** Aborting 'make rpm' command *****"; \ + echo "There are some changes not commited in your working \ +directory. To avoid losing them, please commit or stage before run 'make rpm' command."; \ + exit 1; \ + fi \ + fi + +rpm: check_files dist wok.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec + @if [ -d '.git' ]; then \ + git reset --hard; \ + fi -fedora-rpm: contrib/wok.spec.fedora +fedora-rpm: check_files contrib/wok.spec.fedora ln -sf contrib/wok.spec.fedora wok.spec $(MAKE) rpm -suse-rpm: contrib/wok.spec.suse +suse-rpm: check_files contrib/wok.spec.suse ln -sf contrib/wok.spec.suse wok.spec $(MAKE) rpm -- 2.7.4

2 1

[PATCH v3] [Kimchi] Issue #585: 'make clean' does not revert its changes from 'make rpm'
by bianca＠linux.vnet.ibm.com 21 Sep '16

21 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Removed 'dist' from rpm in makefile.am file, before rpm runs, it calls 'make dist' which changes some files when is not supposed to. Removing that will prevent it to happen. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- Makefile.am | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0ddcff0..b39f9e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ do_substitution = \ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ -e 's,[@]localstatedir[@],$(localstatedir),g' \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ - -e 's,[@]wokdir[@],$(wokdir),g' \ + -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]kimchidir[@],$(kimchidir),g' \ -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \ -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \ @@ -127,32 +127,19 @@ deb: contrib/make-deb.sh kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse @if test -e /etc/redhat-release; then \ - ln -sf contrib/kimchi.spec.fedora $@ ; \ + ln -sf contrib/kimchi.spec.fedora $@ ; \ elif test -e /etc/SuSE-release; then \ - ln -sf contrib/kimchi.spec.suse $@ ; \ + ln -sf contrib/kimchi.spec.suse $@ ; \ else \ - echo "Unable to select a spec file for RPM build" ; \ - /bin/false ; \ + echo "Unable to select a spec file for RPM build" ; \ + /bin/false ; \ fi -check_files: - @if [ -d '.git' ]; then \ - if [ `git status --porcelain --untracked-files=no | wc -l` -gt 0 ]; then \ - echo "***** Aborting 'make rpm' command *****"; \ - echo "There are some changes not commited in your working \ -directory. To avoid losing them, please commit or stage before run 'make rpm' command."; \ - exit 1; \ - fi \ - fi - -rpm: check_files dist kimchi.spec +rpm: kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec - @if [ -d '.git' ]; then \ - git reset --hard; \ - fi fedora-rpm: check_files contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec -- 2.7.4

2 1

[PATCH] Issue #1045 : boot order fix for guest edit
by harshalp＠linux.vnet.ibm.com 21 Sep '16

21 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> This patch fixes the incorrect condition for updating boot order, also makes sure on s390x arch the cdrom is always the first boot device Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- vmtemplate.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/model/vms.py b/model/vms.py index 1ef5434..737f27e 100644 --- a/model/vms.py +++ b/model/vms.py @@ -876,7 +876,7 @@ class VMModel(object): new_xml = self._update_memory_config(new_xml, params, dom) # update bootorder or bootmenu - if "bootorder" or "bootmenu" in params: + if ("bootorder" or "bootmenu") in params: new_xml = self._update_bootorder(new_xml, params) if platform.machine() in ['s390', 's390x'] and params.get('console'): diff --git a/vmtemplate.py b/vmtemplate.py index 91181ab..e0661ab 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -434,7 +434,10 @@ class VMTemplate(object): # Set the boot order of VM # TODO: need modify this when boot order edition feature came upstream. - params['boot_order'] = get_bootorder_xml() + if cdrom_xml and params.get('arch') == 's390x': + params['boot_order'] = get_bootorder_xml(['cdrom', 'hd', 'network']) + else: + params['boot_order'] = get_bootorder_xml() # Setting maximum number of memory slots slots = str(self.info['mem_dev_slots']) -- 2.7.4

2 1

[PATCH] [Kimchi] Fix issue #1010: Convert disk size to bytes while attaching new disk to guest
by Aline Manera 21 Sep '16

21 Sep '16

The API POST /storagepools/*pool*/storagevolumes requires the disk size in bytes and GB is used on UI. So do the proper convertion to bytes before sending the request to server. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 29fccab..27f8f84 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -377,8 +377,8 @@ kimchi.guest_storage_add_main = function() { vol: settings['vol'], pool: settings['pool'] }; - var sizeInMB = parseInt(settings['capacity']) * 1024; - settings['capacity'] = sizeInMB; + var sizeInBytes = parseInt(settings['capacity']) * 1024 * 1024 * 1024; + settings['capacity'] = sizeInBytes; //These need to be deleted so they don't get passed to backend delete settings['path']; delete settings['newpool']; -- 2.5.5

2 2

[PATCH] [Wok] Fix issue #159: Fix user log filter parameters to allow user does advanced search
by Aline Manera 20 Sep '16

20 Sep '16

There was missing a comma in the filter parameters list which was affecting the advanced search behavior. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 7449f95..37190dc 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -39,7 +39,7 @@ from wok.utils import remove_old_files # Log search setup -FILTER_FIELDS = ['app', 'date', 'ip', 'req', 'status' 'user', 'time'] +FILTER_FIELDS = ['app', 'date', 'ip', 'req', 'status', 'user', 'time'] LOG_DOWNLOAD_URI = "/data/logs/%s" LOG_DOWNLOAD_TIMEOUT = 6 LOG_FORMAT = "[%(date)s %(time)s %(zone)s] %(req)-6s %(status)s %(app)-11s " \ -- 2.5.5

2 2

[PATCH V4] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 16 Sep '16

16 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> V4 : Resolved merge conflict V3 : Rebase to next branch V2 : corrected Indentation V1 : Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 44 ++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 243 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 29 ++++ 4 files changed, 306 insertions(+), 15 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..950ca00 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,34 @@ var kimchi = { }); }, + listmacvtapNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/ovsbridges', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -1271,3 +1299,19 @@ var kimchi = { }); } }; + + /** + * Get the host information. + */ + + kimchi.getHostDetails = function(suc, err) { + wok.requestJSON({ + url: 'plugins/gingerbase/host', + type: 'GET', + resend: true, + contentType: 'application/json', + dataType: 'json', + success: suc, + error: err + }); + } diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..f3078ec 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 7036211..7d7cce3 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -449,10 +455,170 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -641,18 +807,65 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); - var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + + if(kimchi.hostarch === s390xArch){ + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); + var networkForUpdate = new Array(); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 06c40fb..9ccc664 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -140,6 +140,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -242,5 +251,25 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select></select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.1.0

2 1

[PATCH] [Kimchi] Modified unit test cases to include new s390x specific features
by pkulkark＠linux.vnet.ibm.com 16 Sep '16

16 Sep '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch modifies the unit test cases to include the new features introduced for s390x in vm interfaces (macvtap and ovs) and ovsbridges api. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- tests/test_model.py | 25 ++++++++++++++++++ tests/test_rest.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/tests/test_model.py b/tests/test_model.py index ff2a6cb..6509e21 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -651,6 +651,31 @@ class ModelTests(unittest.TestCase): iface = inst.vmiface_lookup(vm_name, mac) self.assertEquals(mac, iface['mac']) + if os.uname()[4] == "s390x": + + # attach macvtap interface to vm + iface_args = {"type": "macvtap", + "source": "test-network", + "mode": "vepa"} + mac = inst.vmifaces_create(vm_name, iface_args) + rollback.prependDefer(inst.vmiface_delete, vm_name, mac) + + iface = inst.vmiface_lookup(vm_name, mac) + self.assertEquals("macvtap", iface["type"]) + self.assertEquals("test-network", iface['source']) + self.assertEquals("vepa", iface['mode']) + + # attach ovs interface to vm + iface_args = {"type": "ovs", + "source": "test-network"} + mac = inst.vmifaces_create(vm_name, iface_args) + rollback.prependDefer(inst.vmiface_delete, vm_name, mac) + + iface = inst.vmiface_lookup(vm_name, mac) + self.assertEquals("ovs", iface["type"]) + self.assertEquals("test-network", iface['source']) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_netboot(self): inst = model.Model(objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 3a61d13..b672f47 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -967,6 +967,19 @@ class RestTests(unittest.TestCase): 'POST') self.assertEquals(400, resp.status) + # try to attach an interface of type "macvtap" without source + if os.uname()[4] == "s390x": + req = json.dumps({'type': 'macvtap'}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEqual(400, resp.status) + + #try to attach an interface of type "ovs" without source + req = json.dumps({'type': 'ovs'}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEqual(400, resp.status) + # attach network interface to vm req = json.dumps({"type": "network", "network": "test-network", @@ -1018,6 +1031,63 @@ class RestTests(unittest.TestCase): iface['mac'], '{}', 'DELETE') self.assertEquals(204, resp.status) + if os.uname()[4] == "s390x": + # attach macvtap interface to vm + req = json.dumps({"type": "macvtap", + "source": "test-network"}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEquals(201, resp.status) + iface = json.loads(resp.read()) + + self.assertEquals('test-network', iface['source']) + self.assertEquals('macvtap', iface['type']) + + # Start the VM + resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', + 'POST') + vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('running', vm['state']) + + # Force poweroff the VM + resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', '{}', + 'POST') + vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('shutoff', vm['state']) + + # detach network interface from vm + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' % + iface['mac'], '{}', 'DELETE') + self.assertEquals(204, resp.status) + + # attach ovs interface to vm + req = json.dumps({"type": "ovs", + "source": "test-network"}) + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, + 'POST') + self.assertEquals(201, resp.status) + iface = json.loads(resp.read()) + + self.assertEquals('test-network', iface['source']) + self.assertEquals('ovs', iface['type']) + + # Start the VM + resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', + 'POST') + vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('running', vm['state']) + + # Force poweroff the VM + resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', '{}', + 'POST') + vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read()) + self.assertEquals('shutoff', vm['state']) + + # detach ovs interface from vm + resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' % + iface['mac'], '{}', 'DELETE') + self.assertEquals(204, resp.status) + def test_vm_customise_storage(self): # Create a Template req = json.dumps({'name': 'test', 'disks': DISKS, @@ -1434,6 +1504,10 @@ class RestTests(unittest.TestCase): if distro.get('reason'): self.assertIn('KCHDISTRO0001E', distro.get('reason')) + def test_ovsbridges(self): + resp = self.request('/plugins/kimchi/ovsbridges') + self.assertEquals(200, resp.status) + class HttpsRestTests(RestTests): """ -- 2.1.0

2 1

[PATCH] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 16 Sep '16

16 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> V4 : Resolved merge conflict V3 : Rebase to next branch V2 : corrected Indentation V1 : Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 44 ++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 243 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 29 ++++ 4 files changed, 306 insertions(+), 15 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..950ca00 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,34 @@ var kimchi = { }); }, + listmacvtapNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/ovsbridges', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -1271,3 +1299,19 @@ var kimchi = { }); } }; + + /** + * Get the host information. + */ + + kimchi.getHostDetails = function(suc, err) { + wok.requestJSON({ + url: 'plugins/gingerbase/host', + type: 'GET', + resend: true, + contentType: 'application/json', + dataType: 'json', + success: suc, + error: err + }); + } diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..f3078ec 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 7036211..7d7cce3 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -449,10 +455,170 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -641,18 +807,65 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); - var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + + if(kimchi.hostarch === s390xArch){ + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); + var networkForUpdate = new Array(); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 06c40fb..9ccc664 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -140,6 +140,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -242,5 +251,25 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select></select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.1.0

2 1

[PATCH V3] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by archus＠linux.vnet.ibm.com 16 Sep '16

16 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 44 ++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 257 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 29 ++++ 4 files changed, 319 insertions(+), 16 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..950ca00 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,34 @@ var kimchi = { }); }, + listmacvtapNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/ovsbridges', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -1271,3 +1299,19 @@ var kimchi = { }); } }; + + /** + * Get the host information. + */ + + kimchi.getHostDetails = function(suc, err) { + wok.requestJSON({ + url: 'plugins/gingerbase/host', + type: 'GET', + resend: true, + contentType: 'application/json', + dataType: 'json', + success: suc, + error: err + }); + } diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..f3078ec 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..9ccf9cc 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -268,10 +274,170 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -340,11 +506,23 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); + if(kimchi.hostarch === s390xArch){ + kimchi.listmacvtapNetworks(function(macvtapnet){ + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet){ + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + }else { + kimchi.listNetworks(initInterface); + } + kimchi.listStoragePools(initStorage); initProcessor(); checkInvalids(); }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); $('#tmpl-edit-button-save').on('click', function() { @@ -432,18 +610,65 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); - var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + + if(kimchi.hostarch === s390xArch){ + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); + var networkForUpdate = new Array(); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..8591561 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -129,6 +129,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -221,5 +230,25 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select></select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.7.4

2 1

[PATCH V2] [Kimchi] Introducing Console for edit Guest module under virtualization
by archus＠linux.vnet.ibm.com 16 Sep '16

16 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing Console for edit Guest module under virtualization for s390x Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 13 +++++++++++++ ui/pages/guest-edit.html.tmpl | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index cc899ff..c3609c2 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -1014,6 +1014,19 @@ kimchi.guest_edit_main = function() { }); } + if(kimchi.hostarch === s390xArch){ + var consoleData = guest.console ? guest.console : ''; + $('#guest-edit-console').val(consoleData); + + if (kimchi.thisVMState === "shutoff") { + $('#guest-edit-console').prop('disabled', false); + }else{ + $('#guest-edit-console').prop('disabled', true); + } + $('#guest-console-panel').show(); + $('#guest-edit-console').selectpicker(); + } + var onAttached = function(params) { refreshCDROMs(); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 3a575dc..88ccb10 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -71,6 +71,14 @@ <label for="guest-edit-icon-textbox">$_("Icon")</label> <input id="guest-edit-icon-textbox" class="form-control" name="icon" type="text" disabled="disabled" /> </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"> + <option value=""></option> + <option value="sclp">$_("sclp")</option> + <option value="virtio">$_("virtio")</option> + </select> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> -- 2.7.4

2 1

[PATCH V2] [Kimchi] Introducing Console for edit template module under virtualization
by rajgupta＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> V2 : Corrected Indentation V1 : Introducing Console for edit template module under virtualization Note: This patch is dependent on following subjected patches 1.Introducing s390x UI Interfaces module for Edit Template under virtualization 2.Introducing s390x UI Interfaces module for Edit Guest under virtualization 3.Introducing s390x UI Storage module for Edit Template under virtualization 4.Introducing s390x UI Storage module for Edit Guest under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 13 ++++++++++++- ui/pages/template-edit.html.tmpl | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..466ae70 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -62,6 +62,12 @@ kimchi.template_edit_main = function() { } $('input[name="' + prop + '"]', templateEditMain).val(value); } + if(kimchi.hostarch == s390xArch){ + $('.console', templateEditMain).show(); + var consoleData = template.console ? template.console : ''; + $('#template-edit-console', templateEditMain).val(consoleData); + $('#template-edit-console').selectpicker(); + } $('#template-edit-memory-textbox').val(template.memory.current); $('#template-edit-max-memory-textbox').val(template.memory.maxmemory); @@ -356,7 +362,12 @@ kimchi.template_edit_main = function() { $('.modal input[type="checkbox"]').prop('disabled', true); $('.modal select').prop('disabled', true); $('.modal .selectpicker').addClass('disabled'); - var editableFields = ['name', 'memory', 'graphics', 'max-memory']; + if(kimchi.hostarch === s390xArch){ + var editableFields = ['name', 'memory', 'graphics', 'max-memory', 'console']; + }else { + var editableFields = ['name', 'memory', 'graphics', 'max-memory']; + } + var data = {}; var disks = $('.template-tab-body .item', '#form-template-storage'); var disksForUpdate = new Array(); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..14f6cfa 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -73,6 +73,9 @@ <div class="template-edit-wrapper-label"> <label>$_("Graphics")</label> </div> + <div class="template-edit-wrapper-label console" style="display:none"> + <label>$_("Console")</label> + </div> </div> <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> @@ -104,6 +107,13 @@ <div class="template-edit-wrapper-controls"> <select id="template-edit-graphics" name="graphics" class="form-control" /> </div> + <div class="template-edit-wrapper-controls console" style="display:none"> + <select id="template-edit-console" name="console" class="form-control"> + <option value=""></option> + <option value="sclp">$_("sclp")</option> + <option value="virtio">$_("virtio")</option> + </select> + </div> </div> </form> </div> -- 2.1.0

2 1

[PATCH v3] [Kimchi 0/2] added 'console' parameter for templates & vms api for s390x
by sureshab＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> v2-v3: resolved merge conflict v1-v2: provided detailed commit message and reduced number of patches In case of s390x architecture, console type can be either virtio/sclp. Extended current code to support console configuration in case of s390x this patch set provides option to configure 'console' parameter for templates and vms api when running on 's390x' architecture Suresh Babu Angadi (2): added 'console' parameter to templates api for s390x added 'console' parameter to vms api for s390x API.json | 24 ++++++++++++++--- control/templates.py | 1 + i18n.py | 4 +++ model/templates.py | 6 +++++ model/vms.py | 75 +++++++++++++++++++++++++++++++++++----------------- osinfo.py | 4 +++ xmlutils/serial.py | 5 +++- 7 files changed, 91 insertions(+), 28 deletions(-) -- 2.1.0

2 3

[PATCH v2] [Kimchi 0/2] added 'console' parameter for templates & vms api for s390x
by sureshab＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> v1-v2: provided detailed commit message and reduced number of patches In case of s390x architecture, console type can be either virtio/sclp. Extended current code to support console configuration in case of s390x this patch set provides option to configure 'console' parameter for templates and vms api when running on 's390x' architecture Suresh Babu Angadi (2): added 'console' parameter to templates api for s390x added 'console' parameter to vms api for s390x API.json | 24 ++++++++++++++--- control/templates.py | 1 + i18n.py | 4 +++ model/templates.py | 6 +++++ model/vms.py | 75 +++++++++++++++++++++++++++++++++++----------------- osinfo.py | 4 +++ xmlutils/serial.py | 5 +++- 7 files changed, 91 insertions(+), 28 deletions(-) -- 2.1.0

4 9

[PATCH] [Kimchi] Introducing Console for edit Guest module under virtualization
by rajgupta＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing Console for edit Guest module under virtualization for s390x Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 13 +++++++++++++ ui/pages/guest-edit.html.tmpl | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index dcaafb8..e2437d7 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -776,6 +776,19 @@ kimchi.guest_edit_main = function() { }); } + if(kimchi.hostarch === s390xArch){ + var consoleData = guest.console ? guest.console : ''; + $('#guest-edit-console').val(consoleData); + + if (kimchi.thisVMState === "shutoff") { + $('#guest-edit-console').prop('disabled', false); + }else{ + $('#guest-edit-console').prop('disabled', true); + } + $('#guest-console-panel').show(); + $('#guest-edit-console').selectpicker(); + } + var onAttached = function(params) { refreshCDROMs(); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index a9a468e..ac6a57e 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -71,6 +71,14 @@ <label for="guest-edit-icon-textbox">$_("Icon")</label> <input id="guest-edit-icon-textbox" class="form-control" name="icon" type="text" disabled="disabled" /> </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"> + <option value=""></option> + <option value="sclp">$_("sclp")</option> + <option value="virtio">$_("virtio")</option> + </select> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> -- 2.1.0

4 5

[PATCH V2] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 44 ++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 257 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 29 ++++ 4 files changed, 319 insertions(+), 16 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..950ca00 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,34 @@ var kimchi = { }); }, + listmacvtapNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks: function(suc, err) { + wok.requestJSON({ + url: 'plugins/kimchi/ovsbridges', + type: 'GET', + contentType: 'application/json', + dataType: 'json', + resend: true, + success: suc, + error: err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -1271,3 +1299,19 @@ var kimchi = { }); } }; + + /** + * Get the host information. + */ + + kimchi.getHostDetails = function(suc, err) { + wok.requestJSON({ + url: 'plugins/gingerbase/host', + type: 'GET', + resend: true, + contentType: 'application/json', + dataType: 'json', + success: suc, + error: err + }); + } diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..f3078ec 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..9ccf9cc 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -268,10 +274,170 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -340,11 +506,23 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); + if(kimchi.hostarch === s390xArch){ + kimchi.listmacvtapNetworks(function(macvtapnet){ + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet){ + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + }else { + kimchi.listNetworks(initInterface); + } + kimchi.listStoragePools(initStorage); initProcessor(); checkInvalids(); }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); $('#tmpl-edit-button-save').on('click', function() { @@ -432,18 +610,65 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); - var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + + if(kimchi.hostarch === s390xArch){ + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); + var networkForUpdate = new Array(); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..8591561 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -129,6 +129,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -221,5 +230,25 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select></select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.1.0

3 4

[PATCH V2] [Kimchi] Introducing s390x UI Storage module for Edit Guest under virtualization
by rajgupta＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> V2 : Corrected Indentation V1 : Introducing s390x UI Storage module for Edit Guest under virtualization Note: This patch is dependent on following subjected patches 1.Introducing s390x UI Interfaces module for Edit Template under virtualization 2.Introducing s390x UI Interfaces module for Edit Guest under virtualization 3.Introducing s390x UI Storage module for Edit Template under virtualization ui/js/src/kimchi.guest_storage_add.main.js | 165 ++++++++++++++++++++++++----- ui/pages/guest-storage-add.html.tmpl | 26 ++++- 2 files changed, 163 insertions(+), 28 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 29fccab..08e71db 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -60,11 +60,23 @@ kimchi.guest_storage_add_main = function() { value: 'disk' }]; + var source = [{ + label: 'Pool', + value: 'pool' + },{ + label: 'Path', + value: 'path' + }]; + var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); var typeTextbox = $('select#guest-storage-type', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('select#guest-disk-pool', storageAddForm); + var sourceTextbox = $('select#guest-disk-source', storageAddForm); + var sourcenewTextbox = $('select#guest-disk-source-new', storageAddForm); + var directorypathTextbox = $('#directorypath', storageAddForm); + var diskpathTextbox = $('#diskpath', storageAddForm); var volTextbox = $('select#guest-disk-vol', storageAddForm); var newPoolTextbox = $('select#guest-disk-pool-new', storageAddForm); var capacityTextbox = $('input[name="capacity"]', storageAddForm); @@ -73,6 +85,7 @@ kimchi.guest_storage_add_main = function() { var selectStoragePoolHTML = ''; var selectStorageVolHTML = ''; var rbExisting = 'false'; + var s390xArch = 's390x'; var getFormatList = function() { var format = ["qcow", "qcow2", "qed", "raw", "vmdk", "vpc"]; @@ -177,6 +190,45 @@ kimchi.guest_storage_add_main = function() { //First time retrieving list of Storage Pools - defaulting to new disk getStoragePools('new'); + if(kimchi.hostarch === s390xArch){ + //initialize source dropdown for new disk + $('#new-disk-box div.source').show(); + + var getStorageSourceNew = function(sourceSelected ) { + selectStorageSourceHTML = ''; //reset string + $.each(source, function(index, storageSource) { + selectStorageSourceHTML += '<option value="'+ storageSource.value + '">' + storageSource.label + '</option>'; + }); + + sourcenewTextbox.empty(); + sourcenewTextbox.append(selectStorageSourceHTML); + sourcenewTextbox.val(sourceSelected); + $(sourcenewTextbox).trigger('change'); + sourcenewTextbox.selectpicker(); + $('.selectpicker').selectpicker('refresh'); + }; + + getStorageSourceNew('pool'); + + //initialize source dropdown for existing disk + $('#existing-disk-box div.source').show(); + + var getStorageSource = function(sourceSelected ) { + selectStorageSourceHTML = ''; //reset string + $.each(source, function(index, storageSource) { + selectStorageSourceHTML += '<option value="'+ storageSource.value + '">' + storageSource.label + '</option>'; + }); + + sourceTextbox.empty(); + sourceTextbox.append(selectStorageSourceHTML); + sourceTextbox.val(sourceSelected); + $(sourceTextbox).trigger('change'); + sourceTextbox.selectpicker(); + $('.selectpicker').selectpicker('refresh'); + }; + getStorageSource('pool'); + } + poolTextbox.on('change',function() { var options = []; selectStorageVolHTML = ''; @@ -214,6 +266,34 @@ kimchi.guest_storage_add_main = function() { }, null, false); }); + if (kimchi.hostarch === s390xArch) { + sourcenewTextbox.on('change', function() { + switch ($(this).val()) { + case 'path': + $('#new-disk-box div.pool').hide(); + $('#new-disk-box div.directorypath').show(); + + break; + default: + $('#new-disk-box div.pool').show(); + $('#new-disk-box div.directorypath').hide(); + } + }); + + sourceTextbox.on('change', function() { + switch ($(this).val()) { + case 'path': + $('#existing-disk-box div.pool,div.volume').hide(); + $('#existing-disk-box div.diskpath').show(); + + break; + default: + $('#existing-disk-box div.pool,div.volume').show(); + $('#existing-disk-box div.diskpath').hide(); + } + }); + } + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; var selectType = $(this).val(); @@ -237,9 +317,12 @@ kimchi.guest_storage_add_main = function() { $('#existing-disk-box').removeClass('hidden'); $('#new-disk-box').addClass('hidden'); $('#guest-storage-add-window .modal-body .template-pager').animate({ - height: "200px" + height: "300px" }, 300); getStoragePools('existing'); + if(kimchi.hostarch === s390xArch){ + getStorageSource('pool'); + } $(pathTextbox).val(""); $(newPoolTextbox).val(""); $(capacityTextbox).val(""); @@ -260,9 +343,17 @@ kimchi.guest_storage_add_main = function() { currentPage = 'new-disk-box'; $('#existing-disk-box').addClass('hidden'); $('#new-disk-box').removeClass('hidden'); - $('#guest-storage-add-window .modal-body .template-pager').animate({ - height: "300px" - }, 400); + + if(kimchi.hostarch === s390xArch){ + getStorageSourceNew('pool'); + $('#guest-storage-add-window .modal-body .template-pager').animate({ + height: "400px" + }, 400); + }else{ + $('#guest-storage-add-window .modal-body .template-pager').animate({ + height: "300px" + }, 400); + } $(pathTextbox).val(""); $(poolTextbox).val(""); $(volTextbox).val(""); @@ -414,35 +505,59 @@ kimchi.guest_storage_add_main = function() { } var formData = storageAddForm.serializeObject(); - var settings = { - vm: kimchi.selectedGuest, - type: typeTextbox.val(), - path: pathTextbox.val(), - pool: poolTextbox.val(), - vol: volTextbox.val(), - newpool: newPoolTextbox.val(), - format: formatTextbox.val(), - capacity: capacityTextbox.val() - }; + if (kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path') || sourcenewTextbox.val() === 'path')) { + if ($('#new-disk').prop('checked')) { + var settings = { + vm: kimchi.selectedGuest, + dir_path: directorypathTextbox.val(), + name: kimchi.selectedGuest + '_' + $.now() + '.img', + size: capacityTextbox.val(), + type: typeTextbox.val(), + format: formatTextbox.val() + }; + } else if ($('#existing-disk').prop('checked')) { + var settings = { + vm: kimchi.selectedGuest, + path: diskpathTextbox.val(), + type: typeTextbox.val(), + format: formatTextbox.val() + }; + } + } else { + var settings = { + vm: kimchi.selectedGuest, + type: typeTextbox.val(), + path: pathTextbox.val(), + pool: poolTextbox.val(), + vol: volTextbox.val(), + newpool: newPoolTextbox.val(), + format: formatTextbox.val(), + capacity: capacityTextbox.val() + }; + } $(submitButton).prop('disabled', true); $.each([pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { $(c).prop('disabled', true); }); - // Validate form for cdrom and disk - validateSpecifiedForm = validator[settings['type']]; - if (!validateSpecifiedForm(settings)) { - $(submitButton).prop('disabled', false); - $.each([submitButton, pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { - $(c).prop('disabled', false); - }); - return false; - } - $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); - if(bNewDisk === 'false'){ + if (kimchi.hostarch != s390xArch) { + // Validate form for cdrom and disk + validateSpecifiedForm = validator[settings['type']]; + if (!validateSpecifiedForm(settings)) { + $(submitButton).prop('disabled', false); + $.each([submitButton, pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { + $(c).prop('disabled', false); + }); + return false; + } + if(bNewDisk === 'false'){ + addStorage(settings); + } + } else { addStorage(settings); } + $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); event.preventDefault(); }; diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index afc72c8..dad3c3b 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -53,7 +53,12 @@ </div> <div class="template-pager"> <div class="page" id="new-disk-box"> - <div class="form-group"> + <div class="form-group source" style="display:none;"> + <label>$_("Source")</label> + <select id="guest-disk-source-new" class="selectpicker col-md-12 col-lg-12"></select> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage based on Libvirt pool or direct block device")</p> + </div> + <div class="form-group pool"> <label>$_("Storage Pool")</label> <select id="guest-disk-pool-new" class="selectpicker col-md-12 col-lg-12"> </select> @@ -70,20 +75,35 @@ </select> <p class="help-block"><i class="fa fa-info-circle"></i> $_("Format of the new disk to be created")</p> </div> + <div class="form-group directorypath" style="display:none;"> + <label>$_("Directory Path")</label> + <input type="text" class="form-control" name="directorypath" id="directorypath" /> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Provide a directory path")</p> + </div> </div> <div class="page" id="existing-disk-box"> - <div class="form-group"> + <div class="form-group source" style="display:none;"> + <label>$_("Source")</label> + <select id="guest-disk-source" class="selectpicker col-md-12 col-lg-12"></select> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage based on Libvirt pool or direct block device")</p> + </div> + <div class="form-group pool"> <label>$_("Storage Pool")</label> <select id="guest-disk-pool" class="selectpicker col-md-12 col-lg-12"> </select> <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage pool in which the volume is located in")</p> </div> - <div class="form-group"> + <div class="form-group volume"> <label>$_("Storage Volume")</label> <select id="guest-disk-vol" 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> + <div class="form-group diskpath" style="display:none;"> + <label>$_("Disk Path")</label> + <input type="text" class="form-control" name="diskpath" id="diskpath" /> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Provide a block device")</p> + </div> </div> </div> </div> -- 2.1.0

2 1

[PATCH V2] [Kimchi] Introducing s390x UI Storage module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 15 Sep '16

15 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Storage module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 12 +- ui/css/src/modules/_templates.scss | 10 +- ui/js/src/kimchi.template_edit_main.js | 214 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 11 ++ 4 files changed, 235 insertions(+), 12 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 6cf2cc9..e0e05c7 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1597,7 +1597,15 @@ body.wok-gallery { } #template-edit-window .template-storage-cell.storage-pool { - width: 220px !important; + width: 180px !important; +} + +#template-edit-window .template-storage-cell.storage-path { + width: 180px !important; +} + +#template-edit-window .template-storage-cell.source { + width: 180px !important; } #template-edit-window .template-storage-cell.type { @@ -1609,7 +1617,7 @@ body.wok-gallery { } #template-edit-window .template-storage-cell.format { - width: 320px; + width: 250px; } #template-edit-window .template-interface-cell.network { diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index a75d803..2ae7412 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -158,7 +158,13 @@ $kimchi-icon-path: '../images'; height: selectpicker height - 2px; } .template-storage-cell.storage-pool { - width: 220px !important; + width: 180px !important; + } + .template-storage-cell.storage-path { + width: 180px !important; + } + .template-storage-cell.source { + width: 180px !important; } .template-storage-cell.type { width: 100px; @@ -167,7 +173,7 @@ $kimchi-icon-path: '../images'; width: 100px; } .template-storage-cell.format { - width: 320px; + width: 250px; } .template-interface-cell.network { width: 220px; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..92ce977 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -226,6 +226,181 @@ kimchi.template_edit_main = function() { }); }; + var initStorage_s390 = function(result) { + // Gather storage data + var storagePoolsInfo = new Object(); + $.each(result, function(index, pool) { + if (pool.state === 'active' && pool.type != 'kimchi-iso') { + if (pool.type === 'iscsi' || pool.type === 'scsi') { + volumes = new Object(); + kimchi.listStorageVolumes(pool.name, function(vols) { + $.each(vols, function(i, vol) { + storagePoolsInfo[pool.name + "/" + vol.name] = { + 'type': pool.type, + 'volSize': vol.capacity / Math.pow(1024, 3) + }; + }); + }, null, true); + } else { + storagePoolsInfo[pool.name] = { + 'type': pool.type + }; + } + } + }); + + var addStorageItem = function(storageData) { + if (storageData.storageSource == 'pool') { + var thisName = storageData.storageName; + // Compatibility with old versions + if (storageData.storageVolume) { + storageData.storageDisk = storagePoolsInfo[thisName].volSize; + } + if (!storageData.storageType) { + storageData.storageType = storagePoolsInfo[thisName].type; + } + } + + var nodeStorage = $.parseHTML(wok.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + var storageRow = '#storageRow' + storageData.storageIndex; + + var storageOptions = ''; + $.each(storagePoolsInfo, function(poolName, value) { + storageOptions += '<option value="' + poolName + '">' + poolName + '</option>'; + }); + + $(storageRow + ' .selectStorageName').append(storageOptions); + if (storageData.storageSource == 'pool') { + if (!$(storageRow + ' .selectStorageName option[value="' + storageData.storageName + '"]').length) { + var invalidOption = '<option disabled="disabled" selected="selected" value="' + storageData.storageName + '">' + storageData.storageName + '</option>'; + $(storageRow + ' .selectStorageName').prepend(invalidOption); + $(storageRow + ' .selectStorageName').parent().addClass('has-error') + } + $(storageRow + ' .selectStorageName').val(storageData.storageName); + $(storageRow + ' span.storage-pool').show(); + $(storageRow + ' span.storage-path').hide(); + } else { + $(storageRow + ' span.storage-pool').hide(); + $(storageRow + ' span.storage-path').show(); + } + + $(storageRow + ' .selectStorageName').selectpicker(); + if (storageData.storageType === 'iscsi' || storageData.storageType === 'scsi') { + $(storageRow + ' .template-storage-disk').attr('readonly', true).prop('disabled', true); + $(storageRow + ' #diskFormat').val('raw'); + $(storageRow + ' #diskFormat').prop('disabled', true).change(); + } else if (storageData.storageType === 'logical') { + $(storageRow + ' #diskFormat').val('raw'); + $(storageRow + ' #diskFormat').prop('disabled', true).change(); + } + + //set source + $('#form-template-storage span.source').show(); + $(storageRow + ' #source').val(storageData.storageSource); + $(storageRow + ' #source').on('change', function() { + var source = $(this).val(); + $(storageRow + ' .template-storage-source').val(source); + if (source == 'path') { + $(storageRow + ' span.storage-pool').hide(); + $(storageRow + ' span.storage-path').show(); + } else { + $(storageRow + ' span.storage-pool').show(); + $(storageRow + ' span.storage-path').hide(); + } + }); + + $(storageRow + ' #source').selectpicker(); + + // Set disk format + if (isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('qcow2'); + $(storageRow + ' #diskFormat').prop('disabled', 'disabled'); + } else { + $(storageRow + ' #diskFormat').val(storageData.storageDiskFormat); + $(storageRow + ' #diskFormat').on('change', function() { + $(storageRow + ' .template-storage-disk-format').val($(this).val()); + }); + } + $(storageRow + ' #diskFormat').selectpicker(); + + $('.delete', '#form-template-storage').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + $(storageRow + ' select.selectStorageName').change(function() { + $(this).parent().parent().removeClass('has-error'); + var poolType = storagePoolsInfo[$(this).val()].type; + $(storageRow + ' .template-storage-name').val($(this).val()); + $(storageRow + ' .template-storage-type').val(poolType); + if (poolType === 'iscsi' || poolType === 'scsi') { + $(storageRow + ' .template-storage-disk').attr('readonly', true).prop('disabled', true).val(storagePoolsInfo[$(this).val()].volSize); + if (!isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('raw').prop('disabled', true).change(); + } + } else if (poolType === 'logical') { + $(storageRow + ' .template-storage-disk').attr('readonly', false).prop('disabled', false); + if (!isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('raw').prop('disabled', true).change(); + } + } else { + $(storageRow + ' .template-storage-disk').attr('readonly', false).prop('disabled', false); + if ($(storageRow + ' #diskFormat').prop('disabled') == true && !isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('qcow2').prop('disabled', false).change(); + } + } + $(storageRow + ' #diskFormat').selectpicker('refresh'); + }); + }; // End of addStorageItem funtion + + if (origDisks && origDisks.length) { + origDisks.sort(function(a, b) { + return a.index - b.index + }); + $.each(origDisks, function(index, diskEntities) { + if (typeof diskEntities.pool !== 'undefined') { + var defaultPool = diskEntities.pool.name.split('/').pop() + var storageNodeData = { + storageSource: 'pool', + storageName: diskEntities.volume ? defaultPool + '/' + diskEntities.volume : defaultPool, + storageType: diskEntities.pool.type, + storageIndex: diskEntities.index, + storageDisk: diskEntities.size, + storageDiskFormat: diskEntities.format ? diskEntities.format : 'qcow2', + storageVolume: diskEntities.volume + } + } else { + var storageNodeData = { + storageSource: 'path', + storagePath: diskEntities.path, + storageType: 'dir', + storageIndex: diskEntities.index, + storageDisk: diskEntities.size, + storageDiskFormat: diskEntities.format ? diskEntities.format : 'qcow2', + storageVolume: diskEntities.volume + } + } + addStorageItem(storageNodeData); + }); + } + + var storageID = origDisks.length - 1; + $('#template-edit-storage-add-button').on("click", function(event) { + event.preventDefault(); + storageID = storageID + 1; + var storageNodeData = { + storageSource: 'pool', + storageName: 'default', + storageType: 'dir', + storageDisk: '10', + storageDiskFormat: 'qcow2', + storageIndex: storageID + } + addStorageItem(storageNodeData); + }); + }; + var initInterface = function(result) { var networkItemNum = 0; var addInterfaceItem = function(networkData) { @@ -340,8 +515,20 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); - kimchi.listStoragePools(initStorage); + if (kimchi.hostarch === s390xArch) { + kimchi.listmacvtapNetworks(function(macvtapnet) { + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet) { + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + kimchi.listStoragePools(initStorage_s390); + } else { + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + } + initProcessor(); checkInvalids(); }; @@ -361,12 +548,23 @@ kimchi.template_edit_main = function() { var disks = $('.template-tab-body .item', '#form-template-storage'); var disksForUpdate = new Array(); $.each(disks, function(index, diskEntity) { - var newDisk = { - 'index': index, - 'pool': { 'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val() }, - 'size': Number($(diskEntity).find('.template-storage-disk').val()), - 'format': $(diskEntity).find('.template-storage-disk-format').val() - }; + if (kimchi.hostarch == s390xArch && ($(diskEntity).find('.template-storage-source').val()) == 'path') { + var newDisk = { + 'index': index, + 'path': $(diskEntity).find('.template-storage-path').val(), + 'size': Number($(diskEntity).find('.template-storage-disk').val()), + 'format': $(diskEntity).find('.template-storage-disk-format').val() + }; + } else { + var newDisk = { + 'index': index, + 'pool': { + 'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val() + }, + 'size': Number($(diskEntity).find('.template-storage-disk').val()), + 'format': $(diskEntity).find('.template-storage-disk-format').val() + }; + } // image based template: add base to dictionary if ((baseImageTemplate) && (index == 0)) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..432f986 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -110,6 +110,7 @@ <div role="tabpanel" class="tab-pane" id="storage"> <form id="form-template-storage"> <div class="template-tab-header"> + <span class="template-storage-cell source" style="display:none">$_("Source")</span> <span class="template-storage-cell storage-pool">$_("Storage Pool")</span> <span class="template-storage-cell type">$_("Type")</span> <span class="template-storage-cell disk">$_("Disk(GB)")</span> @@ -182,10 +183,20 @@ </script> <script id="template-storage-pool-tmpl" type="text/html"> <div id="storageRow{storageIndex}" class='item'> + <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> + </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> </span> + <span class="template-storage-cell storage-path" style="display:none"> + <input class="template-storage-path storage-path form-control" value="{storagePath}" type="text" /> + </span> <span class="template-storage-cell type"> <input class="template-storage-type form-control" value={storageType} readonly=true type="text" /> </span> -- 2.1.0

3 2

[PATCH v2] [Kimchi] Fix for Issue #1000 : Make Check fails on s390x environment
by pkulkark＠linux.vnet.ibm.com 14 Sep '16

14 Sep '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2: Removed unwanted print statement v1: This patch fixes the issue with the make check command failing on s390x environment by adding a check for s390x Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- osinfo.py | 5 ++- tests/test_model.py | 82 +++++++++++++++++++++++---------------- tests/test_model_libvirtevents.py | 6 ++- tests/test_osinfo.py | 18 +++++---- tests/test_rest.py | 36 +++++++++++------ tests/test_template.py | 10 ++++- tests/test_vmtemplate.py | 23 ++++++++--- 7 files changed, 115 insertions(+), 65 deletions(-) diff --git a/osinfo.py b/osinfo.py index 3e56d97..11229aa 100644 --- a/osinfo.py +++ b/osinfo.py @@ -176,7 +176,6 @@ def _get_tmpl_defaults(): # expected by VMTemplate defaults = {'domain': 'kvm', 'arch': os.uname()[4], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} - # Parse main section to get networks and memory values defaults.update(default_config.pop('main')) defaults['memory'] = default_config.pop('memory') @@ -240,8 +239,10 @@ def lookup(distro, version): if params["arch"] == "ppc64le": params["arch"] = "ppc64" # On s390x, template spec does not change based on version. - if params["arch"] == "s390x": + if params["arch"] == "s390x" or arch == "s390x": params.update(template_specs[arch]['old']) + if not distro: + params['os_distro'] = params['os_version'] = "unknown" elif distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): diff --git a/tests/test_model.py b/tests/test_model.py index 05f046c..ff2a6cb 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -148,7 +148,8 @@ class ModelTests(unittest.TestCase): self.assertEquals([], info['groups']) self.assertTrue(info['persistent']) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -271,7 +272,8 @@ class ModelTests(unittest.TestCase): vms = inst.vms_get_list() self.assertFalse('kimchi-vm-new' in vms) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_image_based_template(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -318,7 +320,8 @@ class ModelTests(unittest.TestCase): info = inst.vm_lookup('kimchi-vm') self.assertEquals('running', info['state']) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_graphics(self): inst = model.Model(objstore_loc=self.tmp_store) params = {'name': 'test', @@ -511,7 +514,8 @@ class ModelTests(unittest.TestCase): call(['ufw', 'status']), call(iptables_add), call(iptables_del)]) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.' 'FirewallManager.remove_vm_graphics_port') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.' @@ -553,7 +557,8 @@ class ModelTests(unittest.TestCase): inst.template_delete('test') - @unittest.skipUnless(utils.running_as_root(), "Must be run as root") + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", "Must be run as root") def test_vm_serial(self): inst = model.Model(objstore_loc=self.tmp_store) params = {'name': 'test', @@ -601,12 +606,13 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.vm_delete, vm_name) ifaces = inst.vmifaces_get_list(vm_name) - self.assertEquals(1, len(ifaces)) + if not os.uname()[4] == "s390x": + self.assertEquals(1, len(ifaces)) - iface = inst.vmiface_lookup(vm_name, ifaces[0]) - self.assertEquals(17, len(iface['mac'])) - self.assertEquals("default", iface['network']) - self.assertIn("model", iface) + iface = inst.vmiface_lookup(vm_name, ifaces[0]) + self.assertEquals(17, len(iface['mac'])) + self.assertEquals("default", iface['network']) + self.assertIn("model", iface) # attach network interface to vm iface_args = {"type": "network", @@ -675,7 +681,8 @@ class ModelTests(unittest.TestCase): vms = inst.vms_get_list() self.assertFalse('kimchi-netboot-vm' in vms) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_vm_disk(self): disk_path = os.path.join(TMP_DIR, 'existent2.iso') open(disk_path, 'w').close() @@ -1020,7 +1027,9 @@ class ModelTests(unittest.TestCase): config.set("authentication", "method", "pam") inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', - 'memory': {'current': 1024, 'maxmemory': 4096}, + 'memory': {'current': 1024, + 'maxmemory': 4096 + if os.uname()[4] != "s390x" else 2048}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}} inst.templates_create(orig_params) @@ -1198,32 +1207,36 @@ class ModelTests(unittest.TestCase): # make sure "vm_update" works when the domain has a snapshot inst.vmsnapshots_create(u'kimchi-vm1') - # update vm graphics when vm is not running - inst.vm_update(u'kimchi-vm1', - {"graphics": {"passwd": "123456"}}) + if os.uname()[4] != "s390x": + # update vm graphics when vm is not running + inst.vm_update(u'kimchi-vm1', + {"graphics": {"passwd": "123456"}}) - inst.vm_start('kimchi-vm1') - rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - 'kimchi-vm1') + inst.vm_start('kimchi-vm1') + rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, + 'kimchi-vm1') - vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('123456', vm_info['graphics']["passwd"]) - self.assertEquals(None, vm_info['graphics']["passwdValidTo"]) + vm_info = inst.vm_lookup(u'kimchi-vm1') + self.assertEquals('123456', vm_info['graphics']["passwd"]) + self.assertEquals(None, vm_info['graphics']["passwdValidTo"]) - # update vm graphics when vm is running - inst.vm_update(u'kimchi-vm1', - {"graphics": {"passwd": "abcdef", - "passwdValidTo": 20}}) - vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('abcdef', vm_info['graphics']["passwd"]) - self.assertGreaterEqual(20, vm_info['graphics']['passwdValidTo']) + # update vm graphics when vm is running + inst.vm_update(u'kimchi-vm1', + {"graphics": {"passwd": "abcdef", + "passwdValidTo": 20}}) + vm_info = inst.vm_lookup(u'kimchi-vm1') + self.assertEquals('abcdef', vm_info['graphics']["passwd"]) + self.assertGreaterEqual(20, + vm_info['graphics']['passwdValidTo']) - info = inst.vm_lookup('kimchi-vm1') - self.assertEquals('running', info['state']) + info = inst.vm_lookup('kimchi-vm1') + self.assertEquals('running', info['state']) - params = {'name': 'new-vm'} - self.assertRaises(InvalidParameter, inst.vm_update, - 'kimchi-vm1', params) + params = {'name': 'new-vm'} + self.assertRaises(InvalidParameter, inst.vm_update, + 'kimchi-vm1', params) + else: + inst.vm_start('kimchi-vm1') # change VM users and groups, when wm is running. inst.vm_update(u'kimchi-vm1', @@ -1294,7 +1307,8 @@ class ModelTests(unittest.TestCase): inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, u'пeω-∨м') - self.assertEquals(info['uuid'], inst.vm_lookup(u'пeω-∨м')['uuid']) + self.assertEquals(vm_info['uuid'], + inst.vm_lookup(u'пeω-∨м')['uuid']) info = inst.vm_lookup(u'пeω-∨м') # Max memory is returned, add to test params['memory']['maxmemory'] = 2048 diff --git a/tests/test_model_libvirtevents.py b/tests/test_model_libvirtevents.py index 69bf9d5..177bbae 100644 --- a/tests/test_model_libvirtevents.py +++ b/tests/test_model_libvirtevents.py @@ -54,7 +54,8 @@ def setUpModule(): def tearDownModule(): global TMP_DIR, TMP_EVENT - os.unlink(TMP_EVENT) + if os.path.exists(TMP_EVENT): + os.unlink(TMP_EVENT) shutil.rmtree(TMP_DIR) @@ -120,7 +121,8 @@ class LibvirtEventsTests(unittest.TestCase): data = {'domain': dom.name(), 'event': 'Rebooted'} _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) - @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + @unittest.skipUnless(utils.running_as_root() and + os.uname()[4] != "s390x", 'Must be run as root') def test_events_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) self.objstore = inst.objstore diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index c7a1d0d..e78e1c0 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -17,6 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import os import unittest from wok.plugins.kimchi.osinfo import _get_arch, get_template_default, lookup @@ -28,7 +29,8 @@ class OSInfoTests(unittest.TestCase): entry = lookup(None, None) self.assertEquals('unknown', entry['os_distro']) self.assertEquals('unknown', entry['os_version']) - self.assertEquals(['default'], entry['networks']) + if not os.uname()[4] == "s390x": + self.assertEquals(['default'], entry['networks']) def test_old_distros(self): old_versions = {'debian': '5.0', 'ubuntu': '7.04', 'opensuse': '10.1', @@ -41,12 +43,14 @@ class OSInfoTests(unittest.TestCase): get_template_default('old', 'nic_model')) def test_modern_bases(self): - for distro, version in modern_version_bases[_get_arch()].iteritems(): - entry = lookup(distro, version) - self.assertEquals(entry['disk_bus'], - get_template_default('modern', 'disk_bus')) - self.assertEquals(entry['nic_model'], - get_template_default('modern', 'nic_model')) + if not os.uname()[4] == "s390x": + for distro, version in\ + modern_version_bases[_get_arch()].iteritems(): + entry = lookup(distro, version) + self.assertEquals(entry['disk_bus'], + get_template_default('modern', 'disk_bus')) + self.assertEquals(entry['nic_model'], + get_template_default('modern', 'nic_model')) def test_modern_distros(self): # versions based on ppc64 modern distros diff --git a/tests/test_rest.py b/tests/test_rest.py index 00ad7f3..3a61d13 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -162,9 +162,10 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') self.assertEquals(400, resp.status) - req = json.dumps({'memory': {'maxmemory': 3072}}) - resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') - self.assertEquals(200, resp.status) + if not os.uname()[4] == "s390x": + req = json.dumps({'memory': {'maxmemory': 3072}}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') self.assertEquals(200, resp.status) @@ -252,7 +253,11 @@ class RestTests(unittest.TestCase): # Memory was hot plugged vm['name'] = u'∨м-црdαtеd' vm['cpu_info'].update(params['cpu_info']) - vm['memory'].update(params['memory']) + if not os.uname()[4] == "s390x": + vm['memory'].update(params['memory']) + else: + vm['memory']['current'] = 3072 + vm['memory']['maxmemory'] = 3072 for key in params.keys(): self.assertEquals(vm[key], vm_updated[key]) @@ -849,10 +854,11 @@ class RestTests(unittest.TestCase): req = json.dumps({'path': cdrom}) resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev, req, 'PUT') - self.assertEquals(200, resp.status) - cd_info = json.loads(resp.read()) - self.assertEquals(urlparse.urlparse(cdrom).path, - urlparse.urlparse(cd_info['path']).path) + if not os.uname()[4] == "s390x": + self.assertEquals(200, resp.status) + cd_info = json.loads(resp.read()) + self.assertEquals(urlparse.urlparse(cdrom).path, + urlparse.urlparse(cd_info['path']).path) # Test GET devs = json.loads( @@ -885,7 +891,10 @@ class RestTests(unittest.TestCase): self.assertEquals(200, resp.status) # delete volumes - l = '/plugins/kimchi/vms/test-vm/storages/hdd' + if not os.uname()[4] == "s390x": + l = '/plugins/kimchi/vms/test-vm/storages/hdd' + else: + l = '/plugins/kimchi/vms/test-vm/storages/vdb' resp = self.request(l, {}, 'DELETE') self.assertEquals(204, resp.status) @@ -938,7 +947,8 @@ class RestTests(unittest.TestCase): ifaces = json.loads( self.request('/plugins/kimchi/vms/test-vm/ifaces').read() ) - self.assertEquals(1, len(ifaces)) + if not os.uname()[4] == "s390x": + self.assertEquals(1, len(ifaces)) for iface in ifaces: res = json.loads( @@ -1405,7 +1415,8 @@ class RestTests(unittest.TestCase): self.assertIn('path', distro) else: # Distro not found error - self.assertIn('KCHDISTRO0001E', distro.get('reason')) + if distro.get('reason'): + self.assertIn('KCHDISTRO0001E', distro.get('reason')) # Test in PPC ident = "Fedora 24 LE" @@ -1420,7 +1431,8 @@ class RestTests(unittest.TestCase): self.assertIn('path', distro) else: # Distro not found error - self.assertIn('KCHDISTRO0001E', distro.get('reason')) + if distro.get('reason'): + self.assertIn('KCHDISTRO0001E', distro.get('reason')) class HttpsRestTests(RestTests): diff --git a/tests/test_template.py b/tests/test_template.py index 727a354..6845565 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -110,6 +110,8 @@ class TemplateTests(unittest.TestCase): tmpl = json.loads( self.request('/plugins/kimchi/templates/test').read() ) + if os.uname()[4] == "s390x": + keys.append("interfaces") self.assertEquals(sorted(tmpl.keys()), sorted(keys)) self.assertEquals(t['source_media']['path'], tmpl["cdrom"]) disk_keys = ['index', 'pool', 'size', 'format'] @@ -248,8 +250,12 @@ class TemplateTests(unittest.TestCase): self.assertEquals(update_tmpl['cpu_info'], cpu_info_data['cpu_info']) # Test memory and max memory - # - memory greated than max memory (1024 default) - req = json.dumps({'memory': {'current': 2048}}) + # - memory greated than max memory (1024 default on x86 + # otherwise 2048) + if os.uname()[4] == "s390x": + req = json.dumps({'memory': {'current': 4096}}) + else: + req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 74816ef..ca4eae5 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -56,6 +56,8 @@ class VMTemplateTests(unittest.TestCase): args = {'name': 'test', 'cdrom': self.iso} t = VMTemplate(args) for name, val in fields: + if os.uname()[4] == "s390x" and name == 'networks': + continue self.assertEquals(val, t.info.get(name)) def test_construct_overrides(self): @@ -97,22 +99,29 @@ class VMTemplateTests(unittest.TestCase): self.assertEquals(slots, xpath_get_text(xml, expr)[0]) def test_to_xml(self): - graphics = {'type': 'spice', 'listen': '127.0.0.1'} + if not os.uname()[4] == "s390x": + graphics = {'type': 'spice', 'listen': '127.0.0.1'} + else: + graphics = {'type': 'vnc', 'listen': '127.0.0.1'} vm_uuid = str(uuid.uuid4()).replace('-', '') t = VMTemplate({'name': 'test-template', 'cdrom': self.iso}) xml = t.to_vm_xml('test-vm', vm_uuid, graphics=graphics) self.assertEquals(vm_uuid, xpath_get_text(xml, "/domain/uuid")[0]) self.assertEquals('test-vm', xpath_get_text(xml, "/domain/name")[0]) - expr = "/domain/devices/graphics/@type" - self.assertEquals(graphics['type'], xpath_get_text(xml, expr)[0]) - expr = "/domain/devices/graphics/@listen" - self.assertEquals(graphics['listen'], xpath_get_text(xml, expr)[0]) + if not os.uname()[4] == "s390x": + expr = "/domain/devices/graphics/@type" + self.assertEquals(graphics['type'], xpath_get_text(xml, expr)[0]) + expr = "/domain/devices/graphics/@listen" + self.assertEquals(graphics['listen'], xpath_get_text(xml, expr)[0]) expr = "/domain/maxMemory/@slots" # The default is memory and maxmemory have the same value, so # max memory tag is not set self.assertEquals(0, len(xpath_get_text(xml, expr))) expr = "/domain/memory" - self.assertEquals(str(1024), xpath_get_text(xml, expr)[0]) + if os.uname()[4] == "s390x": + self.assertEquals(str(2048), xpath_get_text(xml, expr)[0]) + else: + self.assertEquals(str(1024), xpath_get_text(xml, expr)[0]) if hasattr(psutil, 'virtual_memory'): host_memory = psutil.virtual_memory().total >> 10 @@ -158,6 +167,8 @@ class VMTemplateTests(unittest.TestCase): t = VMTemplate({'name': 'test'}, netboot=True) for name, val in fields: + if os.uname()[4] == "s390x" and name == 'networks': + continue self.assertEquals(val, t.info.get(name)) self.assertNotIn('cdrom', t.info.keys()) -- 2.1.0

3 2

[PATCH V6] [Kimchi] Issue #992 : Create template on s390x without libvirt storage.
by archus＠linux.vnet.ibm.com 14 Sep '16

14 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments V3: Review comments and refactoring V4: Rebase patch to latest upstream. V5: Taken care of make check failed testcases. V6: Review comments. Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 13 +++-- model/storagevolumes.py | 1 - model/templates.py | 27 ++++++++--- model/vms.py | 9 +++- osinfo.py | 35 ++++++++++++-- utils.py | 34 +++++++++++++ vmtemplate.py | 125 +++++++++++++++++++++++++++++++++--------------- 9 files changed, 193 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 1c20466..cff623e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -438,6 +438,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path *(optional and only valid for s390x architecture)*: Storage path to store virtual disks without libvirt. * networks *(optional)*: list of networks will be assigned to the new VM. * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. * type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. @@ -504,6 +505,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path *(optional and only valid for s390x architecture)*: Either pool or path to store the virtual disks should be specified. * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index 47c829e..b6533d4 100644 --- a/i18n.py +++ b/i18n.py @@ -203,6 +203,9 @@ messages = { "KCHTMPL0037E": _("Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'."), "KCHTMPL0038E": _("Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)."), "KCHTMPL0039E": _("Interfaces parameter only supported on s390x or s390 architecture."), + "KCHTMPL0040E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0041E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0042E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..5942b31 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,9 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if is_s390x(): + return + default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +441,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index a6ce97b..2d68027 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -43,7 +43,6 @@ from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 04e6626..a5d17af 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -417,15 +419,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index b889166..6a9b1d1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1405,6 +1405,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 3e56d97..8ec9480 100644 --- a/osinfo.py +++ b/osinfo.py @@ -159,6 +159,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -166,7 +172,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -187,11 +198,27 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..7129bfe 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0041E", {'err': err}) + + return diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..373869e 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,69 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] + base_path_disk = ['index', 'base', 'path', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + # on s390x/s390 either pool or path should be present in + # default disk. + if is_s390x() and 'pool' not in default_disk and \ + 'path' not in default_disk: + raise InvalidParameter('KCHTMPL0040E') + + if is_s390x(): + # On s390x/s390 pool is optional attribute for disk. + pool = disk.get('pool', default_disk.get('pool')) + else: + pool = disk.get('pool', default_disk['pool']) + + if pool: + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + # This check is required where 'pool' disk + # has to be added and hence default path + # has to be removed during template update. + if 'path' in disk_info: + del disk_info['path'] + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk))): + # Addition check required only on s390x + if not is_s390x() or (keys != sorted(basic_path_disk)): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk.get('path')) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_path_disk)) and + (keys != sorted(base_path_disk))): + raise MissingParameter('KCHTMPL0042E') + + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +253,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +263,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +278,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -467,8 +512,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -519,10 +565,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 2.7.4

2 1

[PATCH] [Kimchi 0/4] adding 'console' parameter for s390x arch
by sureshab＠linux.vnet.ibm.com 14 Sep '16

14 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> For s390x, console can be either sclp/virtio. This patch set enables, listing and update of 'console' parameter for templates and vms when running on s390x Suresh Babu Angadi (4): for s390x, console can be either virtio/sclp this patch adds additional parameter 'console' to templates for s390x architecture. this patch adds additional parameter 'console' to vms, for s390x architecture. added error codes and json attribute for update of 'console' API.json | 24 ++++++++++++++--- control/templates.py | 1 + i18n.py | 2 ++ model/templates.py | 6 +++++ model/vms.py | 75 +++++++++++++++++++++++++++++++++++----------------- osinfo.py | 4 +++ xmlutils/serial.py | 6 ++++- 7 files changed, 90 insertions(+), 28 deletions(-) -- 2.1.0

3 12

[PATCH] [Kimchi] Introducing Console for edit template module under virtualization
by rajgupta＠linux.vnet.ibm.com 14 Sep '16

14 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing Console for edit template module under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 13 ++++++++++++- ui/pages/template-edit.html.tmpl | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..ad6857f 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -62,6 +62,12 @@ kimchi.template_edit_main = function() { } $('input[name="' + prop + '"]', templateEditMain).val(value); } + if(kimchi.hostarch == s390xArch){ + $('.console', templateEditMain).show(); + var consoleData = template.console ? template.console : ''; + $('#template-edit-console', templateEditMain).val(consoleData); + $('#template-edit-console').selectpicker(); + } $('#template-edit-memory-textbox').val(template.memory.current); $('#template-edit-max-memory-textbox').val(template.memory.maxmemory); @@ -356,7 +362,12 @@ kimchi.template_edit_main = function() { $('.modal input[type="checkbox"]').prop('disabled', true); $('.modal select').prop('disabled', true); $('.modal .selectpicker').addClass('disabled'); - var editableFields = ['name', 'memory', 'graphics', 'max-memory']; + if(kimchi.hostarch === s390xArch){ + var editableFields = ['name', 'memory', 'graphics', 'max-memory', 'console']; + }else { + var editableFields = ['name', 'memory', 'graphics', 'max-memory']; + } + var data = {}; var disks = $('.template-tab-body .item', '#form-template-storage'); var disksForUpdate = new Array(); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..d37df8d 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -73,6 +73,9 @@ <div class="template-edit-wrapper-label"> <label>$_("Graphics")</label> </div> + <div class="template-edit-wrapper-label console" style="display:none"> + <label>$_("Console")</label> + </div> </div> <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> @@ -104,6 +107,13 @@ <div class="template-edit-wrapper-controls"> <select id="template-edit-graphics" name="graphics" class="form-control" /> </div> + <div class="template-edit-wrapper-controls console" style="display:none"> + <select id="template-edit-console" name="console" class="form-control"> + <option value=""></option> + <option value="sclp">$_("sclp")</option> + <option value="virtio">$_("virtio")</option> + </select> + </div> </div> </form> </div> -- 2.1.0

2 1

[PATCH] [Kimchi] remote iso listing for s390x
by sureshab＠linux.vnet.ibm.com 13 Sep '16

13 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> added s390x architecture. this enables to check only s390x iso links while scanning for remote isos. Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- distroloader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distroloader.py b/distroloader.py index 1467a4c..775e8c9 100644 --- a/distroloader.py +++ b/distroloader.py @@ -31,7 +31,8 @@ from wok.plugins.kimchi import config ARCHS = {'x86_64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'], 'amd64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'], 'ppc64': ['ppc', 'ppc64'], - 'ppc64le': ['ppc64', 'ppc64le']} + 'ppc64le': ['ppc64', 'ppc64le'], + 's390x': ['s390', 's390x']} class DistroLoader(object): -- 2.1.0

2 1

[PATCH] [Wok 0/2] 'make check-local' fixes
by Aline Manera 13 Sep '16

13 Sep '16

Aline Manera (2): Remove obsolete message WOKUTILS0001E Add ui/libs/datatables/js/plugins/ip-address/* files to IBM-license-blacklist IBM-license-blacklist | 2 ++ src/wok/i18n.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.5.5

2 3

[PATCH V5] [Kimchi] Issue #992 : Create template on s390x without libvirt storage.
by archus＠linux.vnet.ibm.com 13 Sep '16

13 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments V3: Review comments and refactoring V4: Rebase patch to latest upstream. V5: Taken care of make check failed testcases. Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 13 +++-- model/storagevolumes.py | 1 - model/templates.py | 27 ++++++++--- model/vms.py | 9 +++- osinfo.py | 35 ++++++++++++-- utils.py | 34 +++++++++++++ vmtemplate.py | 123 +++++++++++++++++++++++++++++++++--------------- 9 files changed, 191 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 1c20466..cff623e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -438,6 +438,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path *(optional and only valid for s390x architecture)*: Storage path to store virtual disks without libvirt. * networks *(optional)*: list of networks will be assigned to the new VM. * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. * type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. @@ -504,6 +505,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path *(optional and only valid for s390x architecture)*: Either pool or path to store the virtual disks should be specified. * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index 47c829e..b6533d4 100644 --- a/i18n.py +++ b/i18n.py @@ -203,6 +203,9 @@ messages = { "KCHTMPL0037E": _("Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'."), "KCHTMPL0038E": _("Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)."), "KCHTMPL0039E": _("Interfaces parameter only supported on s390x or s390 architecture."), + "KCHTMPL0040E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0041E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0042E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..5942b31 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,9 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if is_s390x(): + return + default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +441,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index a6ce97b..2d68027 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -43,7 +43,6 @@ from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 04e6626..a5d17af 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -417,15 +419,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index b889166..6a9b1d1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1405,6 +1405,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 3e56d97..8ec9480 100644 --- a/osinfo.py +++ b/osinfo.py @@ -159,6 +159,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -166,7 +172,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -187,11 +198,27 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..7129bfe 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0041E", {'err': err}) + + return diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..3b5eeac 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,67 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] + base_path_disk = ['index', 'base', 'path', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + # on s390x/s390 either pool or path should be present in + # default disk. + if is_s390x() and 'pool' not in default_disk and \ + 'path' not in default_disk: + raise InvalidParameter('KCHTMPL0040E') + + if is_s390x(): + # On s390x/s390 pool is optional attribute for disk. + pool = disk.get('pool', default_disk.get('pool')) + else: + pool = disk.get('pool', default_disk['pool']) + + if pool: + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + # This check is required where 'path' disk + # exists and is replaced by 'pool' disk during + # template update + if 'path' in disk_info: + del disk_info['path'] + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != sorted(basic_path_disk))): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk.get('path')) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_path_disk)) and + (keys != sorted(base_path_disk))): + raise MissingParameter('KCHTMPL0042E') + + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +251,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +261,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +276,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -467,8 +510,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -519,10 +563,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 2.7.4

3 2

[PATCH] [Kimchi] Introducing s390x UI Storage module for Edit Guest under virtualization
by rajgupta＠linux.vnet.ibm.com 12 Sep '16

12 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Storage module for Edit Guest under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 170 +++++++++++++++++++++++++---- ui/pages/guest-storage-add.html.tmpl | 28 ++++- 2 files changed, 172 insertions(+), 26 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 29fccab..d931e8e 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -60,11 +60,23 @@ kimchi.guest_storage_add_main = function() { value: 'disk' }]; + var source = [{ + label: 'Pool', + value: 'pool' + },{ + label: 'Path', + value: 'path' + }]; + var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); var typeTextbox = $('select#guest-storage-type', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('select#guest-disk-pool', storageAddForm); + var sourceTextbox = $('select#guest-disk-source', storageAddForm); + var sourcenewTextbox = $('select#guest-disk-source-new', storageAddForm); + var directorypathTextbox = $('#directorypath', storageAddForm); + var diskpathTextbox = $('#diskpath', storageAddForm); var volTextbox = $('select#guest-disk-vol', storageAddForm); var newPoolTextbox = $('select#guest-disk-pool-new', storageAddForm); var capacityTextbox = $('input[name="capacity"]', storageAddForm); @@ -73,6 +85,7 @@ kimchi.guest_storage_add_main = function() { var selectStoragePoolHTML = ''; var selectStorageVolHTML = ''; var rbExisting = 'false'; + var s390xArch = 's390x'; var getFormatList = function() { var format = ["qcow", "qcow2", "qed", "raw", "vmdk", "vpc"]; @@ -177,6 +190,49 @@ kimchi.guest_storage_add_main = function() { //First time retrieving list of Storage Pools - defaulting to new disk getStoragePools('new'); + if(kimchi.hostarch === s390xArch){ + + //initialize source dropdown for new disk + $('#new-disk-box div.source').show(); + + var getStorageSourceNew = function(sourceSelected ) { + + selectStorageSourceHTML = ''; //reset string + + $.each(source, function(index, storageSource) { + selectStorageSourceHTML += '<option value="'+ storageSource.value + '">' + storageSource.label + '</option>'; + }); + + sourcenewTextbox.empty(); + sourcenewTextbox.append(selectStorageSourceHTML); + sourcenewTextbox.val(sourceSelected); + $(sourcenewTextbox).trigger('change'); + sourcenewTextbox.selectpicker(); + $('.selectpicker').selectpicker('refresh'); + }; + getStorageSourceNew('pool'); + + //initialize source dropdown for existing disk + $('#existing-disk-box div.source').show(); + + var getStorageSource = function(sourceSelected ) { + + selectStorageSourceHTML = ''; //reset string + + $.each(source, function(index, storageSource) { + selectStorageSourceHTML += '<option value="'+ storageSource.value + '">' + storageSource.label + '</option>'; + }); + + sourceTextbox.empty(); + sourceTextbox.append(selectStorageSourceHTML); + sourceTextbox.val(sourceSelected); + $(sourceTextbox).trigger('change'); + sourceTextbox.selectpicker(); + $('.selectpicker').selectpicker('refresh'); + }; + getStorageSource('pool'); + } + poolTextbox.on('change',function() { var options = []; selectStorageVolHTML = ''; @@ -214,6 +270,36 @@ kimchi.guest_storage_add_main = function() { }, null, false); }); + if (kimchi.hostarch === s390xArch) { + sourcenewTextbox.on('change', function() { + + switch ($(this).val()) { + case 'path': + $('#new-disk-box div.pool').hide(); + $('#new-disk-box div.directorypath').show(); + break; + default: + + $('#new-disk-box div.pool').show(); + $('#new-disk-box div.directorypath').hide(); + } + }); + + sourceTextbox.on('change', function() { + + switch ($(this).val()) { + case 'path': + $('#existing-disk-box div.pool,div.volume').hide(); + $('#existing-disk-box div.diskpath').show(); + break; + default: + + $('#existing-disk-box div.pool,div.volume').show(); + $('#existing-disk-box div.diskpath').hide(); + } + }); + } + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; var selectType = $(this).val(); @@ -237,9 +323,12 @@ kimchi.guest_storage_add_main = function() { $('#existing-disk-box').removeClass('hidden'); $('#new-disk-box').addClass('hidden'); $('#guest-storage-add-window .modal-body .template-pager').animate({ - height: "200px" + height: "300px" }, 300); getStoragePools('existing'); + if(kimchi.hostarch === s390xArch){ + getStorageSource('pool'); + } $(pathTextbox).val(""); $(newPoolTextbox).val(""); $(capacityTextbox).val(""); @@ -260,9 +349,18 @@ kimchi.guest_storage_add_main = function() { currentPage = 'new-disk-box'; $('#existing-disk-box').addClass('hidden'); $('#new-disk-box').removeClass('hidden'); + + if(kimchi.hostarch === s390xArch){ + getStorageSourceNew('pool'); + + $('#guest-storage-add-window .modal-body .template-pager').animate({ + height: "400px" + }, 400); + }else{ $('#guest-storage-add-window .modal-body .template-pager').animate({ height: "300px" }, 400); + } $(pathTextbox).val(""); $(poolTextbox).val(""); $(volTextbox).val(""); @@ -409,40 +507,66 @@ kimchi.guest_storage_add_main = function() { } var bNewDisk = 'false'; // Determine whether it's existing disk or new disk - if($(capacityTextbox).is(":visible") === true ) { + if ($(capacityTextbox).is(":visible") === true) { bNewDisk = 'true'; } var formData = storageAddForm.serializeObject(); - var settings = { - vm: kimchi.selectedGuest, - type: typeTextbox.val(), - path: pathTextbox.val(), - pool: poolTextbox.val(), - vol: volTextbox.val(), - newpool: newPoolTextbox.val(), - format: formatTextbox.val(), - capacity: capacityTextbox.val() - }; + if (kimchi.hostarch === s390xArch && ((sourceTextbox.val() === 'path') || sourcenewTextbox.val() === 'path')) { + + if ($('#new-disk').prop('checked')) { + var settings = { + vm: kimchi.selectedGuest, + dir_path: directorypathTextbox.val(), + name: kimchi.selectedGuest + '_' + $.now() + '.img', + size: capacityTextbox.val(), + type: typeTextbox.val(), + format: formatTextbox.val() + }; + } else if ($('#existing-disk').prop('checked')) { + var settings = { + vm: kimchi.selectedGuest, + path: diskpathTextbox.val(), + type: typeTextbox.val(), + format: formatTextbox.val() + }; + } + + } else { + var settings = { + vm: kimchi.selectedGuest, + type: typeTextbox.val(), + path: pathTextbox.val(), + pool: poolTextbox.val(), + vol: volTextbox.val(), + newpool: newPoolTextbox.val(), + format: formatTextbox.val(), + capacity: capacityTextbox.val() + }; + } $(submitButton).prop('disabled', true); $.each([pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { $(c).prop('disabled', true); }); - // Validate form for cdrom and disk - validateSpecifiedForm = validator[settings['type']]; - if (!validateSpecifiedForm(settings)) { - $(submitButton).prop('disabled', false); - $.each([submitButton, pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { - $(c).prop('disabled', false); - }); - return false; - } - $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); - if(bNewDisk === 'false'){ + if (kimchi.hostarch != s390xArch) { + // Validate form for cdrom and disk + validateSpecifiedForm = validator[settings['type']]; + if (!validateSpecifiedForm(settings)) { + $(submitButton).prop('disabled', false); + $.each([submitButton, pathTextbox, poolTextbox, volTextbox, newPoolTextbox, capacityTextbox, formatTextbox], function(i, c) { + $(c).prop('disabled', false); + }); + return false; + } + if (bNewDisk === 'false') { + addStorage(settings); + } + } else { addStorage(settings); } + $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); event.preventDefault(); }; diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index afc72c8..2fe74dd 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -53,7 +53,13 @@ </div> <div class="template-pager"> <div class="page" id="new-disk-box"> - <div class="form-group"> + <div class="form-group source" style="display:none;"> + <label>$_("Source")</label> + <select id="guest-disk-source-new" class="selectpicker col-md-12 col-lg-12"> + </select> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage based on Libvirt pool or direct block device")</p> + </div> + <div class="form-group pool"> <label>$_("Storage Pool")</label> <select id="guest-disk-pool-new" class="selectpicker col-md-12 col-lg-12"> </select> @@ -70,20 +76,36 @@ </select> <p class="help-block"><i class="fa fa-info-circle"></i> $_("Format of the new disk to be created")</p> </div> + <div class="form-group directorypath" style="display:none;"> + <label>$_("Directory Path")</label> + <input type="text" class="form-control" name="directorypath" id="directorypath" /> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Provide a directory path")</p> + </div> </div> <div class="page" id="existing-disk-box"> - <div class="form-group"> + <div class="form-group source" style="display:none;"> + <label>$_("Source")</label> + <select id="guest-disk-source" class="selectpicker col-md-12 col-lg-12"> + </select> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage based on Libvirt pool or direct block device")</p> + </div> + <div class="form-group pool"> <label>$_("Storage Pool")</label> <select id="guest-disk-pool" class="selectpicker col-md-12 col-lg-12"> </select> <p class="help-block"><i class="fa fa-info-circle"></i> $_("Storage pool in which the volume is located in")</p> </div> - <div class="form-group"> + <div class="form-group volume"> <label>$_("Storage Volume")</label> <select id="guest-disk-vol" 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> + <div class="form-group diskpath" style="display:none;"> + <label>$_("Disk Path")</label> + <input type="text" class="form-control" name="diskpath" id="diskpath" /> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("Provide a block device")</p> + </div> </div> </div> </div> -- 2.1.0

2 1

[PATCH] [Kimchi] Introducing s390x UI Storage module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 12 Sep '16

12 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.linux.com> Introducing s390x UI Storage module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.linux.com> --- ui/css/kimchi.css | 12 +- ui/css/src/modules/_templates.scss | 10 +- ui/js/src/kimchi.template_edit_main.js | 277 ++++++++++++++++++++++++++++----- ui/pages/template-edit.html.tmpl | 11 ++ 4 files changed, 268 insertions(+), 42 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 6cf2cc9..e0e05c7 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1597,7 +1597,15 @@ body.wok-gallery { } #template-edit-window .template-storage-cell.storage-pool { - width: 220px !important; + width: 180px !important; +} + +#template-edit-window .template-storage-cell.storage-path { + width: 180px !important; +} + +#template-edit-window .template-storage-cell.source { + width: 180px !important; } #template-edit-window .template-storage-cell.type { @@ -1609,7 +1617,7 @@ body.wok-gallery { } #template-edit-window .template-storage-cell.format { - width: 320px; + width: 250px; } #template-edit-window .template-interface-cell.network { diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index a75d803..2ae7412 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -158,7 +158,13 @@ $kimchi-icon-path: '../images'; height: selectpicker height - 2px; } .template-storage-cell.storage-pool { - width: 220px !important; + width: 180px !important; + } + .template-storage-cell.storage-path { + width: 180px !important; + } + .template-storage-cell.source { + width: 180px !important; } .template-storage-cell.type { width: 100px; @@ -167,7 +173,7 @@ $kimchi-icon-path: '../images'; width: 100px; } .template-storage-cell.format { - width: 320px; + width: 250px; } .template-interface-cell.network { width: 220px; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..6b79fed 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -226,6 +226,185 @@ kimchi.template_edit_main = function() { }); }; + var initStorage_s390 = function(result) { + // Gather storage data + var storagePoolsInfo = new Object(); + $.each(result, function(index, pool) { + if (pool.state === 'active' && pool.type != 'kimchi-iso') { + if (pool.type === 'iscsi' || pool.type === 'scsi') { + volumes = new Object(); + kimchi.listStorageVolumes(pool.name, function(vols) { + $.each(vols, function(i, vol) { + storagePoolsInfo[pool.name + "/" + vol.name] = { + 'type': pool.type, + 'volSize': vol.capacity / Math.pow(1024, 3) + }; + }); + }, null, true); + } else { + storagePoolsInfo[pool.name] = { + 'type': pool.type + }; + } + } + }); + + var addStorageItem = function(storageData) { + if (storageData.storageSource == 'pool') { + var thisName = storageData.storageName; + // Compatibility with old versions + if (storageData.storageVolume) { + storageData.storageDisk = storagePoolsInfo[thisName].volSize; + } + if (!storageData.storageType) { + storageData.storageType = storagePoolsInfo[thisName].type; + } + } + + var nodeStorage = $.parseHTML(wok.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + var storageRow = '#storageRow' + storageData.storageIndex; + + var storageOptions = ''; + $.each(storagePoolsInfo, function(poolName, value) { + storageOptions += '<option value="' + poolName + '">' + poolName + '</option>'; + }); + + + $(storageRow + ' .selectStorageName').append(storageOptions); + if (storageData.storageSource == 'pool') { + if (!$(storageRow + ' .selectStorageName option[value="' + storageData.storageName + '"]').length) { + var invalidOption = '<option disabled="disabled" selected="selected" value="' + storageData.storageName + '">' + storageData.storageName + '</option>'; + $(storageRow + ' .selectStorageName').prepend(invalidOption); + $(storageRow + ' .selectStorageName').parent().addClass('has-error') + } + $(storageRow + ' .selectStorageName').val(storageData.storageName); + $(storageRow + ' span.storage-pool').show(); + $(storageRow + ' span.storage-path').hide(); + } else { + $(storageRow + ' span.storage-pool').hide(); + $(storageRow + ' span.storage-path').show(); + } + + $(storageRow + ' .selectStorageName').selectpicker(); + + if (storageData.storageType === 'iscsi' || storageData.storageType === 'scsi') { + $(storageRow + ' .template-storage-disk').attr('readonly', true).prop('disabled', true); + $(storageRow + ' #diskFormat').val('raw'); + $(storageRow + ' #diskFormat').prop('disabled', true).change(); + } else if (storageData.storageType === 'logical') { + $(storageRow + ' #diskFormat').val('raw'); + $(storageRow + ' #diskFormat').prop('disabled', true).change(); + } + + //set source + $('#form-template-storage span.source').show(); + $(storageRow + ' #source').val(storageData.storageSource); + $(storageRow + ' #source').on('change', function() { + var source = $(this).val(); + $(storageRow + ' .template-storage-source').val(source); + if (source == 'path') { + $(storageRow + ' span.storage-pool').hide(); + $(storageRow + ' span.storage-path').show(); + } else { + $(storageRow + ' span.storage-pool').show(); + $(storageRow + ' span.storage-path').hide(); + } + }); + + $(storageRow + ' #source').selectpicker(); + + + + // Set disk format + if (isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('qcow2'); + $(storageRow + ' #diskFormat').prop('disabled', 'disabled'); + } else { + $(storageRow + ' #diskFormat').val(storageData.storageDiskFormat); + $(storageRow + ' #diskFormat').on('change', function() { + $(storageRow + ' .template-storage-disk-format').val($(this).val()); + }); + } + $(storageRow + ' #diskFormat').selectpicker(); + + $('.delete', '#form-template-storage').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + $(storageRow + ' select.selectStorageName').change(function() { + $(this).parent().parent().removeClass('has-error'); + var poolType = storagePoolsInfo[$(this).val()].type; + $(storageRow + ' .template-storage-name').val($(this).val()); + $(storageRow + ' .template-storage-type').val(poolType); + if (poolType === 'iscsi' || poolType === 'scsi') { + $(storageRow + ' .template-storage-disk').attr('readonly', true).prop('disabled', true).val(storagePoolsInfo[$(this).val()].volSize); + if (!isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('raw').prop('disabled', true).change(); + } + } else if (poolType === 'logical') { + $(storageRow + ' .template-storage-disk').attr('readonly', false).prop('disabled', false); + if (!isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('raw').prop('disabled', true).change(); + } + } else { + $(storageRow + ' .template-storage-disk').attr('readonly', false).prop('disabled', false); + if ($(storageRow + ' #diskFormat').prop('disabled') == true && !isImageBasedTemplate()) { + $(storageRow + ' #diskFormat').val('qcow2').prop('disabled', false).change(); + } + } + $(storageRow + ' #diskFormat').selectpicker('refresh'); + }); + }; // End of addStorageItem funtion + + if (origDisks && origDisks.length) { + origDisks.sort(function(a, b) { + return a.index - b.index + }); + $.each(origDisks, function(index, diskEntities) { + if (typeof diskEntities.pool !== 'undefined') { + var defaultPool = diskEntities.pool.name.split('/').pop() + var storageNodeData = { + storageSource: 'pool', + storageName: diskEntities.volume ? defaultPool + '/' + diskEntities.volume : defaultPool, + storageType: diskEntities.pool.type, + storageIndex: diskEntities.index, + storageDisk: diskEntities.size, + storageDiskFormat: diskEntities.format ? diskEntities.format : 'qcow2', + storageVolume: diskEntities.volume + } + } else { + var storageNodeData = { + storageSource: 'path', + storagePath: diskEntities.path, + storageType: 'dir', + storageIndex: diskEntities.index, + storageDisk: diskEntities.size, + storageDiskFormat: diskEntities.format ? diskEntities.format : 'qcow2', + storageVolume: diskEntities.volume + } + } + addStorageItem(storageNodeData); + }); + } + + var storageID = origDisks.length - 1; + $('#template-edit-storage-add-button').on("click", function(event) { + event.preventDefault(); + storageID = storageID + 1; + var storageNodeData = { + storageSource: 'pool', + storageName: 'default', + storageType: 'dir', + storageDisk: '10', + storageDiskFormat: 'qcow2', + storageIndex: storageID + } + addStorageItem(storageNodeData); + }); + }; + var initInterface = function(result) { var networkItemNum = 0; var addInterfaceItem = function(networkData) { @@ -340,49 +519,71 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); - kimchi.listStoragePools(initStorage); + if (kimchi.hostarch === s390xArch) { + kimchi.listmacvtapNetworks(function(macvtapnet) { + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet) { + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + + kimchi.listStoragePools(initStorage_s390); + } else { + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + } + initProcessor(); checkInvalids(); - }; - kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); - + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); $('#tmpl-edit-button-save').on('click', function() { - $button = $(this); - $button.html('<span class="wok-loading-icon" /> ' + i18n['KCHAPI6010M']); - $button.prop('disabled', true); - $('.modal .wok-mask').removeClass('hidden'); - $('.modal input[type="text"]').prop('disabled', true); - $('.modal input[type="checkbox"]').prop('disabled', true); - $('.modal select').prop('disabled', true); - $('.modal .selectpicker').addClass('disabled'); - var editableFields = ['name', 'memory', 'graphics', 'max-memory']; - var data = {}; - var disks = $('.template-tab-body .item', '#form-template-storage'); - var disksForUpdate = new Array(); - $.each(disks, function(index, diskEntity) { - var newDisk = { - 'index': index, - 'pool': { 'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val() }, - 'size': Number($(diskEntity).find('.template-storage-disk').val()), - 'format': $(diskEntity).find('.template-storage-disk-format').val() - }; - - // image based template: add base to dictionary - if ((baseImageTemplate) && (index == 0)) { - newDisk["base"] = $('#template-edit-vmimage-textbox').val(); - } + $button = $(this); + $button.html('<span class="wok-loading-icon" /> ' + i18n['KCHAPI6010M']); + $button.prop('disabled', true); + $('.modal .wok-mask').removeClass('hidden'); + $('.modal input[type="text"]').prop('disabled', true); + $('.modal input[type="checkbox"]').prop('disabled', true); + $('.modal select').prop('disabled', true); + $('.modal .selectpicker').addClass('disabled'); + var editableFields = ['name', 'memory', 'graphics', 'max-memory']; + var data = {}; + var disks = $('.template-tab-body .item', '#form-template-storage'); + var disksForUpdate = new Array(); + $.each(disks, function(index, diskEntity) { + if (kimchi.hostarch == s390xArch && ($(diskEntity).find('.template-storage-source').val()) == 'path') { + var newDisk = { + 'index': index, + 'path': $(diskEntity).find('.template-storage-path').val(), + 'size': Number($(diskEntity).find('.template-storage-disk').val()), + 'format': $(diskEntity).find('.template-storage-disk-format').val() + }; + } else { + var newDisk = { + 'index': index, + 'pool': { + 'name': '/plugins/kimchi/storagepools/' + $(diskEntity).find('.template-storage-name').val() + }, + 'size': Number($(diskEntity).find('.template-storage-disk').val()), + 'format': $(diskEntity).find('.template-storage-disk-format').val() + }; + } - var storageType = $(diskEntity).find('.template-storage-type').val(); - if (storageType === 'iscsi' || storageType === 'scsi') { - newDisk['volume'] = newDisk['pool']['name'].split('/').pop(); - newDisk['pool']['name'] = newDisk['pool']['name'].slice(0, newDisk['pool']['name'].lastIndexOf('/')); - delete newDisk.size; - } - disksForUpdate.push(newDisk); - }); - data.disks = disksForUpdate; + // image based template: add base to dictionary + if ((baseImageTemplate) && (index == 0)) { + newDisk["base"] = $('#template-edit-vmimage-textbox').val(); + } + var storageType = $(diskEntity).find('.template-storage-type').val(); + if (storageType === 'iscsi' || storageType === 'scsi') { + newDisk['volume'] = newDisk['pool']['name'].split('/').pop(); + newDisk['pool']['name'] = newDisk['pool']['name'].slice(0, newDisk['pool']['name'].lastIndexOf('/')); + delete newDisk.size; + } + disksForUpdate.push(newDisk); + }); + data.disks = disksForUpdate; $.each(editableFields, function(i, field) { if (field == 'graphics') { var type = $('#form-template-general [name="' + field + '"]').val(); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..33533a1 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -110,6 +110,7 @@ <div role="tabpanel" class="tab-pane" id="storage"> <form id="form-template-storage"> <div class="template-tab-header"> + <span class="template-storage-cell source" style="display:none">$_("Source")</span> <span class="template-storage-cell storage-pool">$_("Storage Pool")</span> <span class="template-storage-cell type">$_("Type")</span> <span class="template-storage-cell disk">$_("Disk(GB)")</span> @@ -182,10 +183,20 @@ </script> <script id="template-storage-pool-tmpl" type="text/html"> <div id="storageRow{storageIndex}" class='item'> + <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> + </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> </span> + <span class="template-storage-cell storage-path" style="display:none"> + <input class="template-storage-path storage-path form-control" value="{storagePath}" type="text" /> + </span> <span class="template-storage-cell type"> <input class="template-storage-type form-control" value={storageType} readonly=true type="text" /> </span> -- 2.1.0

2 1

[PATCH] [Kimchi] Introducing s390x UI Interfaces module for Edit Guest under virtualization
by rajgupta＠linux.vnet.ibm.com 12 Sep '16

12 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Interfaces module for Edit Guest under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 26 +++- ui/css/src/modules/_edit-guests.scss | 23 ++- ui/js/src/kimchi.guest_edit_main.js | 282 ++++++++++++++++++++++++++++++++--- ui/pages/guest-edit.html.tmpl | 40 +++++ 4 files changed, 341 insertions(+), 30 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 6cf2cc9..9299c38 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1028,7 +1028,7 @@ body.wok-gallery { } #guest-edit-window #form-guest-edit-interface .column-actions { - width: 23%; + width: 20%; } #guest-edit-window #form-guest-edit-storage .column-actions { @@ -1088,19 +1088,25 @@ body.wok-gallery { #guest-edit-window form .header .cell.column-type, #guest-edit-window form .task .cell.column-type, #guest-edit-window form .body .cell.column-type { - width: 11.35%; + width: 18%; +} + +#guest-edit-window form .header .cell.column-mode, +#guest-edit-window form .task .cell.column-mode, +#guest-edit-window form .body .cell.column-mode { + width: 16%; } #guest-edit-window form .header .cell.column-mac, #guest-edit-window form .task .cell.column-mac, #guest-edit-window form .body .cell.column-mac { - width: 14.5%; + width: 14%; } #guest-edit-window form .header .cell.column-ip, #guest-edit-window form .task .cell.column-ip, #guest-edit-window form .body .cell.column-ip { - width: 31%; + width: 12%; } #guest-edit-window form .header .cell.column-sel, @@ -1239,6 +1245,18 @@ body.wok-gallery { width: 180px; } +#guest-edit-window form .header .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .task .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .body .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) { + width: 160px; +} + +#guest-edit-window form .header .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .task .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .body .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) { + width: 180px; +} + .guest-edit-snapshot .hide, .guest-edit-interface .hide { display: none !important; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index b7e6941..632d634 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -48,7 +48,7 @@ } #form-guest-edit-interface { .column-actions { - width: 23%; + width: 20%; } } #form-guest-edit-storage { @@ -94,13 +94,16 @@ } } .cell.column-type { - width: 11.35%; + width: 18%; + } + .cell.column-mode { + width: 16%; } .cell.column-mac { - width: 14.5%; + width: 14%; } .cell.column-ip { - width: 31%; + width: 12%; } .cell.column-sel { width: 1.77%; @@ -204,6 +207,18 @@ width: 180px; } +#guest-edit-window form .header .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .task .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .body .cell.column-mode .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) { + width: 160px; +} + +#guest-edit-window form .header .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .task .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn), +#guest-edit-window form .body .cell.column-type .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) { + width: 180px; +} + .guest-edit-snapshot .hide, .guest-edit-interface .hide { display: none !important; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index dcaafb8..cc899ff 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -20,6 +20,11 @@ kimchi.guest_edit_main = function() { var formTargetId; var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); + var s390xArch = 's390x'; + var macvtapNetworks = ""; + var ovsNetworks = ""; + var networkOptions = ""; + clearTimeout(kimchi.vmTimeout); $('#modalWindow').on('hidden.bs.modal', function() { @@ -176,14 +181,28 @@ kimchi.guest_edit_main = function() { }); }); var toggleEdit = function(item, on, itemId) { + if(kimchi.hostarch === s390xArch){ + $("#label-mac-" + itemId, item).toggleClass("hide", on); + $("#edit-mac-" + itemId, item).toggleClass("hide", !on); + $("#label-network-" + itemId, item).toggleClass("hide", false); + $("#label-type-" + itemId, item).toggleClass("hide", false); + $("#label-mode-" + itemId, item).toggleClass("hide", false); + $("select", item).toggleClass("hide", true); + $(".bootstrap-select", item).toggleClass("hide", true); + $(".action-area", item).toggleClass("hide"); + + }else { + $("#label-mac-" + itemId, item).toggleClass("hide", on); $("#edit-mac-" + itemId, item).toggleClass("hide", !on); $("#label-network-" + itemId, item).toggleClass("hide", false); $("select", item).toggleClass("hide", true); $(".bootstrap-select", item).toggleClass("hide", true); $(".action-area", item).toggleClass("hide"); + } }; var addItem = function(data) { + var oriID = data.id; if (data.id === -1) { data.id = $('#form-guest-edit-interface > .body').children().size(); } @@ -192,13 +211,28 @@ kimchi.guest_edit_main = function() { } else { data.ips = data.ips; } - var itemNode = $.parseHTML(wok.substitute($('#interface-tmpl').html(), data)); - $(".body", "#form-guest-edit-interface").append(itemNode); - $("select", itemNode).append(networkOptions); - $("select", itemNode).selectpicker(); - if (data.network !== "") { - $("select", itemNode).val(data.network); + if (kimchi.hostarch === s390xArch) { + data.mode = (data.mode) ? data.mode : 'None'; + var itemNode = $.parseHTML(wok.substitute($('#interface-s390x-tmpl').html(), data)); + $(".body", "#form-guest-edit-interface").append(itemNode); + + $("select", "span.column-type", itemNode).empty().append(typeOptions); + $("select", "span.column-mode", itemNode).empty().append(modeOptions); + $("select", "span.column-network", itemNode).empty().append(macvtapNetworks); + + $("select", "span.column-type", itemNode).val(data.type); + $("select", "span.column-network", itemNode).val(data.source); + $("select", "span.column-mode", itemNode).val(data.mode); + + } else { + var itemNode = $.parseHTML(wok.substitute($('#interface-tmpl').html(), data)); + $(".body", "#form-guest-edit-interface").append(itemNode); + $("select", "span.column-network", itemNode).append(networkOptions); } + + $("select", itemNode).selectpicker(); + + $('.edit', itemNode).attr('disabled', kimchi.thisVMState === "running"); $(".edit", itemNode).on('click', function(evt) { evt.preventDefault(); @@ -214,22 +248,122 @@ kimchi.guest_edit_main = function() { $(".save", itemNode).on('click', function(evt) { evt.preventDefault(); var item = $(this).parent().parent(); - var interface = { - network: $("select", item).val(), - type: "network", - mac: $(":text", item).val(), - ips: $(".ipText", item).val() - }; + + if (kimchi.hostarch === s390xArch) { + if (item.prop("id") === "") { //adding new interface + switch ($("span.column-type select", item).val()) { + case 'macvtap': + var interface = { + source: $("span.column-network select", item).val(), + type: $("span.column-type select", item).val(), + mac: $(":text", item).val(), + ips: $(".ipText", item).val(), + mode: $("span.column-mode select", item).val() + }; + break; + + case 'ovs': + var interface = { + source: $("span.column-network select", item).val(), + type: $("span.column-type select", item).val(), + mac: $(":text", item).val(), + ips: $(".ipText", item).val() + }; + break; + + case 'network': + var interface = { + network: $("span.column-network select", item).val(), + type: "network", + mac: $(":text", item).val(), + ips: $(".ipText", item).val() + }; + break; + } + } else { //updating existing interface + + switch ($("#label-type-" + data.id, item).text()) { + case 'macvtap': + + var interface = { + source: $("#label-network-" + data.id, item).text(), + type: $("#label-type-" + data.id, item).text(), + mac: $(":text", item).val(), + ips: $(".ipText", item).val(), + mode: $("#label-mode-" + data.id, item).text() + }; + break; + + case 'ovs': + var interface = { + source: $("#label-network-" + data.id, item).text(), + type: $("#label-type-" + data.id, item).text(), + mac: $(":text", item).val(), + ips: $(".ipText", item).val() + }; + break; + + case 'network': + var interface = { + network: $("#label-network-" + data.id, item).text(), + type: "network", + mac: $(":text", item).val(), + ips: $(".ipText", item).val() + }; + break; + } + + } + } else { //in s86 arch + var interface = { + network: $("select", item).val(), + type: "network", + mac: $(":text", item).val(), + ips: $(".ipText", item).val() + }; + } + var postUpdate = function(mac) { $("#label-network-" + data.id, item).text(interface.network); $("#label-mac-" + data.id, item).text(mac); $("#edit-mac-" + data.id, item).val(mac); toggleEdit(item, false, data.id); }; + + var posts390xUpdate = function(result) { + switch(result.type){ + case 'macvtap' : + $("#label-type-" + data.id, item).text(result.type); + $("#label-network-" + data.id, item).text(result.source); + $("#label-mode-" + data.id, item).text(result.mode); + break; + + 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'); + 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'); + break; + } + + $("#label-mac-" + data.id, item).text(result.mac); + $("#edit-mac-" + data.id, item).val(result.mac); + toggleEdit(item, false, data.id); + }; + if (item.prop("id") === "") { kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data) { item.prop("id", data.mac); - postUpdate(data.mac); + if(kimchi.hostarch == s390xArch){ + posts390xUpdate(data); + }else{ + postUpdate(data.mac); + } }); } else { if (item.prop('id') === interface.mac) { @@ -249,22 +383,126 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); $("label", item).text() === "" ? item.remove() : toggleEdit(item, false, data.id); }); + + if (kimchi.hostarch === s390xArch) { + $("#interface-s390x-type-" + data.id).on('change', function() { + var itemNode = $(this).closest('div.item'); + switch ($(this).val()) { + case 'macvtap': + $('#label-mode-' + data.id).addClass('hide'); + $('span.column-mode .bootstrap-select', itemNode).toggleClass("hide", false); + + $("span.column-network select", itemNode).empty().append(macvtapNetworks); + $("span.column-network select", itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('#label-mode-' + data.id).html('None'); + $('#label-mode-' + data.id).removeClass('hide'); + $('span.column-mode .bootstrap-select', itemNode).toggleClass("hide", true); + + $("span.column-network select", itemNode).empty().append(ovsNetworks); + $("span.column-network select", itemNode).selectpicker('refresh'); + break; + case 'network': + $('#label-mode-' + data.id).html('None'); + $('#label-mode-' + data.id).removeClass('hide'); + $('span.column-mode .bootstrap-select', itemNode).toggleClass("hide", true); + + $("span.column-network select", itemNode).empty().append(networkOptions); + $("span.column-network select", itemNode).selectpicker('refresh'); + break; + } + }); + if (oriID === -1) { + $("#interface-s390x-type-" + data.id).trigger('change'); + } + } + }; - var networkOptions = ""; + + kimchi.listNetworks(function(data) { for (var i = 0; i < data.length; i++) { var isSlected = i === 0 ? " selected" : ""; networkOptions += "<option" + isSlected + ">" + data[i].name + "</option>"; } - kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { - for (var i = 0; i < data.length; i++) { - data[i].viewMode = ""; - data[i].editMode = "hide"; - data[i].id = i; - addItem(data[i]); - } - }); + + if (kimchi.hostarch === s390xArch) { + + kimchi.listmacvtapNetworks(function(data) { + for (var i = 0; i < data.length; i++) { + var isSlected = i === 0 ? ' selected="selected"' : ""; + macvtapNetworks += "<option" + isSlected + ">" + data[i].name + "</option>"; + } + + kimchi.listovsNetworks(function(data) { + for (var i = 0; i < data.length; i++) { + var isSlected = i === 0 ? " selected" : ""; + ovsNetworks += "<option" + isSlected + ">" + data[i] + "</option>"; + } + + kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { + for (var i = 0; i < data.length; i++) { + data[i].viewMode = ""; + data[i].editMode = "hide"; + data[i].id = i; + addItem(data[i]); + } + }); + }); + }); + } else { + kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data) { + for (var i = 0; i < data.length; i++) { + data[i].viewMode = ""; + data[i].editMode = "hide"; + data[i].id = i; + if (data[i].type == 'network') + addItem(data[i]); + } + }); + } }); + + if (kimchi.hostarch === s390xArch) { + $('#form-guest-edit-interface > div.header').hide(); + $('#form-guest-edit-interface > div.s390x').show(); + + var typeOptionsdata = [{ + label: "macvtap", + value: "macvtap" + }, { + label: "ovs", + value: "ovs" + }, { + label: "network", + value: "network" + }]; + var typeOptions = ''; + + for (var i = 0; i < typeOptionsdata.length; i++) { + var isSlected = i === 0 ? ' selected="selected"' : ""; + typeOptions += '<option' + isSlected + ' value="' + typeOptionsdata[i].value + '">' + typeOptionsdata[i].label + '</option>'; + } + + var modeOptionsdata = [{ + label: "Bridge", + value: "bridge" + }, { + label: "Vepa", + value: "vepa" + }]; + var modeOptions = ''; + + for (var i = 0; i < modeOptionsdata.length; i++) { + var isSlected = i === 0 ? " selected" : ""; + modeOptions += '<option' + isSlected + ' value="' + modeOptionsdata[i].value + '">' + modeOptionsdata[i].label + '</option>'; + } + } else { + $('#form-guest-edit-interface > div.header').show(); + $('#form-guest-edit-interface > div.s390x').hide(); + } }; var setupPermission = function() { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index a9a468e..3a575dc 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -92,6 +92,14 @@ <span class="cell column-ip">$_("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-actions"><span class="sr-only">$_("Actions")</span></span> + </div> <div class="body"></div> </form> <form role="tabpanel" class="guest-edit-permission tab-pane" id="form-guest-edit-permission"> @@ -246,6 +254,38 @@ </span> <div> </script> +<script id="interface-s390x-tmpl" type="text/html"> + <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> + </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> + </span> + <span class="cell column-mode"> + <span id="label-mode-{id}" class="{viewMode}">{mode}</span> + <select id="interface-s390x-mode-{id}" class="{editMode}"></select> + </span> + <span class="cell column-mac"> + <span id="label-mac-{id}" class="{viewMode}">{mac}</span> + <input class="form-control {editMode}" type="text" + id="edit-mac-{id}" class="form-control" name="{mac}" value="{mac}" /> + </span> + <span class="cell column-ip"> + <span class=ipText>{ips}</span> + </span> + <span class="cell {editMode} column-actions action-area"> + <button class="btn btn-primary save">$_("Save")</button> + <button class="btn btn-primary cancel">$_("Remove")</button> + </span> + <span class="cell {viewMode} column-actions action-area"> + <button class="btn btn-link edit"><i class="fa fa-pencil"></i> $_("Edit")</button> + <button class="btn btn-link delete"><i class="fa fa-minus-circle"></i> $_("Remove")</button> + </span> + <div> +</script> <script id="ldap-user-tmpl" type="text/html"> <div class="item" id="{user}"> <span class="cell"> -- 2.1.0

2 1

[PATCH] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 12 Sep '16

12 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 44 ++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 260 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 33 +++++ 4 files changed, 327 insertions(+), 15 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..a69336a 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,35 @@ var kimchi = { }); }, + listmacvtapNetworks : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/ovsbridges', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -1271,3 +1300,18 @@ var kimchi = { }); } }; + +/** + * Get the host information. + */ +kimchi.getHostDetails = function (suc,err) { + wok.requestJSON({ + url : 'plugins/gingerbase/host', + type : 'GET', + resend: true, + contentType : 'application/json', + dataType : 'json', + success : suc, + error: err + }); +} diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..ae996f0 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..ec93d86 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -268,10 +274,173 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -340,7 +509,18 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); + if(kimchi.hostarch === s390xArch){ + kimchi.listmacvtapNetworks(function(macvtapnet){ + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet){ + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + }else { + kimchi.listNetworks(initInterface); + } + kimchi.listStoragePools(initStorage); initProcessor(); checkInvalids(); @@ -432,18 +612,68 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); + if(kimchi.hostarch === s390xArch){ + + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + + interfacceForUpdate.push(thisdata); + break; + + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..4e08243 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -129,6 +129,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -221,5 +230,29 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select> +  + </select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.1.0

2 1

[RFC] Ginger and possible Wok and other plugins sidebar
by Samuel Henrique De Oliveira Guimaraes 08 Sep '16

08 Sep '16

Hi team, I'm currently working on Ginger sidebar and I was creating a dynamic widget that we could eventually use on other plugins and move it to Wok but I'm facing some major issues with asynchronous requests and synchronous function calls so I would like to receive input from the whole community on this matter. Please take a look: https://groups.google.com/d/msg/ginger-dev-list/Xx7IlutnP7Y/1eyLmsQEAAAJ Regards, Samuel

1 0

[PATCH v6] [Kimchi] Feature request (#860): Support Guest Autostart
by bianca＠linux.vnet.ibm.com 08 Sep '16

08 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Include 'autostart' option in API.json and vms.py (lookup and update) using libvirt dom.setAutostart to set as true or false. Also edit test_model.py to include those changes and updated API.md file. Also included API tests to test_rest.py in test_edit_vm function. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- API.json | 4 ++++ docs/API.md | 3 +++ model/vms.py | 11 ++++++++--- tests/test_mockmodel.py | 2 +- tests/test_model.py | 8 +++++++- tests/test_rest.py | 22 ++++++++++++++++++++++ 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/API.json b/API.json index 9ad60a2..0effe45 100644 --- a/API.json +++ b/API.json @@ -369,6 +369,10 @@ "error": "KCHVM0053E", "type": "boolean" }, + "autostart": { + "description": "Enable/Disable guest autostart", + "type": "boolean" + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/docs/API.md b/docs/API.md index 1c20466..4aaa243 100644 --- a/docs/API.md +++ b/docs/API.md @@ -151,6 +151,8 @@ server. * bootorder: list of devices in boot order * description: VM description * title: VM title + * autostart: show if autostart is enabled. + * **DELETE**: Remove the Virtual Machine * **PUT**: update the parameters of existing VM * name: New name for this VM (only applied for shutoff VM) @@ -184,6 +186,7 @@ server. * bootmenu: prompts guest bootmenu. Bool type. * description: VM description * title: VM title + * autostart: enable/disable guest autostart (true or false params). * **POST**: *See Virtual Machine Actions* diff --git a/model/vms.py b/model/vms.py index b889166..a87c133 100644 --- a/model/vms.py +++ b/model/vms.py @@ -80,12 +80,13 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users', + 'autostart'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', 'name', 'users', 'bootorder', 'bootmenu', - 'description', 'title'] + 'description', 'title', 'autostart'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -270,6 +271,9 @@ class VMModel(object): with lock: dom = self.get_vm(name, self.conn) + if "autostart" in params: + dom.setAutostart(1 if params['autostart'] is True else 0) + # You can only change <maxMemory> offline, updating guest XML if ("memory" in params) and ('maxmemory' in params['memory']) and\ (DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): @@ -1324,7 +1328,8 @@ class VMModel(object): 'access': 'full', 'persistent': True if dom.isPersistent() else False, 'bootorder': boot, - 'bootmenu': bootmenu + 'bootmenu': bootmenu, + 'autostart': dom.autostart() } def _vm_get_disk_paths(self, dom): diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 147942c..ffd383c 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -164,7 +164,7 @@ class MockModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpu_info', 'screenshot', 'icon', 'graphics', 'users', 'groups', 'access', 'persistent', 'bootorder', 'bootmenu', 'title', - 'description')) + 'description', 'autostart')) stats_keys = set(('cpu_utilization', 'mem_utilization', 'net_throughput', 'net_throughput_peak', diff --git a/tests/test_model.py b/tests/test_model.py index 05f046c..4421a0b 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -129,7 +129,7 @@ class ModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpu_info', 'screenshot', 'icon', 'graphics', 'users', 'groups', 'access', 'persistent', 'bootorder', 'bootmenu', 'title', - 'description')) + 'description', 'autostart')) stats_keys = set(('cpu_utilization', 'mem_utilization', 'net_throughput', 'net_throughput_peak', @@ -1358,6 +1358,12 @@ class ModelTests(unittest.TestCase): inst.vm_update(u'пeω-∨м', {"bootmenu": False}) self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['bootmenu']) + # enable/disable autostart + inst.vm_update(u'пeω-∨м', {"autostart": True}) + self.assertEquals(1, inst.vm_lookup(u'пeω-∨м')['autostart']) + inst.vm_update(u'пeω-∨м', {"autostart": False}) + self.assertEquals(0, inst.vm_lookup(u'пeω-∨м')['autostart']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 00ad7f3..fcbebce 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -311,6 +311,28 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') self.assertEquals(400, resp.status) + # set vm autostart tests (powered off) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd/start', + '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": True}) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', + '{}', 'GET').read() + self.assertEquals(json.loads(resp)["autostart"], True) + + # set vm autostart tests (running) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd/poweroff', + '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": False}) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', + '{}', 'GET').read() + self.assertEquals(json.loads(resp)["autostart"], False) + def test_vm_lifecycle(self): # Create a Template req = json.dumps({'name': 'test', -- 2.7.4

1 0

Re: [Kimchi-devel] Fwd: [PATCH] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by Rajat Gupta 07 Sep '16

07 Sep '16

Please ignore following patch will be sending another patch with corrections. > -------- Forwarded Message -------- > Subject: [Kimchi-devel] [PATCH] [Kimchi] Introducing s390x UI > Interfaces module for Edit Template under virtualization > Date: Wed, 7 Sep 2016 15:56:48 +0530 > From: rajgupta(a)linux.vnet.ibm.com > To: Kimchi Devel <kimchi-devel(a)ovirt.org> > > > > From: Rajat Gupta<rajgupta(a)linux.vnet.ibm.com> > > Introducing s390x UI Interfaces module for Edit Template under virtualization > > Signed-off-by: Rajat Gupta<rajgupta(a)linux.vnet.ibm.com> > --- > ui/js/src/kimchi.api.js | 58 ++++++++ > ui/js/src/kimchi.main.js | 5 + > ui/js/src/kimchi.template_edit_main.js | 260 +++++++++++++++++++++++++++++++-- > ui/pages/template-edit.html.tmpl | 33 +++++ > 4 files changed, 341 insertions(+), 15 deletions(-) > > diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js > index 2f127aa..ce0e07c 100644 > --- a/ui/js/src/kimchi.api.js > +++ b/ui/js/src/kimchi.api.js > @@ -596,6 +596,35 @@ var kimchi = { > }); > }, > > + listmacvtapNetworks : function(suc, err) { > + wok.requestJSON({ > + url : 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', > + type : 'GET', > + contentType : 'application/json', > + dataType : 'json', > + resend : true, > + success : suc, > + error : err ? err : function(data) { > + wok.message.error(data.responseJSON.reason); > + } > + }); > + }, > + > + listovsNetworks : function(suc, err) { > + wok.requestJSON({ > + url : 'plugins/kimchi/ovsbridges', > + type : 'GET', > + contentType : 'application/json', > + dataType : 'json', > + resend : true, > + success : suc, > + error : err ? err : function(data) { > + wok.message.error(data.responseJSON.reason); > + } > + }); > + }, > + > + > toggleNetwork : function(name, on, suc, err) { > var action = on ? "activate" : "deactivate"; > wok.requestJSON({ > @@ -638,6 +667,20 @@ var kimchi = { > }); > }, > > + gets390xInterfaces : function(suc, err) { > + wok.requestJSON({ > + url : 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', > + type : 'GET', > + contentType : 'application/json', > + dataType : 'json', > + resend : true, > + success : suc, > + error : err ? err : function(data) { > + wok.message.error(data.responseJSON.reason); > + } > + }); > + }, > + > getInterface : function(iface, suc, err, sync) { > wok.requestJSON({ > url : 'plugins/kimchi/interfaces/' + encodeURIComponent(iface), > @@ -1271,3 +1314,18 @@ var kimchi = { > }); > } > }; > + > +/** > + * Get the host information. > + */ > +kimchi.getHostDetails = function (suc,err) { > + wok.requestJSON({ > + url : 'plugins/gingerbase/host', > + type : 'GET', > + resend: true, > + contentType : 'application/json', > + dataType : 'json', > + success : suc, > + error: err > + }); > +} > diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js > index b6de2cf..ae996f0 100644 > --- a/ui/js/src/kimchi.main.js > +++ b/ui/js/src/kimchi.main.js > @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { > kimchi.capabilities = {}; > }); > > +kimchi.hostarch = undefined; > +kimchi.getHostDetails(function(result) { > + kimchi.hostarch = result["architecture"]; > +}); > + > $(function(){ > $('body').removeClass('wok-list wok-gallery'); > }); > diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js > index a2032cc..3cb32e8 100644 > --- a/ui/js/src/kimchi.template_edit_main.js > +++ b/ui/js/src/kimchi.template_edit_main.js > @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { > var templateEditMain = $('#edit-template-tabs'); > var origDisks; > var origNetworks; > + var origInterfaces; > + var origmacvtapNetworks; > + var origovsNetworks; > var templateDiskSize; > var baseImageTemplate; > + var s390xArch = 's390x'; > + > $('#template-name', templateEditMain).val(kimchi.selectedTemplate); > $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { > $('.tab-content').css('overflow', 'hidden'); > @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { > var initTemplate = function(template) { > origDisks = template.disks; > origNetworks = template.networks; > + origInterfaces = template.interfaces; > for (var i = 0; i < template.disks.length; i++) { > if (template.disks[i].base) { > template["vm-image"] = template.disks[i].base; > @@ -268,10 +274,173 @@ kimchi.template_edit_main = function() { > }); > }; > > - var initProcessor = function() { > - var setCPUValue = function() { > - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { > - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); > + var initInterface_s390x = function(result) { > + $('#form-template-interface-s390x').show(); > + $('#form-template-interface').hide(); > + var networkItemNum = 0; > + var addInterfaceItem = function(networkData) { > + var networkName = networkData.networkV; > + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); > + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); > + $('.delete', '#form-template-interface-s390x').on("click", function(event) { > + event.preventDefault(); > + $(this).parent().parent().remove(); > + }); > + > + //initialize type option > + var typeOptionsdata = {}; > + var typeOptions = ''; > + typeOptionsdata.macvtap = 'macvtap'; > + typeOptionsdata.ovs = 'ovs'; > + typeOptionsdata.network = 'network'; > + > + $.each(typeOptionsdata, function(key, value) { > + if (value === networkData.type) { > + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; > + } else { > + typeOptions += '<option value="' + key + '">' + value + '</option>'; > + } > + }); > + > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { > + var itemNode = $(this).closest('div.item'); > + > + switch ($(this).val()) { > + case 'macvtap': > + $('span.mode .label-mode', itemNode).addClass('hide'); > + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); > + > + var networkOptions = ''; > + for (var i = 0; i < origmacvtapNetworks.length; i++) { > + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; > + } > + > + $('span.network select', itemNode).empty().append(networkOptions); > + $('span.network select', itemNode).selectpicker('refresh'); > + > + break; > + case 'ovs': > + $('span.mode .label-mode', itemNode).removeClass('hide'); > + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); > + var networkOptions = ''; > + for (var i = 0; i < origovsNetworks.length; i++) { > + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; //it should be origovsNetworks[i].name rajat > + } > + > + $('span.network select', itemNode).empty().append(networkOptions); > + $('span.network select', itemNode).selectpicker('refresh'); > + > + break; > + case 'network': > + $('span.mode .label-mode', itemNode).removeClass('hide'); > + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); > + > + var networkOptions = ''; > + for (var i = 0; i < result.length; i++) { > + if (result[i].state === "active") { > + networkOptions += '<option>' + result[i].name + '</option>'; > + } > + } > + $('span.network select', itemNode).empty().append(networkOptions); > + $('span.network select', itemNode).selectpicker('refresh'); > + break; > + } > + }); > + > + switch (networkData.type) { > + case 'macvtap': > + //initialize network option > + > + var networkOptions = ''; > + for (var i = 0; i < origmacvtapNetworks.length; i++) { > + if (networkName === origmacvtapNetworks[i].name) { > + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; > + } > + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; > + } > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); > + > + //initialize Mode option for Macvtap > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); > + > + $('span.mode .label-mode', nodeInterface).addClass('hide'); > + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); > + > + break; > + > + case 'ovs': > + var networkOptions = ''; > + for (var i = 0; i < origovsNetworks.length; i++) { > + if (networkName === origovsNetworks[i]) { > + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; > + } > + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; > + } > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); > + > + //initialize Mode option for ovs > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); > + $('span.mode .label-mode', nodeInterface).removeClass('hide'); > + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); > + break; > + > + case 'network': > + var networkOptions = ''; > + for (var i = 0; i < result.length; i++) { > + if (networkName === result[i].name) { > + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; > + } > + if (result[i].state === "active" && networkName !== result[i].name) { > + networkOptions += '<option>' + result[i].name + '</option>'; > + } > + } > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); > + > + //initialize Mode option for Network > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); > + $('span.mode .label-mode', nodeInterface).removeClass('hide'); > + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); > + break; > + } > + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); > + networkItemNum += 1; > + }; > + if (origInterfaces && origInterfaces.length > 0) { > + for (var i = 0; i < origInterfaces.length; i++) { > + addInterfaceItem({ > + networkID: 'networkID' + networkItemNum, > + networkV: origInterfaces[i].name, > + type: origInterfaces[i].type, > + mode: origInterfaces[i].mode > + }); > + } > + } > + if (result && result.length > 0) { > + for (var i = 0; i < origNetworks.length; i++) { > + addInterfaceItem({ > + networkID: 'networkID' + networkItemNum, > + networkV: origNetworks[i], > + type: 'network' > + }); > + } > + } > + $('#template-edit-interface-add-button-s390x').on("click", function(event) { > + event.preventDefault(); > + addInterfaceItem({ > + networkID: 'networkID' + networkItemNum, > + networkV: 'default', > + type: 'network', > + mode: 'None' > + }); > + }); > + }; > + > + var initProcessor = function(){ > + var setCPUValue = function(){ > + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ > + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); > $("#vcpus").val(computedCpu); > if ($("#cpus-check").prop("checked")) { > //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error > @@ -340,7 +509,18 @@ kimchi.template_edit_main = function() { > }); > } > > - kimchi.listNetworks(initInterface); > + if(kimchi.hostarch === s390xArch){ > + kimchi.listmacvtapNetworks(function(macvtapnet){ > + origmacvtapNetworks = macvtapnet; > + kimchi.listovsNetworks(function(ovsnet){ > + origovsNetworks = ovsnet; > + kimchi.listNetworks(initInterface_s390x); > + }); > + }); > + }else { > + kimchi.listNetworks(initInterface); > + } > + > kimchi.listStoragePools(initStorage); > initProcessor(); > checkInvalids(); > @@ -432,18 +612,68 @@ kimchi.template_edit_main = function() { > topology: {} > }; > } > - var networks = $('.template-tab-body .item', '#form-template-interface'); > + if(kimchi.hostarch === s390xArch){ > + > + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); > var networkForUpdate = new Array(); > - $.each(networks, function(index, networkEntities) { > - var thisValue = $('select', networkEntities).val(); > - networkForUpdate.push(thisValue); > + var interfacceForUpdate = new Array(); > + > + $.each(interfaces, function(index, interfaceEntities) { > + var fields = $('span.type select', interfaceEntities); > + switch(fields.val()){ > + case 'network': > + var thisValue = $('span.network select', interfaceEntities).val(); > + networkForUpdate.push(thisValue); > + break; > + > + case 'macvtap': > + var thisdata = {}; > + thisdata.type = $('span.type select', interfaceEntities).val(); > + thisdata.name = $('span.network select', interfaceEntities).val(); > + thisdata.mode = $('span.mode select', interfaceEntities).val(); > + > + interfacceForUpdate.push(thisdata); > + break; > + > + case 'ovs': > + var thisdata = {}; > + thisdata.type = $('span.type select', interfaceEntities).val(); > + thisdata.name = $('span.network select', interfaceEntities).val(); > + interfacceForUpdate.push(thisdata); > + break; > + } > + > + if (networkForUpdate instanceof Array) { > + data.networks = networkForUpdate; > + } else if (networkForUpdate != null) { > + data.networks = [networkForUpdate]; > + } else { > + data.networks = []; > + } > + > + if (networkForUpdate instanceof Array) { > + data.interfaces = interfacceForUpdate; > + } else if (interfacceForUpdate != null) { > + data.interfaces = [interfacceForUpdate]; > + } else { > + data.interfaces = []; > + } > }); > - if (networkForUpdate instanceof Array) { > - data.networks = networkForUpdate; > - } else if (networkForUpdate != null) { > - data.networks = [networkForUpdate]; > - } else { > - data.networks = []; > + > + }else { > + var networks = $('.template-tab-body .item', '#form-template-interface'); > + var networkForUpdate = new Array(); > + $.each(networks, function(index, networkEntities) { > + var thisValue = $('select', networkEntities).val(); > + networkForUpdate.push(thisValue); > + }); > + if (networkForUpdate instanceof Array) { > + data.networks = networkForUpdate; > + } else if (networkForUpdate != null) { > + data.networks = [networkForUpdate]; > + } else { > + data.networks = []; > + } > } > > if ($('.has-error', '#form-template-storage').length) { > diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl > index 6cac885..4e08243 100644 > --- a/ui/pages/template-edit.html.tmpl > +++ b/ui/pages/template-edit.html.tmpl > @@ -129,6 +129,15 @@ > </div> > <div class="template-tab-body"></div> > </form> > + <form id="form-template-interface-s390x" style="display:none"> > + <div class="template-tab-header"> > + <span class="template-interface-cell type">$_("Type")</span> > + <span class="template-interface-cell network">$_("Network/Interface")</span> > + <span class="template-interface-cell mode">$_("Mode")</span> > + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> > + </div> > + <div class="template-tab-body"></div> > + </form> > </div> > <div role="tabpanel" class="tab-pane" id="processor"> > <form id="form-template-processor"> > @@ -221,5 +230,29 @@ > </span> > </div> > </script> > +<script id="template-interface-s390x-tmpl" type="text/html"> > + <div class="item" id={networkID}> > + <span class="template-interface-cell type"> > + <select> > +  > + </select> > + </span> > + <span class="template-interface-cell network"> > + <select></select> > + </span> > + <span class="template-interface-cell mode"> > + <span class="label-mode hide">None</span> > + <select> > + <option value="bridge">bridge</option> > + <option value="vepa">vepa</option> > + </select> > + </span> > + <span class="pull-right"> > + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> > + </span> > + </div> > +</script> > </body> > </html> > -- > 2.1.0 > > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel >

1 0

[PATCH] [Kimchi] Introducing s390x UI Interfaces module for Edit Template under virtualization
by rajgupta＠linux.vnet.ibm.com 07 Sep '16

07 Sep '16

From: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> Introducing s390x UI Interfaces module for Edit Template under virtualization Signed-off-by: Rajat Gupta <rajgupta(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 58 ++++++++ ui/js/src/kimchi.main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 260 +++++++++++++++++++++++++++++++-- ui/pages/template-edit.html.tmpl | 33 +++++ 4 files changed, 341 insertions(+), 15 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2f127aa..ce0e07c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -596,6 +596,35 @@ var kimchi = { }); }, + listmacvtapNetworks : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + listovsNetworks : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/ovsbridges', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + + toggleNetwork : function(name, on, suc, err) { var action = on ? "activate" : "deactivate"; wok.requestJSON({ @@ -638,6 +667,20 @@ var kimchi = { }); }, + gets390xInterfaces : function(suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/interfaces?type=^nic|bonding|vlan$', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + wok.message.error(data.responseJSON.reason); + } + }); + }, + getInterface : function(iface, suc, err, sync) { wok.requestJSON({ url : 'plugins/kimchi/interfaces/' + encodeURIComponent(iface), @@ -1271,3 +1314,18 @@ var kimchi = { }); } }; + +/** + * Get the host information. + */ +kimchi.getHostDetails = function (suc,err) { + wok.requestJSON({ + url : 'plugins/gingerbase/host', + type : 'GET', + resend: true, + contentType : 'application/json', + dataType : 'json', + success : suc, + error: err + }); +} diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index b6de2cf..ae996f0 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -33,6 +33,11 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.hostarch = undefined; +kimchi.getHostDetails(function(result) { + kimchi.hostarch = result["architecture"]; +}); + $(function(){ $('body').removeClass('wok-list wok-gallery'); }); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a2032cc..3cb32e8 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,8 +19,13 @@ kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; var origNetworks; + var origInterfaces; + var origmacvtapNetworks; + var origovsNetworks; var templateDiskSize; var baseImageTemplate; + var s390xArch = 's390x'; + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); $('#edit-template-tabs a[data-toggle="tab"]').on('shown.bs.tab', function(e) { $('.tab-content').css('overflow', 'hidden'); @@ -47,6 +52,7 @@ kimchi.template_edit_main = function() { var initTemplate = function(template) { origDisks = template.disks; origNetworks = template.networks; + origInterfaces = template.interfaces; for (var i = 0; i < template.disks.length; i++) { if (template.disks[i].base) { template["vm-image"] = template.disks[i].base; @@ -268,10 +274,173 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if (!$('#cores').hasClass("invalid-field") && $('#cores').val() != "") { - var computedCpu = parseInt($("#cores").val()) * parseInt($("#threads").val()); + var initInterface_s390x = function(result) { + $('#form-template-interface-s390x').show(); + $('#form-template-interface').hide(); + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-s390x-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface-s390x').append(nodeInterface); + $('.delete', '#form-template-interface-s390x').on("click", function(event) { + event.preventDefault(); + $(this).parent().parent().remove(); + }); + + //initialize type option + var typeOptionsdata = {}; + var typeOptions = ''; + typeOptionsdata.macvtap = 'macvtap'; + typeOptionsdata.ovs = 'ovs'; + typeOptionsdata.network = 'network'; + + $.each(typeOptionsdata, function(key, value) { + if (value === networkData.type) { + typeOptions += '<option value="' + key + '" selected="selected">' + networkData.type + '</option>'; + } else { + typeOptions += '<option value="' + key + '">' + value + '</option>'; + } + }); + + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').append(typeOptions); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.type').on('change', function() { + var itemNode = $(this).closest('div.item'); + + switch ($(this).val()) { + case 'macvtap': + $('span.mode .label-mode', itemNode).addClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", false); + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'ovs': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; //it should be origovsNetworks[i].name rajat + } + + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + + break; + case 'network': + $('span.mode .label-mode', itemNode).removeClass('hide'); + $('span.mode .bootstrap-select', itemNode).toggleClass("hide", true); + + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (result[i].state === "active") { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('span.network select', itemNode).empty().append(networkOptions); + $('span.network select', itemNode).selectpicker('refresh'); + break; + } + }); + + switch (networkData.type) { + case 'macvtap': + //initialize network option + + var networkOptions = ''; + for (var i = 0; i < origmacvtapNetworks.length; i++) { + if (networkName === origmacvtapNetworks[i].name) { + networkOptions += '<option selected="selected">' + origmacvtapNetworks[i].name + '</option>'; + } + networkOptions += '<option>' + origmacvtapNetworks[i].name + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Macvtap + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').val(networkData.mode); + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + + $('span.mode .label-mode', nodeInterface).addClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).removeClass("hide"); + + break; + + case 'ovs': + var networkOptions = ''; + for (var i = 0; i < origovsNetworks.length; i++) { + if (networkName === origovsNetworks[i]) { + networkOptions += '<option selected="selected">' + origovsNetworks[i] + '</option>'; + } + networkOptions += '<option>' + origovsNetworks[i] + '</option>'; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for ovs + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + + case 'network': + var networkOptions = ''; + for (var i = 0; i < result.length; i++) { + if (networkName === result[i].name) { + networkOptions += '<option selected="selected">' + result[i].name + '</option>'; + } + if (result[i].state === "active" && networkName !== result[i].name) { + networkOptions += '<option>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.network').append(networkOptions); + + //initialize Mode option for Network + $('select', '#form-template-interface-s390x #networkID' + networkItemNum + ' span.mode').selectpicker('refresh'); + $('span.mode .label-mode', nodeInterface).removeClass('hide'); + $('span.mode .bootstrap-select', nodeInterface).addClass("hide"); + break; + } + $('select', '#form-template-interface-s390x #networkID' + networkItemNum).selectpicker(); + networkItemNum += 1; + }; + if (origInterfaces && origInterfaces.length > 0) { + for (var i = 0; i < origInterfaces.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origInterfaces[i].name, + type: origInterfaces[i].type, + mode: origInterfaces[i].mode + }); + } + } + if (result && result.length > 0) { + for (var i = 0; i < origNetworks.length; i++) { + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: origNetworks[i], + type: 'network' + }); + } + } + $('#template-edit-interface-add-button-s390x').on("click", function(event) { + event.preventDefault(); + addInterfaceItem({ + networkID: 'networkID' + networkItemNum, + networkV: 'default', + type: 'network', + mode: 'None' + }); + }); + }; + + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + var computedCpu = parseInt($("#cores").val())*parseInt($("#threads").val()); $("#vcpus").val(computedCpu); if ($("#cpus-check").prop("checked")) { //If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error @@ -340,7 +509,18 @@ kimchi.template_edit_main = function() { }); } - kimchi.listNetworks(initInterface); + if(kimchi.hostarch === s390xArch){ + kimchi.listmacvtapNetworks(function(macvtapnet){ + origmacvtapNetworks = macvtapnet; + kimchi.listovsNetworks(function(ovsnet){ + origovsNetworks = ovsnet; + kimchi.listNetworks(initInterface_s390x); + }); + }); + }else { + kimchi.listNetworks(initInterface); + } + kimchi.listStoragePools(initStorage); initProcessor(); checkInvalids(); @@ -432,18 +612,68 @@ kimchi.template_edit_main = function() { topology: {} }; } - var networks = $('.template-tab-body .item', '#form-template-interface'); + if(kimchi.hostarch === s390xArch){ + + var interfaces = $('.template-tab-body .item', '#form-template-interface-s390x'); var networkForUpdate = new Array(); - $.each(networks, function(index, networkEntities) { - var thisValue = $('select', networkEntities).val(); - networkForUpdate.push(thisValue); + var interfacceForUpdate = new Array(); + + $.each(interfaces, function(index, interfaceEntities) { + var fields = $('span.type select', interfaceEntities); + switch(fields.val()){ + case 'network': + var thisValue = $('span.network select', interfaceEntities).val(); + networkForUpdate.push(thisValue); + break; + + case 'macvtap': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + thisdata.mode = $('span.mode select', interfaceEntities).val(); + + interfacceForUpdate.push(thisdata); + break; + + case 'ovs': + var thisdata = {}; + thisdata.type = $('span.type select', interfaceEntities).val(); + thisdata.name = $('span.network select', interfaceEntities).val(); + interfacceForUpdate.push(thisdata); + break; + } + + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } + + if (networkForUpdate instanceof Array) { + data.interfaces = interfacceForUpdate; + } else if (interfacceForUpdate != null) { + data.interfaces = [interfacceForUpdate]; + } else { + data.interfaces = []; + } }); - if (networkForUpdate instanceof Array) { - data.networks = networkForUpdate; - } else if (networkForUpdate != null) { - data.networks = [networkForUpdate]; - } else { - data.networks = []; + + }else { + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; + } else { + data.networks = []; + } } if ($('.has-error', '#form-template-storage').length) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 6cac885..4e08243 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -129,6 +129,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-interface-s390x" style="display:none"> + <div class="template-tab-header"> + <span class="template-interface-cell type">$_("Type")</span> + <span class="template-interface-cell network">$_("Network/Interface")</span> + <span class="template-interface-cell mode">$_("Mode")</span> + <button type="button" id="template-edit-interface-add-button-s390x" class="pull-right btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add Interface")</button> + </div> + <div class="template-tab-body"></div> + </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> <form id="form-template-processor"> @@ -221,5 +230,29 @@ </span> </div> </script> +<script id="template-interface-s390x-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell type"> + <select> +  + </select> + </span> + <span class="template-interface-cell network"> + <select></select> + </span> + <span class="template-interface-cell mode"> + <span class="label-mode hide">None</span> + <select> + <option value="bridge">bridge</option> + <option value="vepa">vepa</option> + </select> + </span> + <span class="pull-right"> + <button class="delete btn-primary btn"><i class="fa fa-minus-circle"></i> $_("Delete")</button> + </span> + </div> +</script> </body> </html> -- 2.1.0

1 0

[PATCH V4] [Kimchi] Issue #992 : Create template on s390x without libvirt storage.
by archus＠linux.vnet.ibm.com 06 Sep '16

06 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments V3: Review comments and refactoring V4: Rebase patch to latest upstream. Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 13 ++++-- model/storagevolumes.py | 1 - model/templates.py | 27 +++++++++--- model/vms.py | 9 +++- osinfo.py | 35 +++++++++++++-- utils.py | 34 +++++++++++++++ vmtemplate.py | 111 +++++++++++++++++++++++++++++++----------------- 9 files changed, 179 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 1c20466..cff623e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -438,6 +438,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path *(optional and only valid for s390x architecture)*: Storage path to store virtual disks without libvirt. * networks *(optional)*: list of networks will be assigned to the new VM. * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. * type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. @@ -504,6 +505,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path *(optional and only valid for s390x architecture)*: Either pool or path to store the virtual disks should be specified. * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index 47c829e..b6533d4 100644 --- a/i18n.py +++ b/i18n.py @@ -203,6 +203,9 @@ messages = { "KCHTMPL0037E": _("Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'."), "KCHTMPL0038E": _("Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)."), "KCHTMPL0039E": _("Interfaces parameter only supported on s390x or s390 architecture."), + "KCHTMPL0040E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0041E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0042E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..5942b31 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,9 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if is_s390x(): + return + default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +441,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index a6ce97b..2d68027 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -43,7 +43,6 @@ from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 04e6626..a5d17af 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -417,15 +419,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index b889166..6a9b1d1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1405,6 +1405,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 3e56d97..8ec9480 100644 --- a/osinfo.py +++ b/osinfo.py @@ -159,6 +159,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -166,7 +172,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -187,11 +198,27 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..7129bfe 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0041E", {'err': err}) + + return diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..20edbfb 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,55 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + # This check is required where 'path' disk + # exists and is replaced by 'pool' disk during + # template update + if 'path' in disk_info: + del disk_info['path'] + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != sorted(basic_path_disk))): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0042E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0040E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +239,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +249,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +264,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -467,8 +498,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -519,10 +551,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 2.7.4

3 2

[RFC] integrety: storage pool deactivate/undefine needs to consider vm usage #355
by Ramon Medeiros 06 Sep '16

06 Sep '16

Propose: do not deactive or undefine storage pool with vms being used. Avoid undefine storage pool was already discussed. Talking about deactive, we've got some questions: 1) Since the storage volume is available, the vm can run with storage poll on or off. So, we are going only to avoid deactive pools that can make storage volume unavailable, like nfs? 2) Or we are going to extend this rule to all storage pools? -- 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 v2][Kimchi 0/2] Do not delete storage pool with storage volumes assigned to guests
by Ramon Medeiros 06 Sep '16

06 Sep '16

Changes: v2: Use path to determine if volume comes from storage pool Do not use "get_disk_used_by". It will be usefull if we start querying by volumes. Since, we cannot list volumes with inactivate storage pools. Ramon Medeiros (2): Do not remove storagepools linked to guests Update tests i18n.py | 1 + model/storagepools.py | 22 ++++++++++++++++++++++ tests/test_rest.py | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) -- 2.5.5

3 6

[RFC] Should not be allowed to remove "default" storagepool and network
by Ramon Medeiros 06 Sep '16

06 Sep '16

Propose: avoid to delete default network and storage pool: files affected: Create a error message at i18n.py Check at delete() method on model to verify Doubt: Where is defined the default pool and network? I did not see it in kimchi.conf Should i create a entry to deal it? -- 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 v3][Kimchi 0/2] Do not delete storage pool with storage volumes assigned to guests
by Ramon Medeiros 06 Sep '16

06 Sep '16

Changes: v3: Just rebase v2: Use path to determine if volume comes from storage pool Do not use "get_disk_used_by". It will be usefull if we start querying by volumes. Since, we cannot list volumes with inactivate storage pools. Ramon Medeiros (2): Issue #836: Allow user change guest graphics type Create test to verify graphics type change API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 2 +- model/vms.py | 10 ++++++++++ tests/test_model.py | 18 +++++++----------- tests/test_rest.py | 10 ++++++++++ 6 files changed, 35 insertions(+), 12 deletions(-) -- 2.5.5

1 3

[PATCH] [Kimchi] Storagebuttons not behaving properly
by Socorro Stoppler 06 Sep '16

06 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch fixes the behavior of the actions - Deactivate and Undefine - taken on the storage pools listed in the Storage tab. Prior to the patch, even if the menu item was disabled, the user is still able to click on it and perform the action. Now clicking on those disabled menu items does not do anything which is the intended behavior. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..ea58012 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,6 +310,14 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var in_use = $pool.data('inuse'); + if ('active' === $pool.data('stat') || in_use) { + $pool.parent().addClass('disabled'); + return false; + } else { + $pool.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6001M'], @@ -339,6 +347,15 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var $poolDeactivate = $(this); + var in_use = $poolDeactivate.data('inuse'); + if (in_use) { + $poolDeactivate.parent().addClass('disabled'); + return false; + } else { + $poolDeactivate.parent().removeClass('disabled'); + } + var settings = { title : i18n['KCHAPI6001M'], content : i18n['KCHPOOL6012M'], -- 2.7.4

2 2

[PATCH] [Kimchi] Storagebuttons not behaving properly
by Socorro Stoppler 06 Sep '16

06 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch fixes the behavior of the actions - Deactivate and Undefine - taken on the storage pools listed in the Storage tab. Prior to the patch, even if the menu item was disabled, the user is still able to click on it and perform the action. Now clicking on those disabled menu items does not do anything which is the intended behavior. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 18e6eea..0d7a6d7 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -312,6 +312,13 @@ kimchi.storageBindClick = function() { var $pool = $(this); var poolName = $pool.data('name'); var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', '<strong>'+poolName+'</strong>'); + var in_use = $pool.data('inuse'); + if ('active' === $pool.data('stat') || in_use) { + $pool.parent().addClass('disabled'); + return false; + } else { + $pool.parent().removeClass('disabled'); + } var settings = { title : i18n['KCHAPI6001M'], content : confirmMessage, @@ -341,6 +348,14 @@ kimchi.storageBindClick = function() { event.preventDefault(); var poolName = $(this).data('name'); var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', '<strong>'+poolName+'</strong>'); + var $poolDeactivate = $(this); + var in_use = $poolDeactivate.data('inuse'); + if (in_use) { + $poolDeactivate.parent().addClass('disabled'); + return false; + } else { + $poolDeactivate.parent().removeClass('disabled'); + } var settings = { title : i18n['KCHAPI6001M'], content : confirmMessage, -- 2.7.4

2 1

Entering code freeze for Wok and Kimchi 2.3
by Aline Manera 06 Sep '16

06 Sep '16

Hi all, We are now entering on code freeze for Wok and Kimchi 2.3, which means only bug fixes will be accepted on master branch from now on. If needed, the next branch will be created to accept the features delivered during the code freeze phase. Any help to test Kimchi and fix bugs from now on up to the release announcement is more than welcome. Please, find out the test matrix to cover all the features: https://github.com/kimchi-project/wok/wiki/Testing-2.3 https://github.com/kimchi-project/kimchi/wiki/Testing-2.3 And also the issues targeted for this release: https://github.com/kimchi-project/wok/issues?q=is%3Aopen+is%3Aissue+milesto… https://github.com/kimchi-project/kimchi/issues?q=is%3Aopen+is%3Aissue+mile… Thanks for all the support, Aline Manera

1 0

[PATCH V1] [Kimchi] Issue #992 : Create template on s390x without libvirt storage.
by archus＠linux.vnet.ibm.com 06 Sep '16

06 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments V3: Review comments and refactoring V4: Rebase patch to latest upstream. Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 13 ++++-- model/storagevolumes.py | 1 - model/templates.py | 27 +++++++++--- model/vms.py | 9 +++- osinfo.py | 35 +++++++++++++-- utils.py | 34 +++++++++++++++ vmtemplate.py | 111 +++++++++++++++++++++++++++++++----------------- 9 files changed, 179 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 1c20466..cff623e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -438,6 +438,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path *(optional and only valid for s390x architecture)*: Storage path to store virtual disks without libvirt. * networks *(optional)*: list of networks will be assigned to the new VM. * interfaces *(optional)*: list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. * type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. @@ -504,6 +505,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path *(optional and only valid for s390x architecture)*: Either pool or path to store the virtual disks should be specified. * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index 47c829e..b6533d4 100644 --- a/i18n.py +++ b/i18n.py @@ -203,6 +203,9 @@ messages = { "KCHTMPL0037E": _("Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'."), "KCHTMPL0038E": _("Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)."), "KCHTMPL0039E": _("Interfaces parameter only supported on s390x or s390 architecture."), + "KCHTMPL0040E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0041E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0042E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..5942b31 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,9 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if is_s390x(): + return + default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +441,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index a6ce97b..2d68027 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -43,7 +43,6 @@ from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 04e6626..a5d17af 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -417,15 +419,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index b889166..6a9b1d1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1405,6 +1405,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 3e56d97..8ec9480 100644 --- a/osinfo.py +++ b/osinfo.py @@ -159,6 +159,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -166,7 +172,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -187,11 +198,27 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..7129bfe 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0041E", {'err': err}) + + return diff --git a/vmtemplate.py b/vmtemplate.py index 07cebb9..20edbfb 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,55 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + # This check is required where 'path' disk + # exists and is replaced by 'pool' disk during + # template update + if 'path' in disk_info: + del disk_info['path'] + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != sorted(basic_path_disk))): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0042E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0040E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +239,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +249,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +264,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -467,8 +498,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -519,10 +551,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 2.7.4

2 1

Sept 07th scrum meeting CANCELED
by Aline Manera 06 Sep '16

06 Sep '16

Hi all, Sept 07th is holiday in Brazil (Independence Day) so there will be no scrum meeting this week. Regards, Aline Manera

1 0

[PATCH v5] [Kimchi] Feature request (#860): Support Guest Autostart
by bianca＠linux.vnet.ibm.com 06 Sep '16

06 Sep '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Include 'autostart' option in API.json and vms.py (lookup and update) using libvirt dom.setAutostart to set as true or false. Also edit test_model.py to include those changes and updated API.md file. Also included API tests to test_rest.py in test_edit_vm function. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- API.json | 4 ++++ docs/API.md | 3 +++ model/vms.py | 11 ++++++++--- tests/test_mockmodel.py | 2 +- tests/test_model.py | 8 +++++++- tests/test_rest.py | 18 ++++++++++++++++++ 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/API.json b/API.json index adaa2f7..e72c68d 100644 --- a/API.json +++ b/API.json @@ -369,6 +369,10 @@ "error": "KCHVM0053E", "type": "boolean" }, + "autostart": { + "description": "Enable/Disable guest autostart", + "type": "boolean" + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/docs/API.md b/docs/API.md index 15f0007..43bb04b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -151,6 +151,8 @@ server. * bootorder: list of devices in boot order * description: VM description * title: VM title + * autostart: show if autostart is enabled. + * **DELETE**: Remove the Virtual Machine * **PUT**: update the parameters of existing VM * name: New name for this VM (only applied for shutoff VM) @@ -183,6 +185,7 @@ server. * bootmenu: prompts guest bootmenu. Bool type. * description: VM description * title: VM title + * autostart: enable/disable guest autostart (true or false params). * **POST**: *See Virtual Machine Actions* diff --git a/model/vms.py b/model/vms.py index f13e605..a8e1c14 100644 --- a/model/vms.py +++ b/model/vms.py @@ -80,12 +80,13 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users', + 'autostart'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', 'name', 'users', 'bootorder', 'bootmenu', - 'description', 'title'] + 'description', 'title', 'autostart'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -270,6 +271,9 @@ class VMModel(object): with lock: dom = self.get_vm(name, self.conn) + if "autostart" in params: + dom.setAutostart(1 if params['autostart'] == True else 0) + # You can only change <maxMemory> offline, updating guest XML if ("memory" in params) and ('maxmemory' in params['memory']) and\ (DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): @@ -1314,7 +1318,8 @@ class VMModel(object): 'access': 'full', 'persistent': True if dom.isPersistent() else False, 'bootorder': boot, - 'bootmenu': bootmenu + 'bootmenu': bootmenu, + 'autostart': dom.autostart() } def _vm_get_disk_paths(self, dom): diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 147942c..ffd383c 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -164,7 +164,7 @@ class MockModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpu_info', 'screenshot', 'icon', 'graphics', 'users', 'groups', 'access', 'persistent', 'bootorder', 'bootmenu', 'title', - 'description')) + 'description', 'autostart')) stats_keys = set(('cpu_utilization', 'mem_utilization', 'net_throughput', 'net_throughput_peak', diff --git a/tests/test_model.py b/tests/test_model.py index d9ffd5e..2ed5e65 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -129,7 +129,7 @@ class ModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpu_info', 'screenshot', 'icon', 'graphics', 'users', 'groups', 'access', 'persistent', 'bootorder', 'bootmenu', 'title', - 'description')) + 'description', 'autostart')) stats_keys = set(('cpu_utilization', 'mem_utilization', 'net_throughput', 'net_throughput_peak', @@ -1362,6 +1362,12 @@ class ModelTests(unittest.TestCase): inst.vm_update(u'пeω-∨м', {"bootmenu": False}) self.assertEquals("no", inst.vm_lookup(u'пeω-∨м')['bootmenu']) + # enable/disable autostart + inst.vm_update(u'пeω-∨м', {"autostart": True}) + self.assertEquals(1, inst.vm_lookup(u'пeω-∨м')['autostart']) + inst.vm_update(u'пeω-∨м', {"autostart": False}) + self.assertEquals(0, inst.vm_lookup(u'пeω-∨м')['autostart']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index b1b9f12..4c1ed14 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -301,6 +301,24 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/∨м-црdαtеd', req, 'PUT') self.assertEquals(400, resp.status) + # set vm autostart tests (powered off) + resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": True}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + + # set vm autostart tests (running) + resp = self.request('/plugins/kimchi/vms/vm-1/poweroff', '{}', 'POST') + self.assertEquals(200, resp.status) + req = json.dumps({"autostart": False}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1', '{}', 'GET').read() + self.assertEquals(resp["autostart"], True) + def test_vm_lifecycle(self): # Create a Template req = json.dumps({'name': 'test', -- 2.7.4

5 5

[PATCH V3] Issue #992 : Create template on s390x without libvirt storage
by harshalp＠linux.vnet.ibm.com 06 Sep '16

06 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments V3: Review comments and refactoring Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 13 ++++-- model/storagevolumes.py | 1 - model/templates.py | 27 +++++++++--- model/vms.py | 9 +++- osinfo.py | 35 +++++++++++++-- utils.py | 34 +++++++++++++++ vmtemplate.py | 111 +++++++++++++++++++++++++++++++----------------- 9 files changed, 179 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 7bd677f..d8d191a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -427,6 +427,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path : Storage path to store virtual disks without libvirt * networks *(optional)*: list of networks will be assigned to the new VM. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): @@ -481,6 +482,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path (optional): Either pool or path to store the virtual disks should be specified * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index ea2c4ab..7e60079 100644 --- a/i18n.py +++ b/i18n.py @@ -190,6 +190,9 @@ messages = { "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), + "KCHTMPL0034E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0035E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0036E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..5942b31 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,9 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if is_s390x(): + return + default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +441,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 4708674..d721d3b 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -44,7 +44,6 @@ from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 8df8c3b..c749f4b 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -400,15 +402,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index 7f607f5..3ad722e 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1395,6 +1395,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 528cf14..b177830 100644 --- a/osinfo.py +++ b/osinfo.py @@ -158,6 +158,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -165,7 +171,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -186,11 +197,27 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..0fca191 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0035E", {'err': err}) + + return \ No newline at end of file diff --git a/vmtemplate.py b/vmtemplate.py index babf050..2d3a351 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,55 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + # This check is required where 'path' disk + # exists and is replaced by 'pool' disk during + # template update + if 'path' in disk_info: + del disk_info['path'] + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != sorted(basic_path_disk))): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0036E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0034E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +239,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +249,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +264,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -447,8 +478,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -499,10 +531,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 1.9.1

3 2

[PATCH] [Wok] Removing Kimchi Peers dropdown from Wok navbar
by sguimaraes943＠gmail.com 06 Sep '16

06 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch removes Peers dropdown from Wok navbar Samuel Guimarães (1): Removing Kimchi Peers dropdown from Wok navbar ui/js/src/wok.main.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) -- 2.5.5

2 3

[PATCH V4] [Wok 0/5] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 06 Sep '16

06 Sep '16

V4: review comments (use app uri in log entry and document req='TASK' usage) V3: review comments V2: rebase with master to fix conflict Lucio Correia (5): Create log_request() method for code simplification Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Change location of User Requests Log src/wok/asynctask.py | 49 +++++++++-- src/wok/control/base.py | 63 +++++++-------- src/wok/control/utils.py | 1 - src/wok/i18n.py | 2 + src/wok/reqlogger.py | 205 ++++++++++++++++++++++++++++++++--------------- src/wok/root.py | 40 +-------- src/wok/utils.py | 12 --- 7 files changed, 218 insertions(+), 154 deletions(-) -- 1.9.1

2 6

[RFC] Addition attribute required to specify console type for VM(s)/ template(s) for s390x specific architecture only.
by Archana Singh 06 Sep '16

06 Sep '16

Hi All, Currently on x86 or ppc, console type does not need to be passed from API and hence we do not have API to specify type of console in VM(s)/ template(s). On s390x architecture, two type of console sclp or virtio are supported. And hence we need to update VM(s)/template(s) API to have attribute to get and modify type of console. console (s390x only): Specify the console parameter. type: sclp/virtio. If not provided, default sclp. Below are the list of current API and proposed API which need to have addition parameter 'console' and its type: 1) GET list of VMs and its attribute and Create VM. *Current:* Collection: Virtual Machines URI: /plugins/kimchi/vms Methods: GET: Retrieve a summarized list of all defined Virtual Machines POST: Create a new Virtual Machine name (optional): The name of the VM. Used to identify the VM in this API. If omitted, a name will be chosen based on the template used. persistent: If 'true', vm will persist after a Power Off or host reboot. All virtual machines created by Kimchi are persistent. template: The URI of a Template to use when building the VM storagepool (optional): Assign a specific Storage Pool to the new VM graphics (optional): Specify the graphics parameter for this vm type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. description: VM description title: VM title *Proposed:* Collection: Virtual Machines URI: /plugins/kimchi/vms Methods: GET: Retrieve a summarized list of all defined Virtual Machines POST: Create a new Virtual Machine name (optional): The name of the VM. Used to identify the VM in this API. If omitted, a name will be chosen based on the template used. persistent: If 'true', vm will persist after a Power Off or host reboot. All virtual machines created by Kimchi are persistent. template: The URI of a Template to use when building the VM storagepool (optional): Assign a specific Storage Pool to the new VM graphics (optional): Specify the graphics paramenter for this vm type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. * console (s390x only): Specify the console parameter for this vm.** ** type: sclp/virtio.** ** If not provided, default sclp.* description: VM description title: VM title 2) GET details of a VM. *Current:* Resource: Virtual Machine URI: /plugins/kimchi/vms/:name Methods: GET: Retrieve the full description of a Virtual Machine name: The name of the VM. Used to identify the VM in this API state: Indicates the current state in the VM lifecycle running: The VM is powered on paused: The VMs virtual CPUs are paused shutoff: The VM is powered off stats: Virtual machine statistics: cpu_utilization: A number between 0 and 100 which indicates the percentage of CPU utilization. mem_utilization: A number between 0 and 100 which indicates the percentage of memory utilization. net_throughput: Expresses total network throughput for reads and writes across all virtual interfaces (kb/s). net_throughput_peak: The highest recent value of 'net_throughput'. io_throughput: Expresses the total IO throughput for reads and writes across all virtual disks (kb/s). io_throughput_peak: The highest recent value of 'io_throughput'. uuid: UUID of the VM. memory: The memory parameters of the VM in the unit of MiB. current: The amount of memory that is assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cpu_info: CPU-specific information. vcpus: The number of CPUs assigned to the VM maxvcpus: The maximum number of CPUs that can be assigned to the VM topology: Processor topology, includes: sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. screenshot: A link to a recent capture of the screen in PNG format icon: A link to an icon that represents the VM graphics: A dict to show detail of VM graphics. type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. port: The real port number of the graphics, vnc or spice. Users can use this port to connect to the vm with general vnc/spice clients. passwd: console password passwdValidTo: lifetime for the console password. users: A list of system users who have permission to access the VM. Default is: empty (i.e. only root-users may access). groups: A list of system groups whose users have permission to access the VM. Default is: empty (i.e. no groups given access). bootorder: list of devices in boot order description: VM description title: VM title *Proposed:* Resource: Virtual Machine URI: /plugins/kimchi/vms/:name Methods: GET: Retrieve the full description of a Virtual Machine name: The name of the VM. Used to identify the VM in this API state: Indicates the current state in the VM lifecycle running: The VM is powered on paused: The VMs virtual CPUs are paused shutoff: The VM is powered off stats: Virtual machine statistics: cpu_utilization: A number between 0 and 100 which indicates the percentage of CPU utilization. mem_utilization: A number between 0 and 100 which indicates the percentage of memory utilization. net_throughput: Expresses total network throughput for reads and writes across all virtual interfaces (kb/s). net_throughput_peak: The highest recent value of 'net_throughput'. io_throughput: Expresses the total IO throughput for reads and writes across all virtual disks (kb/s). io_throughput_peak: The highest recent value of 'io_throughput'. uuid: UUID of the VM. memory: The memory parameters of the VM in the unit of MiB. current: The amount of memory that is assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cpu_info: CPU-specific information. vcpus: The number of CPUs assigned to the VM maxvcpus: The maximum number of CPUs that can be assigned to the VM topology: Processor topology, includes: sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. screenshot: A link to a recent capture of the screen in PNG format icon: A link to an icon that represents the VM graphics: A dict to show detail of VM graphics. type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. port: The real port number of the graphics, vnc or spice. Users can use this port to connect to the vm with general vnc/spice clients. passwd: console password passwdValidTo: lifetime for the console password. * console (s390x only, optional): Specify the console parameter for this vm.** ** type: sclp/virtio.** ** If not provided, default sclp.* users: A list of system users who have permission to access the VM. Default is: empty (i.e. only root-users may access). groups: A list of system groups whose users have permission to access the VM. Default is: empty (i.e. no groups given access). bootorder: list of devices in boot order description: VM description title: VM title 3) Update a VM details *Current:* Resource: Virtual Machine URI: /plugins/kimchi/vms/:name Method: PUT: update the parameters of existing VM name: New name for this VM (only applied for shutoff VM) users: New list of system users. groups: New list of system groups. memory: New memory parameters of the VM in the unit of MiB. Provide one or both. current: New amount of memory that will be assigned to the VM. maxmemory: New maximum total of memory that the VM can have. graphics: A dict to show detail of VM graphics. passwd (optional): console password. When omitted a random password willbe generated. passwdValidTo (optional): lifetime for the console password. When omitted the password will be valid just for 30 seconds. type (optional): graphics type. VNC or Spice. cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. bootorder: guest bootorder, types accepted: hd, cdrom, network or fd bootmenu: prompts guest bootmenu. Bool type. description: VM description title: VM title *Proposed:* Resource: Virtual Machine URI: /plugins/kimchi/vms/:name Method: PUT: update the parameters of existing VM name: New name for this VM (only applied for shutoff VM) users: New list of system users. groups: New list of system groups. memory: New memory parameters of the VM in the unit of MiB. Provide one or both. current: New amount of memory that will be assigned to the VM. maxmemory: New maximum total of memory that the VM can have. graphics: A dict to show detail of VM graphics. passwd (optional): console password. When omitted a random password willbe generated. passwdValidTo (optional): lifetime for the console password. When omitted the password will be valid just for 30 seconds. type (optional): graphics type. VNC or Spice. * console (s390x only, optional): Specify the console parameter for this vm.** ** type: sclp/virtio.** ** If not provided, default sclp.* cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. bootorder: guest bootorder, types accepted: hd, cdrom, network or fd bootmenu: prompts guest bootmenu. Bool type. description: VM description title: VM title 4) Get templates and create a template. * **Current:* Collection: Templates URI: /plugins/kimchi/templates Methods: GET: Retrieve a summarized list of all defined Templates POST: Create a new Template name: The name of the Template. Used to identify the Template in this API source_media: dictionary. The type of media to be used in the installation. type: the type of the media. Values: 'netboot' and 'disk'. path: applicable for type = 'disk' only. Indicates the path of the source media. os_distro (optional): The operating system distribution os_version (optional): The version of the operating system distribution memory (optional): The memory parameters of the template, specify one or both. Default values are 1024MiB: current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug networks (optional): list of networks will be assigned to the new VM. Default is '[default]' disks (optional): An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc pool: Storage pool information name: URI of the storagepool where disk will be created graphics (optional): The graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. *Proposed:* Collection: Templates URI: /plugins/kimchi/templates Methods: GET: Retrieve a summarized list of all defined Templates POST: Create a new Template name: The name of the Template. Used to identify the Template in this API source_media: dictionary. The type of media to be used in the installation. type: the type of the media. Values: 'netboot' and 'disk'. path: applicable for type = 'disk' only. Indicates the path of the source media. os_distro (optional): The operating system distribution os_version (optional): The version of the operating system distribution memory (optional): The memory parameters of the template, specify one or both. Default values are 1024MiB: current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug networks (optional): list of networks will be assigned to the new VM. Default is '[default]' disks (optional): An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc pool: Storage pool information name: URI of the storagepool where disk will be created graphics (optional): The graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. * console (s390x only, optional): Specify the console parameter for this template.** ** type:sclp/virtio.** ** If not provided, default sclp.* cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. 5) Get a template details. *Current:-* Resource: Template URI: /plugins/kimchi/templates/:name Methods: GET: Retrieve the full description of a Template name: A name for this template folder: A virtual path which can be used to organize Templates in a user interface. The format is an array of path components. icon: A URI to a PNG image representing this template os_distro: The operating system distribution os_version: The version of the operating system distribution memory: The memory parameters of the template, that will be assigned to the VM in the unit of MiB. current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cdrom: A volume name or URI to an ISO image storagepool: URI of the storagepool where template allocates vm storage. networks (optional): list of networks will be assigned to the new VM. interfaces (optional): list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. name: The host network interface. It should be the host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type 'ovs'. mode (optional): Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. disks: An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB volume: A volume name that contains the initial disk contents format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. pool: Information about the pool where disk or volume will be created name: URI of the storagepool type: Type of the storagepool (dir, nfs, scsci, iscsi, etc) graphics: A dict of graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. invalid: A dict indicates which paramenters of this template are invalid. networks (optional): An array of invalid network names. cdrom (optional): An array of invalid cdrom names. disks (optional): An array of invalid volume names. storagepools (optional): An array of invalid storagepool names. cpu_info: CPU-specific information. vcpus: The number of CPUs assigned to the VM maxvcpus: The maximum number of CPUs that can be assigned to the VM topology: Processor topology, includes: sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. *Proposed:-* Resource: Template URI: /plugins/kimchi/templates/:name Methods: GET: Retrieve the full description of a Template name: A name for this template folder: A virtual path which can be used to organize Templates in a user interface. The format is an array of path components. icon: A URI to a PNG image representing this template os_distro: The operating system distribution os_version: The version of the operating system distribution memory: The memory parameters of the template, that will be assigned to the VM in the unit of MiB. current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cdrom: A volume name or URI to an ISO image storagepool: URI of the storagepool where template allocates vm storage. networks (optional): list of networks will be assigned to the new VM. interfaces (optional): list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. name: The host network interface. It should be the host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type 'ovs'. mode (optional): Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. disks: An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB volume: A volume name that contains the initial disk contents format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. pool: Information about the pool where disk or volume will be created name: URI of the storagepool type: Type of the storagepool (dir, nfs, scsci, iscsi, etc) graphics: A dict of graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. * console (s390x only, optional): Specify the console parameter for this template.** ** type:sclp/virtio.** ** If not provided, default sclp.* invalid: A dict indicates which paramenters of this template are invalid. networks (optional): An array of invalid network names. cdrom (optional): An array of invalid cdrom names. disks (optional): An array of invalid volume names. storagepools (optional): An array of invalid storagepool names. cpu_info: CPU-specific information. vcpus: The number of CPUs assigned to the VM maxvcpus: The maximum number of CPUs that can be assigned to the VM topology: Processor topology, includes: sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. 6) Update existing template. *Current:* Resource: Template URI: /plugins/kimchi/templates/:name Method: PUT: update the parameters of existed template name: A name for this template folder: A virtual path which can be used to organize Templates in the user interface. The format is an array of path components. icon: A URI to a PNG image representing this template os_distro: The operating system distribution os_version: The version of the operating system distribution memory: The memory parameters of the template, specify one or both of: current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cdrom: A volume name or URI to an ISO image networks (optional): list of networks will be assigned to the new VM. interfaces (optional): list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. name: The host network interface. It should be the host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type 'ovs'. mode (optional): Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. disks: An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB volume: A volume name that contains the initial disk contents format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. pool: Storage pool information name: URI of the storagepool where template allocates vm disk. graphics (optional): A dict of graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. *Proposed:-* Resource: Template URI: /plugins/kimchi/templates/:name Method: PUT: update the parameters of existed template name: A name for this template folder: A virtual path which can be used to organize Templates in the user interface. The format is an array of path components. icon: A URI to a PNG image representing this template os_distro: The operating system distribution os_version: The version of the operating system distribution memory: The memory parameters of the template, specify one or both of: current: The amount of memory that will be assigned to the VM. maxmemory: The maximum total of memory that the VM can have. Amount over current will be used exclusively for memory hotplug cdrom: A volume name or URI to an ISO image networks (optional): list of networks will be assigned to the new VM. interfaces (optional): list of host network interfaces will be assigned to the new VM. Only applicable for s390x or s390 architecture. type: Type of host network interface. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap; or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM. name: The host network interface. It should be the host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or host openvswitch bridge interface for type 'ovs'. mode (optional): Only applicable for interface type macvtap, to indicates whether packets will be delivered directly to target device(bridge) or to the external bridge(vepa-capable bridge). bridge: If packets have a destination on the host from which they originated, they are delivered directly to the target. For direct delivery, both origin and destination devices need to be in bridge mode. If either the origin or destination is in vepa mode, VEPA-capable bridge is required. vepa: All packets are sent to the external bridge. If packets have a destination on the host from which they originated, the VEPA-capable bridge will return the packets to the host. disks: An array of requested disks with the following optional fields (either size or volume must be specified): index: The device index size: The device size in GB volume: A volume name that contains the initial disk contents format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. pool: Storage pool information name: URI of the storagepool where template allocates vm disk. graphics (optional): A dict of graphics paramenters of this template type: The type of graphics. It can be VNC or spice or None. vnc: Graphical display using the Virtual Network Computing protocol spice: Graphical display using the Simple Protocol for Independent Computing Environments null: Graphics is disabled or type not supported listen: The network which the vnc/spice server listens on. * console (s390x only, optional): Specify the console parameter for this template.** ** type:sclp/virtio.** ** If not provided, default sclp.* cpu_info (optional): CPU-specific information. maxvcpus (optional): The maximum number of vCPUs that can be assigned to the VM. If topology is specified, maxvcpus must be a product of sockets, cores and threads. vcpus (optional): The number of vCPUs assigned to the VM. Default is 1, unless a CPU topology is specified. In that case, vcpus must be a multiple of a product of cores and threads, and will default to maxvcpus value. topology (optional): Specify sockets, threads, and cores to run the virtual CPU threads on. All three are required. sockets - The maximum number of sockets to use. cores - The number of cores per socket. threads - The number of threads per core. Thanks, Archana Singh

1 0

[PATCHv4] [Kimchi] Issue# 973 Emphasize resource name in dlg
by Socorro Stoppler 05 Sep '16

05 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> v4: Add style for <strong> to only ones in confirmation dialog. Thanks Samuel for the consultation :) v3: In some distros, the resource name is not being displayed in bold due to a problem with Open Sans. Per Samuel, there are some cases, mainly with Firefox in that some style with font weight set to 600 does not work and 700 is usually too bold to set as a fallback. Therefore, just use the same style as <abbr> and <acronynm> tags which creates a dotted bottom v2: Display resource name (with name in bold) in confirmation dialog v1: When confirmation dialogs are shown, also display the name of the resource being acted on (i.e. guest name, network, storage, template) as part of the message. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 4 ++++ ui/css/src/modules/_guests.scss | 4 ++++ ui/js/src/kimchi.guest_main.js | 14 +++++++++----- ui/js/src/kimchi.network.js | 6 ++++-- ui/js/src/kimchi.storage_main.js | 8 +++++--- ui/js/src/kimchi.template_main.js | 5 +++-- ui/pages/i18n.json.tmpl | 20 ++++++++++---------- 7 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index dff8013..6cf2cc9 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -294,6 +294,10 @@ font-size: 32px; } +#wok-confirm-modal .modal-body strong { + border-bottom: 1px dotted; +} + #guest-add-window .modal-body { margin: 0; padding: 0; diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 040b351..8b8345c 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -46,6 +46,10 @@ } } +#wok-confirm-modal .modal-body strong { + border-bottom: 1px dotted; +} + #guest-add-window { .modal-body { margin: 0; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 9c1aa54..34217e4 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -127,8 +127,9 @@ kimchi.vmpoweroff = function(event) { var vm_id = vm.attr("id"); var vmObject = vm.data(); var vm_persistent = vmObject.persistent == true; - var content_msg = vm_persistent ? i18n['KCHVM6003M'] : - i18n['KCHVM6009M']; + var content_msg_1 = i18n['KCHVM6003M'].replace('%1', '<strong>'+vm_id+'</strong>'); + var content_msg_2 = i18n['KCHVM6009M'].replace('%1', '<strong>'+vm_id+'</strong>'); + var content_msg = vm_persistent ? content_msg_1 : content_msg_2; var settings = { title: i18n['KCHVM6002M'], content: content_msg, @@ -153,9 +154,10 @@ kimchi.vmshutdown = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = vm.attr("id"); + var confirmMessage = i18n['KCHVM6007M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6006M'], - content: i18n['KCHVM6007M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -174,9 +176,10 @@ kimchi.vmreset = function(event) { $(button).addClass('loading'); var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6005M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6004M'], - content: i18n['KCHVM6005M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -204,9 +207,10 @@ kimchi.vmdelete = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6001M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6008M'], - content: i18n['KCHVM6001M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ac6bf74..7ce5b28 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -161,9 +161,10 @@ kimchi.addNetworkActions = function(network) { return false; } if (!network.persistent) { + var confirmMessage = i18n['KCHNET6004M'].replace('%1', '<strong>'+network.name+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHNET6004M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; @@ -180,9 +181,10 @@ kimchi.addNetworkActions = function(network) { if (network.state === "up" || network.in_use) { return false; } + var confirmMessage = i18n['KCHNET6002M'].replace('%1', '<strong>'+network.name+'</strong>'); wok.confirm({ title : i18n['KCHAPI6006M'], - content : i18n['KCHNET6002M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..18e6eea 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,14 +310,15 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var poolName = $pool.data('name'); + var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', '<strong>'+poolName+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6001M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var poolName = $pool.data('name'); kimchi.deleteStoragePool(poolName, function() { kimchi.doListStoragePools(); }, function(err) { @@ -339,9 +340,10 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', '<strong>'+poolName+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6012M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 302d906..cf98a7b 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -124,14 +124,15 @@ kimchi.templateBindClick = function() { $('.template-delete a').on('click', function(event) { event.preventDefault(); var $template = $(this); + var templateName = $template.data('template'); + var confirmMessage = i18n['KCHTMPL6003M'].replace('%1', '<strong>'+templateName+'</strong>'); var settings = { title: i18n['KCHAPI6001M'], - content: i18n['KCHTMPL6003M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var templateName = $template.data('template'); kimchi.deleteTemplate(templateName, function() { kimchi.doListTemplates(); }, function(err) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index f9e148d..7beee19 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -47,24 +47,24 @@ "KCHTMPL6001W": "$_("No ISO found")", "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", - "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6003M": "$_("This will permanently delete the %1 template. Would you like to continue?")", "KCHTMPL6004M": "$_("View Table")", "KCHTMPL6005M": "$_("View Gallery")", "KCHTMPL6006M": "$_("Not Available")", "KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", - "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", + "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")", "KCHVM6003M": "$_("This action may produce undesirable results, " - "for example unflushed disk cache in the guest. " + "for example unflushed disk cache in the %1 guest. " "Would you like to continue?")", "KCHVM6004M": "$_("Reset Confirmation")", "KCHVM6005M": "$_("There is a risk of data loss caused by reset without" - " the guest OS shutdown. Would you like to continue?")", + " the %1 guest OS shutdown. Would you like to continue?")", "KCHVM6006M": "$_("Shut Down Confirmation")", - "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", + "KCHVM6007M": "$_("Note the %1 guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", - "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6009M": "$_("The %1 virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", @@ -89,11 +89,11 @@ "KCHVMED6012M": "$_("Following devices will be affected, confirm?")", "KCHNET6001M": "$_("unavailable")", - "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")", - "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", + "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")", + "KCHNET6004M": "$_("The %1 network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", "KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")", - "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")", + "KCHPOOL6001M": "$_("This will permanently delete the %1 storage pool. Would you like to continue?")", "KCHPOOL6002M": "$_("This storage pool is empty.")", "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", @@ -108,7 +108,7 @@ "KCHPOOL6006E": "$_("No logical device selected.")", "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6011M": "$_("No available partitions found.")", - "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", "KCHPOOL6014M": "$_("In progress...")", "KCHPOOL6015M": "$_("Failed!")", -- 2.7.4

2 1

[PATCH v3][Kimchi 0/2] Allow vm update graphics type
by Ramon Medeiros 05 Sep '16

05 Sep '16

Changes: v3: Tested patch on Fedora, RHEL, Ubuntu and Opensuse - working correctly Add rest test v2: Fix typos Add tests Ramon Medeiros (2): Issue #836: Allow user change guest graphics type Create test to verify graphics type change API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 2 +- model/vms.py | 10 ++++++++++ tests/test_model.py | 18 +++++++----------- tests/test_rest.py | 10 ++++++++++ 6 files changed, 35 insertions(+), 12 deletions(-) -- 2.5.5

3 6

[PATCH][Kimchi] Issue #994: SPICE graphics does not need <channel> tag
by Ramon Medeiros 05 Sep '16

05 Sep '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- xmlutils/graphics.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/xmlutils/graphics.py b/xmlutils/graphics.py index 5465bb8..4297c4f 100644 --- a/xmlutils/graphics.py +++ b/xmlutils/graphics.py @@ -24,22 +24,10 @@ from lxml.builder import E def get_graphics_xml(params): """ <graphics type='%(type)s' autoport='yes' listen='%(listen)s'/> - - - For spice graphics: - - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - </channel> """ graphics = E.graphics(type=params['type'], autoport='yes', listen=params['listen']) graphics_xml = ET.tostring(graphics, encoding='utf-8', pretty_print=True) - if params['type'] == 'vnc': - return graphics_xml + return graphics_xml - # For spice graphics, a channel also must be configured - channel = E.channel(type='spicevmc') - channel.append(E.target(type='virtio', name='com.redhat.spice.0')) - channel_xml = ET.tostring(channel, encoding='utf-8', pretty_print=True) - return graphics_xml + channel_xml -- 2.5.5

2 2

[PATCH] [Kimchi] Issue #921: Peers button disappears
by sguimaraes943＠gmail.com 05 Sep '16

05 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Additional patches are necessary (Wok and Gingerbase). Samuel Guimarães (1): Issue #921: Peers button disappears root.py | 6 ++++ ui/js/src/kimchi.peers.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 ui/js/src/kimchi.peers.js -- 2.5.5

2 3

[PATCH V1] [Kimchi] For s390x architecture, serial type is not validated in vm xml as as not supported on s390x.
by archus＠linux.vnet.ibm.com 05 Sep '16

05 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> This changes ensure that in vm xml serial type is not validated for s390x as not supported in s390x architecture and only console type is validated in _vm_check_serial. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- model/vms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 7f607f5..d3d2cb1 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1486,7 +1486,8 @@ class VMModel(object): xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) expr = "/domain/devices/serial/@type" - if not xpath_get_text(xml, expr): + # on s390x serial is not supported + if platform.machine() != 's390x' and not xpath_get_text(xml, expr): return False expr = "/domain/devices/console/@type" -- 2.7.4

3 6

[PATCH V1] [Kimchi 0/2] Support for VM ifaces on s390x/s390 architecture.
by archus＠linux.vnet.ibm.com 05 Sep '16

05 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes to support additional parameters 'source' of type 'macvtap' or 'ovs' for VM ifaces only on s390x/s390 architecture. 2) Corresponding API.md changes. *** BLURB HERE *** Archana Singh (2): Updated code to support VM ifaces on s390x/s390 architecture. Updated API.md for addition paramters support for VM ifaces API on s390x/s390 architecture. API.json | 16 +++++++++++--- docs/API.md | 14 ++++++++++-- i18n.py | 9 +++++++- model/vmifaces.py | 60 +++++++++++++++++++++++++++++++++++++++++++++------ xmlutils/interface.py | 8 +++++++ 5 files changed, 94 insertions(+), 13 deletions(-) -- 2.7.4

3 5

[PATCH V3] [Wok 0/6] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 05 Sep '16

05 Sep '16

V3: review comments V2: rebase with master to fix conflict Lucio Correia (6): Create log_request() method for code simplification Map plugins by root URI Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Change location of User Requests Log src/wok/asynctask.py | 50 ++++++++++++-- src/wok/control/base.py | 63 ++++++++--------- src/wok/control/utils.py | 1 - src/wok/i18n.py | 2 + src/wok/reqlogger.py | 174 +++++++++++++++++++++++++++++------------------ src/wok/root.py | 40 ++--------- src/wok/utils.py | 17 ++--- 7 files changed, 193 insertions(+), 154 deletions(-) -- 1.9.1

2 7

[PATCH] [Wok] Blink dialog session timeout
by peterpnns＠gmail.com 05 Sep '16

05 Sep '16

From: Peter Pennings <peterpnns(a)gmail.com> This patch avoid the blink of the timeout dialog on login action Peter Pennings (1): Blink dialog session timeout ui/js/src/wok.session.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) -- 2.7.4

2 2

[PATCH V2] [Kimchi 0/2] Support for VM ifaces on s390x/s390 architecture.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes to support additional parameters 'source' of type 'macvtap' or 'ovs' for VM ifaces only on s390x/s390 architecture. 2) Corresponding API.md changes. Archana Singh (2): Updated code to support VM ifaces on s390x/s390 architecture. Updated API.md for addition paramters support for VM ifaces API on s390x/s390 architecture. API.json | 16 ++++++++++++--- docs/API.md | 14 +++++++++++-- i18n.py | 9 ++++++++- model/vmifaces.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 86 insertions(+), 13 deletions(-) -- 2.7.4

2 3

[PATCH V4] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 41 ++++++++++++++++++++++++++++++- control/templates.py | 8 +++++- docs/API.md | 12 +++++++++ i18n.py | 6 +++++ model/templates.py | 17 +++++++++++++ osinfo.py | 5 ++-- vmtemplate.py | 20 +++++++++++++++ xmlutils/interface.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 172 insertions(+), 4 deletions(-) -- 2.7.4

2 3

[PATCH] [Kimchi v2] /plugins/kimchi/ovsbridges API
by sureshab＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> v1 to v2 : Removed role_key in controller As Per RFC: [Kimchi-devel] [RFC] listing of ovs bridges this patch adds new API /plugins/kimchi/ovsbridges to list ovsbridges Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- control/ovsbridges.py | 28 ++++++++++++++++++++++++++++ docs/API.md | 8 ++++++++ model/ovsbridges.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 control/ovsbridges.py create mode 100644 model/ovsbridges.py diff --git a/control/ovsbridges.py b/control/ovsbridges.py new file mode 100644 index 0000000..5ffd6c2 --- /dev/null +++ b/control/ovsbridges.py @@ -0,0 +1,28 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import SimpleCollection +from wok.control.utils import UrlSubNode + + +@UrlSubNode("ovsbridges", True) +class OVSBridges(SimpleCollection): + def __init__(self, model): + super(OVSBridges, self).__init__(model) + self.admin_methods = ['GET'] diff --git a/docs/API.md b/docs/API.md index 357c2b8..c94003f 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1031,3 +1031,11 @@ List of available groups. * **GET**: Return the list of Kimchi peers in the same network (It uses openSLP for discovering) + +### Simple Collection: OVSBridges + +**URI:** /plugins/kimchi/ovsbridges + +**Methods:** + +* **GET**: Return list of OVS bridges of the host. diff --git a/model/ovsbridges.py b/model/ovsbridges.py new file mode 100644 index 0000000..212520f --- /dev/null +++ b/model/ovsbridges.py @@ -0,0 +1,31 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.plugins.gingerbase.netinfo import ovs_bridges + + +class OVSBridgesModel(object): + + def get_list(self): + """ + + Returns: list of ovs bridge names + + """ + return ovs_bridges() -- 1.8.3.1

2 1

[PATCH V2] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 35 +++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 ++++++++++ i18n.py | 6 +++++ model/templates.py | 17 ++++++++++++++ vmtemplate.py | 20 ++++++++++++++++ xmlutils/interface.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 1 deletion(-) -- 2.7.4

4 7

[PATCH V3] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 41 ++++++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 +++++++++ i18n.py | 6 +++++ model/templates.py | 17 +++++++++++++ osinfo.py | 5 ++-- vmtemplate.py | 20 +++++++++++++++ xmlutils/interface.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 166 insertions(+), 3 deletions(-) -- 2.7.4

3 6

[PATCH V2] [Wok 0/7] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 01 Sep '16

01 Sep '16

V2: rebase with master to fix conflict Lucio Correia (7): Create log_request() method for code simplification Improve plugin lookup by request Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Put failure details into parenthesis Change location of User Requests Log src/wok/asynctask.py | 46 +++++++++++++-- src/wok/config.py.in | 4 ++ src/wok/control/base.py | 75 +++++++++++++----------- src/wok/i18n.py | 2 + src/wok/message.py | 2 +- src/wok/reqlogger.py | 150 +++++++++++++++++++++++++++--------------------- src/wok/root.py | 41 ++----------- src/wok/utils.py | 14 +++-- 8 files changed, 187 insertions(+), 147 deletions(-) -- 1.9.1

2 29

[PATCHv3] [Kimchi] Emphasize resource name in dlg
by Socorro Stoppler 01 Sep '16

01 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> v3: In some distros, the resource name is not being displayed in bold due a problem with Open Sans per Samuel. There are some cases, mainly with Firefox in that some style with font weight set to 600 does not work and 700 is usually too bold to set as a fallback. Therefore, just use the same style as <abbr> and <acronynm> tags which creates a dotted bottom v2: Display resource name (with name in bold) in confirmation dialog v1: When confirmation dialogs are shown, also display the name of the resource being acted on (i.e. guest name, network, storage, template) as part of the message. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 4 ++++ ui/css/src/modules/_guests.scss | 4 ++++ ui/js/src/kimchi.guest_main.js | 14 +++++++++----- ui/js/src/kimchi.network.js | 6 ++++-- ui/js/src/kimchi.storage_main.js | 8 +++++--- ui/js/src/kimchi.template_main.js | 5 +++-- ui/pages/i18n.json.tmpl | 20 ++++++++++---------- 7 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 59d96e1..f49c955 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -294,6 +294,10 @@ font-size: 32px; } +strong { + border-bottom: 1px dotted; +} + #guest-add-window .modal-body { margin: 0; padding: 0; diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 6c24800..65d6792 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -46,6 +46,10 @@ } } +strong { + border-bottom: 1px dotted; +} + #guest-add-window { .modal-body { margin: 0; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 9c1aa54..34217e4 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -127,8 +127,9 @@ kimchi.vmpoweroff = function(event) { var vm_id = vm.attr("id"); var vmObject = vm.data(); var vm_persistent = vmObject.persistent == true; - var content_msg = vm_persistent ? i18n['KCHVM6003M'] : - i18n['KCHVM6009M']; + var content_msg_1 = i18n['KCHVM6003M'].replace('%1', '<strong>'+vm_id+'</strong>'); + var content_msg_2 = i18n['KCHVM6009M'].replace('%1', '<strong>'+vm_id+'</strong>'); + var content_msg = vm_persistent ? content_msg_1 : content_msg_2; var settings = { title: i18n['KCHVM6002M'], content: content_msg, @@ -153,9 +154,10 @@ kimchi.vmshutdown = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = vm.attr("id"); + var confirmMessage = i18n['KCHVM6007M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6006M'], - content: i18n['KCHVM6007M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -174,9 +176,10 @@ kimchi.vmreset = function(event) { $(button).addClass('loading'); var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6005M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6004M'], - content: i18n['KCHVM6005M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -204,9 +207,10 @@ kimchi.vmdelete = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6001M'].replace('%1', '<strong>'+vm_id+'</strong>'); var settings = { title: i18n['KCHVM6008M'], - content: i18n['KCHVM6001M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ac6bf74..7ce5b28 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -161,9 +161,10 @@ kimchi.addNetworkActions = function(network) { return false; } if (!network.persistent) { + var confirmMessage = i18n['KCHNET6004M'].replace('%1', '<strong>'+network.name+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHNET6004M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; @@ -180,9 +181,10 @@ kimchi.addNetworkActions = function(network) { if (network.state === "up" || network.in_use) { return false; } + var confirmMessage = i18n['KCHNET6002M'].replace('%1', '<strong>'+network.name+'</strong>'); wok.confirm({ title : i18n['KCHAPI6006M'], - content : i18n['KCHNET6002M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..18e6eea 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,14 +310,15 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var poolName = $pool.data('name'); + var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', '<strong>'+poolName+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6001M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var poolName = $pool.data('name'); kimchi.deleteStoragePool(poolName, function() { kimchi.doListStoragePools(); }, function(err) { @@ -339,9 +340,10 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', '<strong>'+poolName+'</strong>'); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6012M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 302d906..cf98a7b 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -124,14 +124,15 @@ kimchi.templateBindClick = function() { $('.template-delete a').on('click', function(event) { event.preventDefault(); var $template = $(this); + var templateName = $template.data('template'); + var confirmMessage = i18n['KCHTMPL6003M'].replace('%1', '<strong>'+templateName+'</strong>'); var settings = { title: i18n['KCHAPI6001M'], - content: i18n['KCHTMPL6003M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var templateName = $template.data('template'); kimchi.deleteTemplate(templateName, function() { kimchi.doListTemplates(); }, function(err) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a5185b1..d29a206 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -47,24 +47,24 @@ "KCHTMPL6001W": "$_("No ISO found")", "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", - "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6003M": "$_("This will permanently delete the %1 template. Would you like to continue?")", "KCHTMPL6004M": "$_("View Table")", "KCHTMPL6005M": "$_("View Gallery")", "KCHTMPL6006M": "$_("Not Available")", "KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", - "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", + "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")", "KCHVM6003M": "$_("This action may produce undesirable results, " - "for example unflushed disk cache in the guest. " + "for example unflushed disk cache in the %1 guest. " "Would you like to continue?")", "KCHVM6004M": "$_("Reset Confirmation")", "KCHVM6005M": "$_("There is a risk of data loss caused by reset without" - " the guest OS shutdown. Would you like to continue?")", + " the %1 guest OS shutdown. Would you like to continue?")", "KCHVM6006M": "$_("Shut Down Confirmation")", - "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", + "KCHVM6007M": "$_("Note the %1 guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", - "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6009M": "$_("The %1 virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", @@ -89,11 +89,11 @@ "KCHVMED6012M": "$_("Following devices will be affected, confirm?")", "KCHNET6001M": "$_("unavailable")", - "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")", - "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", + "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")", + "KCHNET6004M": "$_("The %1 network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", "KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")", - "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")", + "KCHPOOL6001M": "$_("This will permanently delete the %1 storage pool. Would you like to continue?")", "KCHPOOL6002M": "$_("This storage pool is empty.")", "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", @@ -108,7 +108,7 @@ "KCHPOOL6006E": "$_("No logical device selected.")", "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6011M": "$_("No available partitions found.")", - "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", "KCHPOOL6014M": "$_("In progress...")", "KCHPOOL6015M": "$_("Failed!")", -- 2.7.4

2 1

[PATCH v2] [Kimchi] Issue #921: Peers button disappears
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Samuel Guimarães (1): Issue #921: Peers button disappears root.py | 6 ++ ui/js/kimchi.peers.js | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.api.js | 14 ----- ui/pages/i18n.json.tmpl | 4 +- 4 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 ui/js/kimchi.peers.js -- 2.5.5

2 3

[PATCH] [Kimchi 0/2] Kimchi Issues #606 and #939
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> -Issue #939 requires patch "Minor fixes in form fields" applied in Wok -Issue #606 requires patch "Icons for Kimchi issue #606" applied in Wok Samuel Guimarães (2): Issue #939: [UI] Guest tab is not rendered correctly if guests are not in 'running' or ''shutoff' state Issue #606: Change icon to distinguish image generated template and iso generated template ui/css/kimchi.css | 169 +++++++++++--------- ui/css/src/modules/_guests.scss | 147 ++++++++++-------- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_templates.scss | 62 +++++--- ui/js/src/kimchi.template_add_main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 206 +++++++++++++------------ ui/pages/guest.html.tmpl | 6 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 272 +++++++++++++++++---------------- 9 files changed, 485 insertions(+), 386 deletions(-) -- 2.5.5

2 3

[PATCH] [Kimchi 0/3] Peers, paused guests and iso generated template icons
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Multiple patches for Kimchi: -Issue #921 v3: Changed container to element generated by script -Issue #939 v2: Rebased -Issue #606 v2: Moved icons from Wok to Kimchi (probably won't apply anyway because the SVGs have lines longer than 998 characters) Samuel Guimarães (3): Issue #921: Peers button disappears Issue #939: [UI] Guest tab is not rendered correctly if guests are not in 'running' or ''shutoff' state Issue #606: Change icon to distinguish image generated template and iso generated template root.py | 6 + ui/css/kimchi.css | 169 +++++++++++--------- ui/css/src/modules/_guests.scss | 147 ++++++++++-------- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_templates.scss | 65 +++++--- ui/images/file-o-img.svg | 149 ++++++++++++++++++ ui/images/file-o-iso.svg | 149 ++++++++++++++++++ ui/js/kimchi.peers.js | 140 +++++++++++++++++ ui/js/src/kimchi.api.js | 14 -- ui/js/src/kimchi.template_add_main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 206 +++++++++++++------------ ui/pages/guest.html.tmpl | 6 +- ui/pages/i18n.json.tmpl | 4 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 272 +++++++++++++++++---------------- 15 files changed, 935 insertions(+), 401 deletions(-) create mode 100644 ui/images/file-o-img.svg create mode 100644 ui/images/file-o-iso.svg create mode 100644 ui/js/kimchi.peers.js -- 2.5.5

2 5

[PATCH v2] [Wok] Removing Kimchi Peers dropdown from Wok navbar
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Additional patches are necessary (Kimchi and Gingerbase). Samuel Guimarães (1): Removing Kimchi Peers dropdown from Wok navbar ui/js/src/wok.main.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) -- 2.5.5

2 2

[PATCH 0/2] [Wok] Minor fixes in form fields
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Patches required for issues #606 and #939 Samuel Guimarães (2): Minor fixes in form fields Icons for Kimchi issue #606 ui/css/src/modules/_wok-forms.scss | 11 +++ ui/css/wok.css | 11 +++ ui/images/theme-default/file-o-img.svg | 149 +++++++++++++++++++++++++++++++++ ui/images/theme-default/file-o-iso.svg | 149 +++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+) create mode 100644 ui/images/theme-default/file-o-img.svg create mode 100644 ui/images/theme-default/file-o-iso.svg -- 2.5.5

2 5

[PATCH] [Wok 0/2] Peers drop-down and minor Wok forms issues
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v2: Rebased and removed ISO and IMG icons from Wok and moved to Kimchi. Samuel Guimarães (2): Removing Kimchi Peers dropdown from Wok navbar Minor fixes in form fields ui/css/src/modules/_wok-forms.scss | 11 +++++++++++ ui/css/wok.css | 11 +++++++++++ ui/js/src/wok.main.js | 29 +---------------------------- 3 files changed, 23 insertions(+), 28 deletions(-) -- 2.5.5

2 3

[PATCH] [Kimchi] /plugins/kimchi/ovsbridges API
by sureshab＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> As Per RFC: [Kimchi-devel] [RFC] listing of ovs bridges this patch adds new API /plugins/kimchi/ovsbridges to list ovsbridges Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- control/ovsbridges.py | 29 +++++++++++++++++++++++++++++ docs/API.md | 8 ++++++++ model/ovsbridges.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 control/ovsbridges.py create mode 100644 model/ovsbridges.py diff --git a/control/ovsbridges.py b/control/ovsbridges.py new file mode 100644 index 0000000..974e954 --- /dev/null +++ b/control/ovsbridges.py @@ -0,0 +1,29 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import SimpleCollection +from wok.control.utils import UrlSubNode + + +@UrlSubNode("ovsbridges", True) +class OVSBridges(SimpleCollection): + def __init__(self, model): + super(OVSBridges, self).__init__(model) + self.role_key = 'ovsbridges' + self.admin_methods = ['GET'] diff --git a/docs/API.md b/docs/API.md index 7bd677f..49540b9 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1028,3 +1028,11 @@ List of available groups. * **GET**: Return the list of Kimchi peers in the same network (It uses openSLP for discovering) + +### Simple Collection: OVSBridges + +**URI:** /plugins/kimchi/ovsbridges + +**Methods:** + +* **GET**: Return list of OVS bridges of the host. diff --git a/model/ovsbridges.py b/model/ovsbridges.py new file mode 100644 index 0000000..212520f --- /dev/null +++ b/model/ovsbridges.py @@ -0,0 +1,31 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.plugins.gingerbase.netinfo import ovs_bridges + + +class OVSBridgesModel(object): + + def get_list(self): + """ + + Returns: list of ovs bridge names + + """ + return ovs_bridges() -- 1.8.3.1

4 5

[PATCH V2] Issue #992 : Create template on s390x without libvirt storage
by harshalp＠linux.vnet.ibm.com 01 Sep '16

01 Sep '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> V1: This patch adds support for creating templates on s390x arch without using libvirt related storage calls V2: Review comments Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- docs/API.md | 2 + i18n.py | 3 ++ model/storagepools.py | 17 ++++++-- model/storagevolumes.py | 1 - model/templates.py | 27 +++++++++---- model/vms.py | 9 ++++- osinfo.py | 47 ++++++++++++++++++++-- utils.py | 34 ++++++++++++++++ vmtemplate.py | 105 ++++++++++++++++++++++++++++++------------------ 9 files changed, 189 insertions(+), 56 deletions(-) diff --git a/docs/API.md b/docs/API.md index 7bd677f..d8d191a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -427,6 +427,7 @@ A interface represents available network interface on VM. over current will be used exclusively for memory hotplug * cdrom: A volume name or URI to an ISO image * storagepool: URI of the storagepool where template allocates vm storage. + * path : Storage path to store virtual disks without libvirt * networks *(optional)*: list of networks will be assigned to the new VM. * disks: An array of requested disks with the following optional fields (either *size* or *volume* must be specified): @@ -481,6 +482,7 @@ A interface represents available network interface on VM. * format: Format of the image. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc. * pool: Storage pool information * name: URI of the storagepool where template allocates vm disk. + * path (optional): Either pool or path to store the virtual disks should be specified * graphics *(optional)*: A dict of graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. * vnc: Graphical display using the Virtual Network diff --git a/i18n.py b/i18n.py index ea2c4ab..7e60079 100644 --- a/i18n.py +++ b/i18n.py @@ -190,6 +190,9 @@ messages = { "KCHTMPL0031E": _("Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)"), "KCHTMPL0032E": _("Unable to update template due error: %(err)s"), "KCHTMPL0033E": _("Parameter 'disks' requires at least one disk object"), + "KCHTMPL0034E": _("Storage without libvirt pool is not supported on this architecture"), + "KCHTMPL0035E": _("Error while creating the virtual disk for the guest. Details: %(err)s"), + "KCHTMPL0036E": _("When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/model/storagepools.py b/model/storagepools.py index af92ec9..08e6426 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -33,7 +33,7 @@ from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.scan import Scanner -from wok.plugins.kimchi.utils import pool_name_from_uri +from wok.plugins.kimchi.utils import pool_name_from_uri, is_s390x ISO_POOL_NAME = u'kimchi_isos' @@ -57,6 +57,7 @@ STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', class StoragePoolsModel(object): + def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] @@ -72,6 +73,13 @@ class StoragePoolsModel(object): def _check_default_pools(self): pools = {} + if 'disks' not in tmpl_defaults or len(tmpl_defaults['disks']) == 0 \ + or (not tmpl_defaults.get('disks')[0].get( + 'pool') and is_s390x()): + # Since libvirt pools are not supported on s390x + # No need to check for default pools on s390x + return + tmpl_defaults.get('disks') default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] @@ -437,9 +445,10 @@ class StoragePoolModel(object): for tmpl in templates: t_info = session.get('template', tmpl) for disk in t_info['disks']: - t_pool = disk['pool']['name'] - if pool_name_from_uri(t_pool) == pool_name: - return True + if 'pool' in disk: + t_pool = disk['pool']['name'] + if pool_name_from_uri(t_pool) == pool_name: + return True return False def deactivate(self, name): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index 4708674..d721d3b 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -44,7 +44,6 @@ from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel from wok.plugins.kimchi.utils import get_next_clone_name - VOLUME_TYPE_MAP = {0: 'file', 1: 'block', 2: 'directory', diff --git a/model/templates.py b/model/templates.py index 8df8c3b..c749f4b 100644 --- a/model/templates.py +++ b/model/templates.py @@ -28,13 +28,15 @@ import urlparse from wok.exception import InvalidOperation, InvalidParameter from wok.exception import NotFoundError, OperationFailed -from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr +from wok.utils import probe_file_permission_as_user +from wok.utils import run_setfacl_set_attr from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.utils import is_libvirtd_up, pool_name_from_uri +from wok.plugins.kimchi.utils import create_disk_image from wok.plugins.kimchi.vmtemplate import VMTemplate ISO_TYPE = "ISO 9660 CD-ROM" @@ -400,15 +402,26 @@ class LibvirtVMTemplate(VMTemplate): def fork_vm_storage(self, vm_uuid): # Provision storages: - vol_list = self.to_volume_list(vm_uuid) + disk_and_vol_list = self.to_volume_list(vm_uuid) try: - for v in vol_list: - pool = self._get_storage_pool(v['pool']) - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + for v in disk_and_vol_list: + if v['pool'] is not None: + pool = self._get_storage_pool(v['pool']) + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + else: + capacity = v['capacity'] + format_type = v['format'] + path = v['path'] + create_disk_image( + format_type=format_type, + path=path, + capacity=capacity) + except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) - return vol_list + + return disk_and_vol_list def set_cpu_info(self): # undefined topology: consider these values to calculate maxvcpus diff --git a/model/vms.py b/model/vms.py index 7f607f5..3ad722e 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,7 +61,7 @@ from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.osinfo import defaults, MEM_DEV_SLOTS from wok.plugins.kimchi.screenshot import VMScreenshot -from wok.plugins.kimchi.utils import get_next_clone_name +from wok.plugins.kimchi.utils import get_next_clone_name, is_s390x from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_node from wok.plugins.kimchi.xmlutils.bootorder import get_bootmenu_node @@ -1395,6 +1395,13 @@ class VMModel(object): except libvirt.libvirtError as e: wok_log.error('Unable to get storage volume by path: %s' % e.message) + try: + if is_s390x() and os.path.exists(path): + os.remove(path) + except Exception as e: + wok_log.error('Unable to delete storage path: %s' % + e.message) + except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/osinfo.py b/osinfo.py index 528cf14..d60cc15 100644 --- a/osinfo.py +++ b/osinfo.py @@ -158,6 +158,12 @@ def _get_tmpl_defaults(): 'maxmemory': _get_default_template_mem()} tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2', 'pool': 'default'} + is_on_s390x = True if _get_arch() == 's390x' else False + + if is_on_s390x: + tmpl_defaults['storage']['disk.0']['path'] = '/var/lib/libvirt/images/' + del tmpl_defaults['storage']['disk.0']['pool'] + tmpl_defaults['processor']['vcpus'] = 1 tmpl_defaults['processor']['maxvcpus'] = 1 tmpl_defaults['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} @@ -165,7 +171,12 @@ def _get_tmpl_defaults(): default_config = ConfigObj(tmpl_defaults) # Load template configuration file - config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') + if is_on_s390x: + config_file = os.path.join( + kimchiPaths.sysconf_dir, + 'template_s390x.conf') + else: + config_file = os.path.join(kimchiPaths.sysconf_dir, 'template.conf') config = ConfigObj(config_file) # Merge default configuration with file configuration @@ -186,11 +197,39 @@ def _get_tmpl_defaults(): # Parse storage section to get disks values storage_section = default_config.pop('storage') defaults['disks'] = [] - for disk in storage_section.keys(): + + pool_exists = False + path_exists = False + for index, disk in enumerate(storage_section.keys()): data = storage_section[disk] data['index'] = int(disk.split('.')[1]) - data['pool'] = {"name": '/plugins/kimchi/storagepools/' + - storage_section[disk].pop('pool')} + # Right now 'Path' is only supported on s390x + if storage_section[disk].get('path') and is_on_s390x: + path_exists = True + data['path'] = storage_section[disk].pop('path') + if 'size' not in storage_section[disk]: + data['size'] = tmpl_defaults['storage']['disk.0']['size'] + else: + data['size'] = storage_section[disk].pop('size') + + if 'format' not in storage_section[disk]: + data['format'] = tmpl_defaults['storage']['disk.0']['format'] + else: + data['format'] = storage_section[disk].pop('format') + else: + storage_section[disk].get('pool') + pool_exists = True + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} + + # If both pool and path don't exist, pick the defaults + if index == len(storage_section.keys()) - 1 and \ + (not pool_exists and not path_exists): + if is_on_s390x: # Special handling for s390x + data['path'] = tmpl_defaults['storage']['disk.0']['path'] + else: + data['pool'] = {"name": '/plugins/kimchi/storagepools/default'} + defaults['disks'].append(data) # Parse processor section to get vcpus and cpu_topology values diff --git a/utils.py b/utils.py index 26d3cf6..0fca191 100644 --- a/utils.py +++ b/utils.py @@ -24,6 +24,7 @@ import platform import re import sqlite3 import time +import os import urllib2 from httplib import HTTPConnection, HTTPException from urlparse import urlparse @@ -31,6 +32,7 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default +from wok.stringutils import encode_value from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text @@ -272,3 +274,35 @@ def is_libvirtd_up(): output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False + + +def is_s390x(): + """ + Check if current arch is 's390x' + Returns: + """ + if os.uname()[4] == 's390x': + return True + + return False + + +def create_disk_image(format_type, path, capacity): + """ + Create a disk image for the Guest + Args: + format: Format of the storage. e.g. qcow2 + path: Path where the virtual disk will be created + capacity: Capacity of the virtual disk in GBs + + Returns: + + """ + out, err, rc = run_command( + ["/usr/bin/qemu-img", "create", "-f", format_type, "-o", + "preallocation=metadata", path, encode_value(capacity) + "G"]) + + if rc != 0: + raise OperationFailed("KCHTMPL0035E", {'err': err}) + + return \ No newline at end of file diff --git a/vmtemplate.py b/vmtemplate.py index babf050..3b9eb32 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -31,7 +31,8 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage -from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri +from wok.plugins.kimchi.utils import check_url_path, is_s390x +from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.xmlutils.bootorder import get_bootorder_xml from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -42,6 +43,7 @@ from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): + def __init__(self, args, scan=False, netboot=False): """ Construct a VM Template from a widely variable amount of information. @@ -95,35 +97,49 @@ class VMTemplate(object): disks = self.info.get('disks') basic_disk = ['index', 'format', 'pool', 'size'] + basic_path_disk = ['index', 'format', 'path', 'size'] ro_disk = ['index', 'format', 'pool', 'volume'] base_disk = ['index', 'base', 'pool', 'size', 'format'] for index, disk in enumerate(disks): disk_info = dict(default_disk) - - pool = disk.get('pool', default_disk['pool']) - pool_type = self._get_storage_type(pool['name']) - - if pool_type in ['iscsi', 'scsi']: - disk_info = {'index': 0, 'format': 'raw', 'volume': None} - - disk_info.update(disk) - pool_name = disk_info.get('pool', {}).get('name') - if pool_name is None: - raise MissingParameter('KCHTMPL0028E') - - keys = sorted(disk_info.keys()) - if ((keys != sorted(basic_disk)) and (keys != sorted(ro_disk)) and - (keys != sorted(base_disk))): - raise MissingParameter('KCHTMPL0028E') - - if pool_type in ['logical', 'iscsi', 'scsi']: - if disk_info['format'] != 'raw': - raise InvalidParameter('KCHTMPL0029E') - - disk_info['pool']['type'] = pool_type - disk_info['index'] = disk_info.get('index', index) - self.info['disks'][index] = disk_info + if disk.get('pool'): + pool = disk.get('pool', default_disk.get('pool')) + pool_type = self._get_storage_type(pool['name']) + if pool_type in ['iscsi', 'scsi']: + disk_info = {'index': 0, 'format': 'raw', 'volume': None} + + disk_info.update(disk) + pool_name = disk_info.get('pool', {}).get('name') + if pool_name is None: + raise MissingParameter('KCHTMPL0028E') + + keys = sorted(disk_info.keys()) + if ((keys != sorted(basic_disk)) and + (keys != sorted(ro_disk)) and + (keys != sorted(base_disk)) and + (keys != basic_path_disk)): + raise MissingParameter('KCHTMPL0028E') + + if pool_type in ['logical', 'iscsi', 'scsi']: + if disk_info['format'] != 'raw': + raise InvalidParameter('KCHTMPL0029E') + + disk_info['pool']['type'] = pool_type + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + elif is_s390x(): + # For now support 'path' only on s390x + path = disk.get('path', default_disk['path']) + disk_info.update(disk) + keys = sorted(disk_info.keys()) + if keys != sorted(basic_path_disk): + raise MissingParameter('KCHTMPL0036E') + disk_info['path'] = path + disk_info['index'] = disk_info.get('index', index) + self.info['disks'][index] = disk_info + else: + raise InvalidParameter('KCHTMPL0034E') def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -217,8 +233,9 @@ class VMTemplate(object): params = dict(base_disk_params) params['format'] = disk['format'] params['index'] = index - params.update(locals().get('%s_disk_params' % - disk['pool']['type'], {})) + if disk.get('pool'): + params.update(locals().get('%s_disk_params' % + disk['pool']['type'], {})) volume = disk.get('volume') if volume is not None: @@ -226,9 +243,13 @@ class VMTemplate(object): volume) else: img = "%s-%s.img" % (vm_uuid, params['index']) - storage_path = self._get_storage_path(disk['pool']['name']) + if disk.get('pool'): + storage_path = self._get_storage_path(disk['pool']['name']) + params['pool_type'] = disk['pool']['type'] + elif disk.get('path'): + storage_path = disk.get('path') + params['pool_type'] = None params['path'] = os.path.join(storage_path, img) - params['pool_type'] = disk['pool']['type'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') @@ -237,20 +258,24 @@ class VMTemplate(object): ret = [] for i, d in enumerate(self.info['disks']): # Create only .img. If storagepool is (i)SCSI, volumes will be LUNs - if d['pool']['type'] in ["iscsi", "scsi"]: + if 'pool' in d and d['pool']['type'] in ["iscsi", "scsi"]: continue index = d.get('index', i) volume = "%s-%s.img" % (vm_uuid, index) - storage_path = self._get_storage_path(d['pool']['name']) + if 'path' in d: + storage_path = d['path'] + else: + storage_path = self._get_storage_path(d['pool']['name']) + info = {'name': volume, 'capacity': d['size'], 'format': d['format'], 'path': '%s/%s' % (storage_path, volume), - 'pool': d['pool']['name']} + 'pool': d['pool']['name'] if 'pool' in d else None} - if 'logical' == d['pool']['type'] or \ + if ('pool' in d and 'logical' == d['pool']['type']) or \ info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: @@ -447,8 +472,9 @@ class VMTemplate(object): def validate(self): for disk in self.info.get('disks'): - pool_uri = disk.get('pool', {}).get('name') - self._get_storage_pool(pool_uri) + if 'pool' in disk: + pool_uri = disk.get('pool', {}).get('name') + self._get_storage_pool(pool_uri) self._network_validate() self._iso_validate() self.cpuinfo_validate() @@ -499,10 +525,11 @@ class VMTemplate(object): # validate storagepools and image-based templates integrity for disk in self.info['disks']: - pool_uri = disk['pool']['name'] - pool_name = pool_name_from_uri(pool_uri) - if pool_name not in self._get_active_storagepools_name(): - invalid['storagepools'] = [pool_name] + if 'pool' in disk: + pool_uri = disk['pool']['name'] + pool_name = pool_name_from_uri(pool_uri) + if pool_name not in self._get_active_storagepools_name(): + invalid['storagepools'] = [pool_name] if disk.get("base") is None: continue -- 1.9.1

3 2