From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> This patch changes the vcpu verification when editing a turned off VM, if the VM has a topology set, to comply with the current libvirt schema: vcpus must be a multiple of the 'threads' value. Unit tests were adapted to reflect these changes. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- i18n.py | 2 +- model/cpuinfo.py | 2 +- tests/test_model.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n.py b/i18n.py index 321516c..4d31439 100644 --- a/i18n.py +++ b/i18n.py @@ -347,7 +347,7 @@ messages = { "KCHCPUINF0002E": _("When CPU topology is defined, maximum number of vCPUs must be a product of sockets, cores, and threads."), "KCHCPUINF0003E": _("This host (or current configuration) does not allow CPU topology."), "KCHCPUINF0004E": _("The maximum number of vCPUs is too large for this system."), - "KCHCPUINF0005E": _("When CPU topology is defined, vCPUs must be a multiple of a product of cores and threads."), + "KCHCPUINF0005E": _("When CPU topology is defined, CPUs must be a multiple of the 'threads' number defined."), "KCHCPUINF0006E": _("The number of threads is too large for this system."), "KCHCPUINF0007E": _("When CPU topology is specified, sockets, cores and threads are required paramaters."), "KCHCPUINF0008E": _("Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'."), diff --git a/model/cpuinfo.py b/model/cpuinfo.py index 3707a02..5f82320 100644 --- a/model/cpuinfo.py +++ b/model/cpuinfo.py @@ -138,7 +138,7 @@ class CPUInfoModel(object): raise InvalidParameter("KCHCPUINF0006E") if maxvcpus != sockets * cores * threads: raise InvalidParameter("KCHCPUINF0002E") - if vcpus % (cores * threads) != 0: + if vcpus % threads != 0: raise InvalidParameter("KCHCPUINF0005E") if maxvcpus > self.get_host_max_vcpus(): diff --git a/tests/test_model.py b/tests/test_model.py index 1657fdc..9ccbd3b 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1261,23 +1261,23 @@ class ModelTests(unittest.TestCase): # define CPU topology inst.vm_update(u'kimchi-vm1', {'cpu_info': {'topology': { - 'sockets': 4, 'cores': 2, 'threads': 1}}}) + 'sockets': 2, 'cores': 2, 'threads': 2}}}) vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals({'sockets': 4, 'cores': 2, 'threads': 1}, + self.assertEquals({'sockets': 2, 'cores': 2, 'threads': 2}, vm_info['cpu_info']['topology']) - # vcpus not a multiple of (cores * threads) + # vcpus not a multiple of threads self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', - {'cpu_info': {'vcpus': 1}}) + {'cpu_info': {'vcpus': 5}}) # maxvcpus different of (sockets * cores * threads) self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', {'cpu_info': {'maxvcpus': 4}}) - # topology does not match maxvcpus (8 != 2 * 2 * 1) + # topology does not match maxvcpus (8 != 3 * 2 * 2) self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', {'cpu_info': {'topology': { - 'sockets': 2, 'cores': 2, 'threads': 1}}}) + 'sockets': 3, 'cores': 2, 'threads': 2}}}) # undefine CPU topology inst.vm_update(u'kimchi-vm1', {'cpu_info': {'topology': {}}}) -- 2.7.4

From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> This patch makes the initProcessor function declared inside template_edit_main.js a global function called kimchi.init_processor_tab. The idea is to avoid code repetition when the same tab is used by other modals (Guest Edit, for example). To make the function generic, references of 'template' inside ids of init_processor_tab were removed. Changes in template-edit.html.tmpl were required to make the tab work with this new function. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 159 +++++++++++++++++---------------- ui/pages/template-edit.html.tmpl | 2 +- 2 files changed, 85 insertions(+), 76 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index be53701..6fd257b 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -15,6 +15,88 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +kimchi.init_processor_tab = function(cpu_info) { + var setCPUValue = function(){ + if (!$('#sockets').hasClass("invalid-field") && + !$('#cores').hasClass("invalid-field") && + $('#sockets').val()!="" && $('#cores').val()!="") { + + var sockets = parseInt($("#sockets").val()); + var cores = parseInt($("#cores").val()); + var threads = parseInt($("#threads").val()); + + var computedCpu = sockets * cores * threads; + $("#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 + $("#guest-edit-max-processor-textbox").val(computedCpu); + } + } else { + $("#vcpus").val(''); + } + }; + + $("input:text", "#form-edit-processor").on('keyup', function() { + $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); + if ($(this).prop('id') == 'sockets' || + $(this).prop('id') == 'cores') { + setCPUValue(); + } + }); + + $("input:checkbox", "#form-edit-processor").click(function() { + $('#threads').selectpicker(); + $(".topology", "#form-edit-processor").slideToggle(); + $("#vcpus").attr("disabled", $(this).prop("checked")); + $("#guest-edit-max-processor-textbox").attr("disabled", $(this).prop("checked")); + setCPUValue(); + }); + + $('#threads').change(function() { + setCPUValue(); + }); + + kimchi.getCPUInfo(function(data) { + var options = ""; + var topo = cpu_info.topology; + + for (var i = 0; Math.pow(2, i) <= data.threads_per_core; i++) { + var lastOne = Math.pow(2, i + 1) > data.threads_per_core ? " selected" : ""; + options += "<option" + lastOne + ">" + Math.pow(2, i) + "</option>"; + } + + $('#threads').append(options); + + if (cpu_info.vcpus) { + $("#vcpus").val(cpu_info.vcpus); + } + if (cpu_info.maxvcpus) { + $("#guest-edit-max-processor-textbox").val(cpu_info.maxvcpus); + } + if (topo && topo.sockets) { + $("#sockets").val(topo.sockets); + } + if (topo && topo.cores) { + $("#cores").val(topo.cores); + } + if (topo && topo.threads) { + $('#threads').val(topo.threads); + $('#threads').selectpicker(); + $("input:checkbox", "#form-edit-processor").trigger('click'); + } + }); + + $('#guest-show-max-processor').on('click', function(e) { + e.preventDefault; + $('#guest-max-processor-panel').slideToggle(); + var text = $('#guest-show-max-processor span.text').text(); + $('#guest-show-max-processor span.text').text(text == i18n['KCHVMED6008M'] ? i18n['KCHVMED6009M'] : i18n['KCHVMED6008M']); + $('#guest-show-max-processor i.fa').toggleClass('fa-plus-circle fa-minus-circle'); + }); +}; + + kimchi.template_edit_main = function() { var templateEditMain = $('#edit-template-tabs'); var origDisks; @@ -268,79 +350,6 @@ kimchi.template_edit_main = function() { }); }; - var initProcessor = function() { - var setCPUValue = function() { - if(!$('#sockets').hasClass("invalid-field") && - !$('#cores').hasClass("invalid-field") && - $('#sockets').val()!="" && $('#cores').val()!=""){ - - var sockets = parseInt($("#sockets").val()); - var cores = parseInt($("#cores").val()); - var threads = parseInt($("#threads").val()); - - var computedCpu = sockets * cores * threads; - - $("#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 - $("#guest-edit-max-processor-textbox").val(computedCpu); - } - } else { - $("#vcpus").val(''); - } - }; - $("input:text", "#form-template-processor").on('keyup', function() { - $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); - if ($(this).prop('id') == 'sockets' || - $(this).prop('id') == 'cores') { - setCPUValue(); - } - }); - $("input:checkbox", "#form-template-processor").click(function() { - $('#threads').selectpicker(); - $(".topology", "#form-template-processor").slideToggle(); - $("#vcpus").attr("disabled", $(this).prop("checked")); - $("#guest-edit-max-processor-textbox").attr("disabled", $(this).prop("checked")); - setCPUValue(); - }); - $('#threads').change(function() { - setCPUValue(); - }); - kimchi.getCPUInfo(function(data) { - var options = ""; - var topo = template.cpu_info.topology; - for (var i = 0; Math.pow(2, i) <= data.threads_per_core; i++) { - var lastOne = Math.pow(2, i + 1) > data.threads_per_core ? " selected" : ""; - options += "<option" + lastOne + ">" + Math.pow(2, i) + "</option>"; - } - $('#threads').append(options); - if (template.cpu_info.vcpus) { - $("#vcpus").val(template.cpu_info.vcpus); - } - if (template.cpu_info.maxvcpus) { - $("#guest-edit-max-processor-textbox").val(template.cpu_info.maxvcpus); - } - if (topo && topo.sockets) { - $("#sockets").val(topo.sockets); - } - if (topo && topo.cores) { - $("#cores").val(topo.cores); - } - if (topo && topo.threads) { - $('#threads').val(topo.threads); - $('#threads').selectpicker(); - $("input:checkbox", "#form-template-processor").trigger('click'); - } - }); - $('#guest-show-max-processor').on('click', function(e) { - e.preventDefault; - $('#guest-max-processor-panel').slideToggle(); - var text = $('#guest-show-max-processor span.text').text(); - $('#guest-show-max-processor span.text').text(text == i18n['KCHVMED6008M'] ? i18n['KCHVMED6009M'] : i18n['KCHVMED6008M']); - $('#guest-show-max-processor i.fa').toggleClass('fa-plus-circle fa-minus-circle'); - }); - }; - var checkInvalids = function() { $.each(template.invalid, function(key, value) { if (key === 'cdrom' || key === 'vm-image') { @@ -356,7 +365,7 @@ kimchi.template_edit_main = function() { kimchi.listNetworks(initInterface); kimchi.listStoragePools(initStorage); - initProcessor(); + kimchi.init_processor_tab(template.cpu_info); checkInvalids(); }; kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); @@ -424,7 +433,7 @@ kimchi.template_edit_main = function() { data['cdrom'] = $('.tab-content input[name="cdrom"]').val(); } - if ($("input:checkbox", "#form-template-processor").prop("checked")) { + if ($("input:checkbox", "#form-edit-processor").prop("checked")) { //Check if maxCpu field has a value data['cpu_info'] = { vcpus: cpu, diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index f1a0eee..5d712d3 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -131,7 +131,7 @@ </form> </div> <div role="tabpanel" class="tab-pane" id="processor"> - <form id="form-template-processor"> + <form id="form-edit-processor"> <div class="form-group"> <div id="guest-processor"> <label for="vcpus">$_("Current CPU Number")</label> -- 2.7.4

From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> - Removed 'More' button from the Processor tab in Edit Template. This was done to be standardized with the Edit Guest tab that does not have this button to show/hide the max processor value. - Save button state is now being controlled by the init_processor_tab function (at least inside the Processor tab). - 'Current CPU' is now editable at all times, in both Edit Guest and Edit Template dialogs, even when defining a topology. Inserting a wrong value in the field will invalidate the save state, disabling the button. When defining a topology and Current CPU has an inconsistent value, it will be automatically adjusted to be (1) a multiple of threads or (2) equal to new Max CPU value, in that order. - When not defining a topology, setting any Current CPU value greater than Max CPU will force the field back to the Max CPU value. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- ui/css/kimchi.css | 4 -- ui/css/src/modules/_templates.scss | 3 -- ui/js/src/kimchi.guest_edit_main.js | 2 +- ui/js/src/kimchi.template_edit_main.js | 77 +++++++++++++++++++++++----------- ui/pages/template-edit.html.tmpl | 1 - 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index b4b2603..9ae9f56 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1651,10 +1651,6 @@ body.wok-gallery { display: inline; } -#template-edit-window #guest-max-processor-panel { - display: none; -} - #template-edit-window #guest-show-max-processor { display: inline-block; } diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index 27df464..0c57532 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -126,9 +126,6 @@ $kimchi-icon-path: '../images'; width: 308px !important; display: inline; } - #guest-max-processor-panel { - display: none; - } #guest-show-max-processor { display: inline-block; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index cda132b..54a305d 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -781,7 +781,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); - kimchi.init_processor_tab(guest.cpu_info); + kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); wok.topic('kimchi/vmCDROMAttached').subscribe(onAttached); wok.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 6fd257b..108ea12 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,31 +16,52 @@ * limitations under the License. */ -kimchi.init_processor_tab = function(cpu_info) { - var setCPUValue = function(){ +kimchi.init_processor_tab = function(cpu_info, save_form_button) { + + var getMaxVCpus = function() { if (!$('#sockets').hasClass("invalid-field") && !$('#cores').hasClass("invalid-field") && - $('#sockets').val()!="" && $('#cores').val()!="") { + $('#sockets').val() != "" && $('#cores').val() != "") { - var sockets = parseInt($("#sockets").val()); - var cores = parseInt($("#cores").val()); - var threads = parseInt($("#threads").val()); + var sockets = parseInt($("#sockets").val()); + var cores = parseInt($("#cores").val()); + var threads = parseInt($("#threads").val()); + var computedCpu = sockets * cores * threads; + + return computedCpu; + } + return undefined; + }; - var computedCpu = sockets * cores * threads; - $("#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 - $("#guest-edit-max-processor-textbox").val(computedCpu); + var setCPUValue = function() { + var computedCpu = getMaxVCpus(); + var vcpus = parseInt($("#vcpus").val()); + + if (computedCpu && $("#cpus-check").prop("checked")) { + // If topology is checked, set maxcpu to be the same as # of cpu otherwise, backend gives error + var threads = parseInt($("#threads").val()); + $("#guest-edit-max-processor-textbox").val(computedCpu); + if (vcpus % threads != 0) { + $("#vcpus").val(threads); + } else if (vcpus > computedCpu) { + $("#vcpus").val(computedCpu); } } else { - $("#vcpus").val(''); + var maxCpu = parseInt($("#guest-edit-max-processor-textbox").val()); + if (vcpus > maxCpu) { + $("#vcpus").val(maxCpu); + } } }; $("input:text", "#form-edit-processor").on('keyup', function() { - $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); + var invalid_field = !$(this).val().match('^[0-9]*$'); + $(this).toggleClass("invalid-field", invalid_field); + save_form_button.prop('disabled', invalid_field); + if ($(this).prop('id') == 'sockets' || - $(this).prop('id') == 'cores') { + $(this).prop('id') == 'cores') { + setCPUValue(); } }); @@ -48,7 +69,6 @@ kimchi.init_processor_tab = function(cpu_info) { $("input:checkbox", "#form-edit-processor").click(function() { $('#threads').selectpicker(); $(".topology", "#form-edit-processor").slideToggle(); - $("#vcpus").attr("disabled", $(this).prop("checked")); $("#guest-edit-max-processor-textbox").attr("disabled", $(this).prop("checked")); setCPUValue(); }); @@ -57,6 +77,23 @@ kimchi.init_processor_tab = function(cpu_info) { setCPUValue(); }); + $('#vcpus').change(function() { + var computedCpu = getMaxVCpus(); + var vcpus = parseInt($('#vcpus').val()); + + if (computedCpu && $("#cpus-check").prop("checked")) { + var threads = parseInt($("#threads").val()); + var invalid_vcpu = (vcpus % threads != 0) || (vcpus > computedCpu); + $(this).toggleClass("invalid-field", invalid_vcpu); + save_form_button.prop('disabled', invalid_vcpu); + } else { + var maxCpu = parseInt($("#guest-edit-max-processor-textbox").val()); + if (vcpus > maxCpu) { + $("#vcpus").val(maxCpu); + } + } + }); + kimchi.getCPUInfo(function(data) { var options = ""; var topo = cpu_info.topology; @@ -86,14 +123,6 @@ kimchi.init_processor_tab = function(cpu_info) { $("input:checkbox", "#form-edit-processor").trigger('click'); } }); - - $('#guest-show-max-processor').on('click', function(e) { - e.preventDefault; - $('#guest-max-processor-panel').slideToggle(); - var text = $('#guest-show-max-processor span.text').text(); - $('#guest-show-max-processor span.text').text(text == i18n['KCHVMED6008M'] ? i18n['KCHVMED6009M'] : i18n['KCHVMED6008M']); - $('#guest-show-max-processor i.fa').toggleClass('fa-plus-circle fa-minus-circle'); - }); }; @@ -365,7 +394,7 @@ kimchi.template_edit_main = function() { kimchi.listNetworks(initInterface); kimchi.listStoragePools(initStorage); - kimchi.init_processor_tab(template.cpu_info); + kimchi.init_processor_tab(template.cpu_info, $('#tmpl-edit-button-save')); checkInvalids(); }; kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5d712d3..cac96b8 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -136,7 +136,6 @@ <div id="guest-processor"> <label for="vcpus">$_("Current CPU Number")</label> <input id="vcpus" class="form-control" name="processor" type="number" min="1" /> - <button id="guest-show-max-processor" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="text">$_("More")</span></button> </div> <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> -- 2.7.4

From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> Edit Guest does not work the same way as the Edit Template dialog - each tab has its own submit function and it is not possible to submit multiple tabs in the same dialog. This patch splits the logic to update the CPU configuration that was contained in the 'generalSubmit' function and put it into a new function called 'processorSubmit'. This function will be fired when the 'Save' button is pressed when the 'Processor' tab is active. This patch also further enhances the control of the 'Save' button state in the 'init_processor_tab' JS function by making it always enabled when there is no topology being set. If current CPU is set to a value above max CPU it will be rewrite to be equal to max CPU; if max CPU is set to a value below current CPU, current CPU is set to max CPU. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 83 +++++++++++++++++----------------- ui/js/src/kimchi.template_edit_main.js | 10 ++++ ui/pages/i18n.json.tmpl | 1 - 3 files changed, 52 insertions(+), 42 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 54a305d..dbeb5b9 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -43,7 +43,8 @@ kimchi.guest_edit_main = function() { // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 var submit_map = { 0: generalSubmit, - 3: permissionSubmit + 3: permissionSubmit, + 6: processorSubmit }; var currentTab = $('#guest-edit-window li.active a[data-toggle="tab"]').data('id'); var toSubmit = parseInt($('#'+currentTab).index()); @@ -55,7 +56,6 @@ kimchi.guest_edit_main = function() { $(guestEditForm).on('submit', submitForm); $(saveButton).on('click', submitForm); - $('#guest-edit-window a[data-toggle="tab"]').on('shown.bs.tab', function(e) { var target = $(this).attr('href'); $(target).css('left', '-' + $(window).width() + 'px'); @@ -802,41 +802,14 @@ kimchi.guest_edit_main = function() { var data = $('#form-guest-edit-general').serializeObject(); data['memory'] = {current: Number(data['memory-ui']), maxmemory: Number(data['max-memory'])}; - var cpu = parseInt($('#vcpus').val()); - var maxCpu = parseInt($('#guest-edit-max-processor-textbox').val()); - var maxCpuFinal = cpu; - if (maxCpu >= cpu) { - maxCpuFinal = maxCpu; - } - if ($("input:checkbox", "#form-edit-processor").prop("checked")) { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpuFinal, - topology: { - sockets: parseInt($("#sockets").val()), - cores: parseInt($("#cores").val()), - threads: parseInt($("#threads").val()) - } - }; - } else { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpuFinal, - topology: {} - }; - } - var changedFields = {}; for (var key in data) { valueFromUI = data[key]; if (valueFromUI instanceof Object) { // Compare if Objects of original and data are identical // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem - // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required + // since it is disabled; if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { - if (key === 'cpu_info') { - continue; - } if (key === 'memory') { // Replace valueFromUI of max mem with one from original as otherwise the value is undefined data['memory']['maxmemory'] = org.memory.maxmemory; @@ -886,17 +859,6 @@ kimchi.guest_edit_main = function() { } } - if ('cpu_info' in changedFields) { - var currentCpu = data['cpu_info'].vcpus; - var currentMaxCpu = data['cpu_info'].maxvcpus; - - if (currentCpu > currentMaxCpu) { - wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; - } - } - kimchi.updateVM(kimchi.selectedGuest, changedFields, function() { kimchi.listVmsAuto(); wok.window.close(); @@ -951,4 +913,43 @@ kimchi.guest_edit_main = function() { } } }; + + var processorSubmit = function(event) { + kimchi.retrieveVM(kimchi.selectedGuest, function(org) { + $(saveButton).prop('disabled', true); + var data = {}; + + var cpu = parseInt($('#vcpus').val()); + var maxCpu = parseInt($('#guest-edit-max-processor-textbox').val()); + var maxCpuFinal = cpu; + if (maxCpu >= cpu) { + maxCpuFinal = maxCpu; + } + if ($("input:checkbox", "#form-edit-processor").prop("checked")) { + data['cpu_info'] = { + vcpus: cpu, + maxvcpus: maxCpuFinal, + topology: { + sockets: parseInt($("#sockets").val()), + cores: parseInt($("#cores").val()), + threads: parseInt($("#threads").val()) + } + }; + } else { + data['cpu_info'] = { + vcpus: cpu, + maxvcpus: maxCpuFinal, + topology: {} + }; + } + + kimchi.updateVM(kimchi.selectedGuest, data, function() { + kimchi.listVmsAuto(); + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + $(saveButton).prop('disabled', false); + }); + }); + }; }; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 108ea12..6aaa3fa 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -77,6 +77,15 @@ kimchi.init_processor_tab = function(cpu_info, save_form_button) { setCPUValue(); }); + $("#guest-edit-max-processor-textbox").change(function() { + save_form_button.prop('disabled', false); + var vcpus = parseInt($('#vcpus').val()); + var maxCpu = parseInt($("#guest-edit-max-processor-textbox").val()); + if (vcpus > maxCpu) { + $("#vcpus").val(maxCpu); + } + }); + $('#vcpus').change(function() { var computedCpu = getMaxVCpus(); var vcpus = parseInt($('#vcpus').val()); @@ -87,6 +96,7 @@ kimchi.init_processor_tab = function(cpu_info, save_form_button) { $(this).toggleClass("invalid-field", invalid_vcpu); save_form_button.prop('disabled', invalid_vcpu); } else { + save_form_button.prop('disabled', false); var maxCpu = parseInt($("#guest-edit-max-processor-textbox").val()); if (vcpus > maxCpu) { $("#vcpus").val(maxCpu); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 43c3af2..f53fa77 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -70,7 +70,6 @@ "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", - "KCHVM0003E": "$_("Current CPUs value cannot be higher than Max CPU value")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 2.7.4

From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> This patch disables all CPU options in the 'Processor' tab when the guest is running or paused. Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 45 ++++++++++++++++++++++++------------- ui/pages/guest-edit.html.tmpl | 5 ++++- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index dbeb5b9..7a0d02f 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -781,7 +781,18 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); + if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { + $('#vcpus').attr("disabled", true); + $('#guest-edit-max-processor-textbox').attr("disabled", true); + $('#sockets').attr("disabled", true); + $('#cores').attr("disabled", true); + $('#threads').attr("disabled", true); + + $("#topology-checkbox").hide(); + $("#settings-readonly-help").removeClass('hidden'); + } wok.topic('kimchi/vmCDROMAttached').subscribe(onAttached); wok.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); @@ -925,22 +936,26 @@ kimchi.guest_edit_main = function() { if (maxCpu >= cpu) { maxCpuFinal = maxCpu; } - if ($("input:checkbox", "#form-edit-processor").prop("checked")) { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpuFinal, - topology: { - sockets: parseInt($("#sockets").val()), - cores: parseInt($("#cores").val()), - threads: parseInt($("#threads").val()) - } - }; + if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { + data['cpu_info'] = {vcpus: cpu}; } else { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpuFinal, - topology: {} - }; + if ($("input:checkbox", "#form-edit-processor").prop("checked")) { + data['cpu_info'] = { + vcpus: cpu, + maxvcpus: maxCpuFinal, + topology: { + sockets: parseInt($("#sockets").val()), + cores: parseInt($("#cores").val()), + threads: parseInt($("#threads").val()) + } + }; + } else { + data['cpu_info'] = { + vcpus: cpu, + maxvcpus: maxCpuFinal, + topology: {} + }; + } } kimchi.updateVM(kimchi.selectedGuest, data, function() { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index e0e1a5a..61f010f 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -175,6 +175,9 @@ </form> <form role="tabpanel" class="tab-pane" id="form-edit-processor"> <div class="form-group"> + <div id="settings-readonly-help" class="hidden"> + <b>$_("Unable to edit CPU settings of a running or paused virtual machine.")</b> + </div> <div id="guest-processor"> <label for="vcpus">$_("Current CPU Number")</label> <input id="vcpus" class="form-control" name="processor" type="number" min="1" /> @@ -192,7 +195,7 @@ </p> </div> </div> - <div class="manual form-group"> + <div class="manual form-group" id="topology-checkbox"> <input type="checkbox" class="wok-checkbox" id="cpus-check" /> <label for="cpus-check">$_("Manually set CPU topology")</label> </div> -- 2.7.4