- Kimchi-devel - oVirt List Archives

[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