- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Issue #1053: View console, shutdown socket server for VM who's console is not readable instead writeable.
by archus＠linux.vnet.ibm.com 14 Oct '16

14 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Socket server gets closed for VM's serial console connection if its not readable instead writeable. This is due to fact that _is_vm_listening_serial(...) only call _test_output if its readable and not on writeable. Adding libvirt.VIR_STREAM_EVENT_WRITABLE solve the issue. Also added libvirt.VIR_STREAM_EVENT_HANGUP event so that in case of hangup also console gets connected. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- serialconsole.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serialconsole.py b/serialconsole.py index 13ef331..725f55d 100644 --- a/serialconsole.py +++ b/serialconsole.py @@ -101,7 +101,9 @@ class SocketServer(Process): while not is_listening: libvirt.virEventRunDefaultImpl() - console.eventAddCallback(libvirt.VIR_STREAM_EVENT_READABLE, + console.eventAddCallback(libvirt.VIR_STREAM_EVENT_READABLE | + libvirt.VIR_STREAM_EVENT_WRITABLE | + libvirt.VIR_STREAM_EVENT_HANGUP, _test_output, None) libvirt_loop = threading.Thread(target=_event_loop) @@ -111,6 +113,7 @@ class SocketServer(Process): libvirt_loop.join(1) if not libvirt_loop.is_alive(): + wok_log.error("console libvirt stream is not listening to event") console.eventRemoveCallback() return True -- 2.7.4

3 3

[PATCH] [Kimchi 0/3] Vitualization UI multiple changes
by rajgupta＠linux.vnet.ibm.com 14 Oct '16

14 Oct '16

From: Rajat Gupta <rajggupta(a)linux.vnet.ibm.com> 1. Added UI validation for s390x Virtualization Guest Edit Add Storage module 2. Added UI validation for s390x Virtualization Template Edit Add Storage module 3. For s390x Virtualization under Edit Template display "Storage" as header instead of "Storage Pool" Rajat Gupta (3): Added UI validation for s390x Virtualization Guest Edit Add Storage module Added UI validation for s390x Virtualization Template Edit Add Storage module For s390x virtualization edit template display "Storage" as header ui/css/kimchi.css | 23 ++--- ui/css/src/modules/_templates.scss | 3 + ui/js/src/kimchi.guest_storage_add.main.js | 130 +++++++++++++++++++---------- ui/js/src/kimchi.template_edit_main.js | 59 +++++++++---- ui/pages/i18n.json.tmpl | 4 + ui/pages/template-edit.html.tmpl | 1 + 6 files changed, 147 insertions(+), 73 deletions(-) -- 2.1.0

2 4

[PATCH] Issue #1052 : incorrect pool initialisation on s390x
by harshalp＠linux.vnet.ibm.com 14 Oct '16

14 Oct '16

From: Harshal Patil <harshalp(a)linux.vnet.ibm.com> This patch fixes issue with initialisation of storage pools on s390x when they are explicitly mentioned in template_s390x.conf file Signed-off-by: Harshal Patil <harshalp(a)linux.vnet.ibm.com> --- model/storagepools.py | 5 ++++- osinfo.py | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/model/storagepools.py b/model/storagepools.py index 5942b31..e918f10 100644 --- a/model/storagepools.py +++ b/model/storagepools.py @@ -74,7 +74,10 @@ class StoragePoolsModel(object): pools = {} if is_s390x(): - return + # Don't create default pool if it's not + # explicitly specified in template_s390x.conf + if 'pool' not in tmpl_defaults['disks'][0]: + return default_pool = tmpl_defaults['disks'][0]['pool']['name'] default_pool = default_pool.split('/')[-1] diff --git a/osinfo.py b/osinfo.py index 1527896..bf649f1 100644 --- a/osinfo.py +++ b/osinfo.py @@ -210,16 +210,25 @@ def _get_tmpl_defaults(): data['index'] = int(disk.split('.')[1]) # 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 storage_section[disk].get('pool'): + # If 'pool' is explicitly specified in + # template_s390x.conf, drop 'path' + storage_section[disk].pop('path', None) + data['pool'] = {"name": '/plugins/kimchi/storagepools/' + + storage_section[disk].pop('pool')} - if 'format' not in storage_section[disk]: - data['format'] = tmpl_defaults['storage']['disk.0']['format'] else: - data['format'] = storage_section[disk].pop('format') + 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: data['pool'] = {"name": '/plugins/kimchi/storagepools/' + storage_section[disk].pop('pool')} -- 2.7.4

