diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js index 56d9a34dd..f4be52952 100644 --- a/xCAT-UI/js/custom/zvmUtils.js +++ b/xCAT-UI/js/custom/zvmUtils.js @@ -2017,7 +2017,7 @@ function openAddScsi2SystemDialog(hcp) { hcp2zvm = getHcpZvmHash(); // Create info bar - var info = createInfoBar('Dynamically add an SCSI disk to a running z/VM system.'); + var info = createInfoBar('Dynamically add an SCSI disk to a running z/VM system as an EDEV.'); addS2SForm.append(info); var system = $('
'); @@ -2030,7 +2030,7 @@ function openAddScsi2SystemDialog(hcp) { systemSelect.append($('')); } - var devNo = $(''); + var devNo = $(''); var devPathLabel = $(''); var devPathCount = 1; var pathDiv = $(''); @@ -3436,6 +3436,18 @@ function loadDiskPoolTable(data) { openAddPageSpoolDialog(hcp); }); + // Add EDEV to system + var addEdevLnk = $('Add EDEV'); + addEdevLnk.bind('click', function(event){ + openAddScsi2SystemDialog(hcp); + }); + + // Remove EDEV + var removeEdevLnk = $('Remove EDEV'); + removeEdevLnk.bind('click', function(event){ + openRemoveScsiDialog(hcp); + }); + // Indicate disk is to be shared with various users var shareLnk = $('Share disk'); shareLnk.bind('click', function(event){ @@ -3445,7 +3457,7 @@ function loadDiskPoolTable(data) { // Advanced menu var advancedLnk = 'Advanced'; - var advancedMenu = createMenu([addEckdLnk, addPageSpoolLnk, shareLnk]); + var advancedMenu = createMenu([addEckdLnk, addPageSpoolLnk, addEdevLnk, removeEdevLnk, shareLnk]); // Create action bar var actionBar = $('').css("width", "450px"); @@ -3598,28 +3610,12 @@ function loadZfcpPoolTable(data) { }); } }); - - // Add SCSI to system - var addScsiLnk = $('Add SCSI'); - addScsiLnk.bind('click', function(event){ - openAddScsi2SystemDialog(hcp); - }); - - // Remove SCSI - var removeScsiLnk = $('Remove SCSI'); - removeScsiLnk.bind('click', function(event){ - openRemoveScsiDialog(hcp); - }); - - // Advanced menu - var advancedLnk = 'Advanced'; - var advancedMenu = createMenu([addScsiLnk, removeScsiLnk]); - + // Create action bar var actionBar = $('').css("width", "450px"); // Create an action menu - var actionsMenu = createMenu([addLnk, removeLnk, refreshLnk, [advancedLnk, advancedMenu]]); + var actionsMenu = createMenu([addLnk, removeLnk, refreshLnk]); actionsMenu.superfish(); actionsMenu.css('display', 'inline-block'); actionBar.append(actionsMenu); diff --git a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl index cb9ef51b8..69465f184 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl @@ -327,7 +327,7 @@