2 1

[PATCH][Kimchi 2/2] Use tablet_bus for tablet input instead of kbd_bus
by Ramon Medeiros 14 Oct '16

14 Oct '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- vmtemplate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmtemplate.py b/vmtemplate.py index 0288330..06ee845 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -371,7 +371,7 @@ class VMTemplate(object): """ tablet = """ - <input type='tablet' bus='%(kbd_bus)s'> </input> + <input type='tablet' bus='%(tablet_bus)s'> </input> """ video = """ -- 2.7.4

2 2

[PATCH] [Kimchi] Remove PowerKVM checks from memory alignment code
by Lucio Correia 14 Oct '16

14 Oct '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/templates.py | 3 +-- model/vms.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/model/templates.py b/model/templates.py index e5b111a..c3e24e1 100644 --- a/model/templates.py +++ b/model/templates.py @@ -327,8 +327,7 @@ def validate_memory(memory): 'maxmem': str(maxmem)}) # make sure memory and Maxmemory are alingned in 256MiB in PowerPC - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM": + if platform.machine().startswith('ppc'): if current % PPC_MEM_ALIGN != 0: raise InvalidParameter('KCHVM0071E', {'param': "Memory", diff --git a/model/vms.py b/model/vms.py index a1b0df7..f4df4a3 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1086,8 +1086,7 @@ class VMModel(object): memory = new_mem - old_mem flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM": + if platform.machine().startswith('ppc'): # make sure memory is alingned in 256MiB in PowerPC if (new_mem % PPC_MEM_ALIGN != 0): raise InvalidParameter('KCHVM0071E', -- 2.7.4

2 1

[PATCH] [Wok] Bug fix #146: Do not display Wok tab for non-admin users
by Aline Manera 14 Oct '16

14 Oct '16

The Wok tab is restricted to admin users so do not load it for non-admin users. It implies in changing the way Wok loads the tabs as all the children tabs may be hidden for non-admin users and consequently the pattern tab should not be loaded as well. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/utils.py | 2 +- ui/js/src/wok.main.js | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 0b74fd8..52f6cea 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -97,7 +97,7 @@ def get_enabled_plugins(): def get_all_tabs(): - files = [] + files = [os.path.join(paths.ui_dir, 'config/tab-ext.xml')] for plugin, _ in get_enabled_plugins(): files.append(os.path.join(PluginPaths(plugin).ui_dir, diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index eb7fd28..3872580 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -33,6 +33,7 @@ wok.main = function() { wok.popable(); var genTabs = function(tabs) { + var functionalTabs = []; var tabsHtml = []; $(tabs).each(function(i, tab) { tab_i18n = i18n[tab] ? i18n[tab] : tab; @@ -52,9 +53,16 @@ wok.main = function() { '<input name="helpPath" class="sr-only" value="' + helpPath + '" type="hidden"/>', '</li>' ); + + if (functionalTabs.indexOf(functionality) == -1) { + functionalTabs.push(functionality) + } } }); - return tabsHtml.join(''); + + $('#functionalTabPanel ul').append(genFuncTabs(functionalTabs)); + $('#tabPanel ul').append(tabsHtml.join('')); + return; }; var genFuncTabs = function(tabs){ @@ -73,7 +81,6 @@ wok.main = function() { var parseTabs = function(xmlData) { var tabs = []; - var functionalTabs = {}; var functionality = $(xmlData).find('functionality').text(); $(xmlData).find('tab').each(function() { var $tab = $(this); @@ -124,9 +131,7 @@ wok.main = function() { var pluginI18nUrl = 'plugins/{plugin}/i18n.json'; var DEFAULT_HASH; var buildTabs = function(callback) { - var tabs = []; - var functionalTabs = []; - var wokTabs = retrieveTabs(wokConfigUrl); + var tabs = retrieveTabs(wokConfigUrl); wok.listPlugins(function(plugins) { $(plugins).each(function(i, p) { var url = wok.substitute(pluginConfigUrl, { @@ -140,23 +145,10 @@ wok.main = function() { }, i18nUrl, true); var pluginTabs = retrieveTabs(url); if(pluginTabs.length > 0){ - var func = pluginTabs[0].functionality - if (functionalTabs.indexOf(func) == -1) { - functionalTabs.push(pluginTabs[0].functionality) - } tabs.push.apply(tabs, pluginTabs); } }); - //ordering of first level tab - functionalTabs.sort(); - if(wokTabs.length > 0){ - //Adds wok to first index in list - functionalTabs.unshift(wokTabs[0].functionality); - //Adds Wok tabs to the list - tabs.unshift.apply(tabs, wokTabs); - } - //sort second level tab based on their ordering number var orderedTabs = tabs.slice(0); orderedTabs.sort(function(a, b) { @@ -174,8 +166,7 @@ wok.main = function() { defaultTabPath.substring(0, defaultTabPath.lastIndexOf('.')) } - $('#functionalTabPanel ul').append(genFuncTabs(functionalTabs)); - $('#tabPanel ul').append(genTabs(orderedTabs)); + genTabs(orderedTabs); wok.getHostname(); wok.logos('ul#plugins',true); wok.logos('ul#wok-about',false); -- 2.7.4

2 2

[PATCH] [Wok] Bug fix #169: Display user log date in numeric format
by Aline Manera 14 Oct '16

14 Oct '16

Also rename Timezone to Zone to avoid waste of space in page. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 2 +- ui/js/wok.user-log.js | 1 + ui/pages/i18n.json.tmpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index dcec823..80bdb77 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -244,7 +244,7 @@ wok.datetimeLocaleConverter = function datetimeLocaleConverter(datetime_string, wok.dateLocaleConverter = function dateLocaleConverter(date_string, locale){ var dte = new moment(date_string); - var options = { year: 'numeric', month: 'long', day: 'numeric' }; + var options = { year: 'numeric', month: 'numeric', day: 'numeric' }; return dte._d.toLocaleDateString(locale, options); } diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index bac5439..41bc765 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -103,6 +103,7 @@ wok.listUserLogConfig = function() { }, { "column-id": 'zone', "converter": 'string', + "width": "6%", "title": i18n['WOKSETT0013M'] }, { "column-id": 'status', diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 17ee40c..220f8e5 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -53,7 +53,7 @@ "WOKSETT0010M": "$_("No results found!")", "WOKSETT0011M": "$_("Loading...")", "WOKSETT0012M": "$_("Actions")", - "WOKSETT0013M": "$_("Timezone")", + "WOKSETT0013M": "$_("Zone")", "WOKSETT0014M": "$_("IP Address")", "WOKSETT0015M": "$_("Status")", -- 2.7.4

2 2

[PATCH][Kimchi 1/2] Issue #651: Windows guests - default mouse type causing problems
by Ramon Medeiros 13 Oct '16

13 Oct '16

Add <input type='tablet' bus='usb'/> for winxp guests. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- osinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osinfo.py b/osinfo.py index 1527896..965f918 100644 --- a/osinfo.py +++ b/osinfo.py @@ -85,7 +85,8 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', custom_specs = {'fedora': {'22': {'x86': dict(video_model='qxl')}}, - 'windows': {'xp': {'x86': dict(nic_model='pcnet')}}} + 'windows': {'xp': {'x86': dict(nic_model='pcnet'), + 'x86': dict(tablet_bus="usb")}}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', -- 2.7.4

2 1

[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

Oct 12th - Scrum meeting canceled (Holiday in Brazil) <EOM>
by Aline Manera 12 Oct '16

12 Oct '16

1 0