arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Synched up 2.7 branch with trunk for xCAT-UI and zVM plugin.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12627 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2012-05-11 14:10:19 +00:00
parent 49b144c012
commit 0d8cf20521
9 changed files with 1072 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

992
xCAT-UI/js/configure/service.js
View File

File diff suppressed because it is too large Load Diff

27
xCAT-UI/js/custom/blade.js
View File

@@ -12,33 +12,6 @@ var bladePlugin = function() {
};
/**
* Clone node (service page)
*
* @param node Node to clone
*/
bladePlugin.prototype.serviceClone = function(node) {
};
/**
* Load provision page (service page)
*
* @param tabId Tab ID where page will reside
*/
bladePlugin.prototype.loadServiceProvisionPage = function(tabId) {
};
/**
* Show node inventory (service page)
*
* @param data Data from HTTP request
*/
bladePlugin.prototype.loadServiceInventory = function(data) {
};
/**
* Load node inventory
*

42
xCAT-UI/js/custom/esx.js
View File

@@ -19,7 +19,7 @@ var esxPlugin = function() {
*/
esxPlugin.prototype.loadConfigPage = function(tabId) {
var configAccordion = $('<div id="esxConfigAccordion"></div>');
// Create accordion panel for user
var userSection = $('<div id="esxConfigUser"></div>');
var userLnk = $('<h3><a href="#">Users</a></h3>').click(function () {
@@ -28,32 +28,46 @@ esxPlugin.prototype.loadConfigPage = function(tabId) {
return;
else
$('#esxConfigUser').append(createLoader(''));
// Get user data
loadUserPanel('esxConfigUser');
});
// Create accordion panel for profiles
var profileSection = $('<div id="esxConfigProfile"></div>');
profileSection.append(createInfoBar('Create, edit, and delete virtual machine profiles used in the self-service portal'));
var profileLnk = $('<h3><a href="#">Profiles</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#esxConfigProfile').find('.dataTables_wrapper').length)
return;
else
$('#esxConfigProfile').append(createLoader(''));
});
// Create accordion panel for images
var imgSection = $('<div id="esxConfigImages"></div>');
var imgLnk = $('<h3><a href="#">Images</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#esxConfigImages').find('.dataTables_wrapper').length)
return;
else
$('#esxConfigImages').append(createLoader(''));
queryImages('esxConfigImages');
});
// Create accordion panel for groups
var groupsSection = $('<div id="esxConfigGroups"></div>');
var groupsLnk = $('<h3><a href="#">Groups</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#esxConfigGroups').find('.dataTables_wrapper').length)
return;
else
$('#esxConfigGroups').append(createLoader(''));
});
// Create accordion panel for nodes
var nodeSection = $('<div id="esxConfigNode"></div>');
nodeSection.append(createInfoBar('Modify node attributes'));
var nodeLnk = $('<h3><a href="#">Nodes</a></h3>').click(function () {
queryGroups('esxConfigGroups');
});
configAccordion.append(userLnk, userSection, profileLnk, profileSection, groupsLnk, groupsSection, nodeLnk, nodeSection);
configAccordion.append(userLnk, userSection, profileLnk, profileSection, imgLnk, imgSection, groupsLnk, groupsSection);
$('#' + tabId).append(configAccordion);
configAccordion.accordion();

27
xCAT-UI/js/custom/hmc.js
View File

@@ -36,33 +36,6 @@ hmcPlugin.prototype.getNextFunction = function() {
checkFrameMtms, undefined, undefined, collectInputValue ];
};
/**
* Clone node (service page)
*
* @param node Node to clone
*/
hmcPlugin.prototype.serviceClone = function(node) {
};
/**
* Load provision page (service page)
*
* @param tabId Tab ID where page will reside
*/
hmcPlugin.prototype.loadServiceProvisionPage = function(tabId) {
};
/**
* Show node inventory (service page)
*
* @param data Data from HTTP request
*/
hmcPlugin.prototype.loadServiceInventory = function(data) {
};
/**
* Load node inventory
*

27
xCAT-UI/js/custom/ipmi.js
View File

@@ -35,33 +35,6 @@ ipmiPlugin.prototype.getNextFunction = function() {
undefined ];
};
/**
* Clone node (service page)
*
* @param node Node to clone
*/
ipmiPlugin.prototype.serviceClone = function(node) {
};
/**
* Load provision page (service page)
*
* @param tabId Tab ID where page will reside
*/
ipmiPlugin.prototype.loadServiceProvisionPage = function(tabId) {
};
/**
* Show node inventory (service page)
*
* @param data Data from HTTP request
*/
ipmiPlugin.prototype.loadServiceInventory = function(data) {
};
/**
* Load node inventory
*

40
xCAT-UI/js/custom/kvm.js
View File

@@ -26,32 +26,46 @@ kvmPlugin.prototype.loadConfigPage = function(tabId) {
return;
else
$('#kvmConfigUser').append(createLoader(''));
// Get user data
loadUserPanel('kvmConfigUser');
});
// Create accordion panel for profiles
var profileSection = $('<div id="kvmConfigProfile"></div>');
profileSection.append(createInfoBar('Create, edit, and delete virtual machine profiles used in the self-service portal'));
var profileLnk = $('<h3><a href="#">Profiles</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#kvmConfigProfile').find('.dataTables_wrapper').length)
return;
else
$('#kvmConfigProfile').append(createLoader(''));
});
// Create accordion panel for images
var imgSection = $('<div id="kvmConfigImages"></div>');
var imgLnk = $('<h3><a href="#">Images</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#kvmConfigImages').find('.dataTables_wrapper').length)
return;
else
$('#kvmConfigImages').append(createLoader(''));
queryImages('kvmConfigImages');
});
// Create accordion panel for groups
var groupsSection = $('<div id="kvmConfigGroups"></div>');
var groupsLnk = $('<h3><a href="#">Groups</a></h3>').click(function () {
// Do not load panel again if it is already loaded
if ($('#kvmConfigGroups').find('.dataTables_wrapper').length)
return;
else
$('#kvmConfigGroups').append(createLoader(''));
});
// Create accordion panel for nodes
var nodeSection = $('<div id="kvmConfigNode"></div>');
nodeSection.append(createInfoBar('Modify node attributes'));
var nodeLnk = $('<h3><a href="#">Nodes</a></h3>').click(function () {
queryGroups('kvmConfigGroups');
});
configAccordion.append(userLnk, userSection, profileLnk, profileSection, groupsLnk, groupsSection, nodeLnk, nodeSection);
configAccordion.append(userLnk, userSection, profileLnk, profileSection, imgLnk, imgSection, groupsLnk, groupsSection);
$('#' + tabId).append(configAccordion);
configAccordion.accordion();

972
xCAT-UI/js/custom/zvmUtils.js
View File

@@ -3324,412 +3324,6 @@ function queryProfiles(panelId) {
});
}
/**
* Query the images that exists
*
* @param panelId Panel ID
*/
function queryImages(panelId) {
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'tabdump',
tgt : '',
args : 'osimage',
msg : panelId
},
success : configImagePanel
});
}
/**
* Query the groups that exists
*
* @param panelId Panel ID
*/
function queryGroups(panelId) {
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'tabdump',
tgt : '',
args : 'hosts',
msg : panelId
},
success : configGroupPanel
});
}
/**
* Panel to configure groups
*
* @param data Data from HTTP request
*/
function configGroupPanel(data) {
var panelId = data.msg;
var rsp = data.rsp;
// Wipe panel clean
$('#' + panelId).empty();
// Add info bar
$('#' + panelId).append(createInfoBar('Create, edit, and delete groups for the self-service portal.'));
// Create table
var tableId = 'zvmGroupTable';
var table = new DataTable(tableId);
table.init(['<input type="checkbox" onclick="selectAllCheckbox(event, $(this))">', 'Name', 'Selectable', 'IP', 'Hostname', 'Network', 'Description']);
// Insert groups into table
var nodePos = 0;
var ipPos = 0;
var hostnamePos = 0;
var commentsPos = 0;
var desc, selectable, tmp;
// Get column index for each attribute
var colNameArray = rsp[0].substr(1).split(',');
for (var i in colNameArray){
switch (colNameArray[i]){
case 'node':
nodePos = i;
break;
case 'ip':
ipPos = i;
break;
case 'hostnames':
hostnamePos = i;
break;
case 'comments':
commentsPos = i;
break;
default :
break;
}
}
// Go through each index
for (var i = 1; i < rsp.length; i++) {
// Get image name
var cols = rsp[i].split(',');
var name = cols[nodePos].replace(new RegExp('"', 'g'), '');
var ip = cols[ipPos].replace(new RegExp('"', 'g'), '');
var hostname = cols[hostnamePos].replace(new RegExp('"', 'g'), '');
var comments = cols[commentsPos].replace(new RegExp('"', 'g'), '');
// Set default description and selectable
selectable = "no";
network = "";
desc = "No description";
if (comments) {
tmp = comments.split('|');
for (var j = 0; j < tmp.length; j++) {
// Save description
if (tmp[j].indexOf('description:') > -1) {
desc = tmp[j].replace('description:', '');
desc = jQuery.trim(desc);
}
// Save network
if (tmp[j].indexOf('network:') > -1) {
network = tmp[j].replace('network:', '');
network = jQuery.trim(network);
}
// Is the group selectable?
if (tmp[j].indexOf('selectable:') > -1) {
selectable = tmp[j].replace('selectable:', '');
selectable = jQuery.trim(selectable);
}
}
}
// Columns are: name, selectable, network, and description
var cols = new Array(name, selectable, ip, hostname, network, desc);
// Add remove button where id = user name
cols.unshift('<input type="checkbox" name="' + name + '"/>');
// Add row
table.add(cols);
}
// Append datatable to tab
$('#' + panelId).append(table.object());
// Turn into datatable
$('#' + tableId).dataTable({
'iDisplayLength': 50,
'bLengthChange': false,
"sScrollX": "100%",
"bAutoWidth": true
});
// Create action bar
var actionBar = $('<div class="actionBar"></div>');
// Create a group
var createLnk = $('<a>Create</a>');
createLnk.click(function() {
groupDialog();
});
// Edit a group
var editLnk = $('<a>Edit</a>');
editLnk.click(function() {
var groups = $('#' + tableId + ' input[type=checkbox]:checked');
for (var i in groups) {
var group = groups.eq(i).attr('name');
if (group) {
// Column order is: name, selectable, network, and description
var cols = groups.eq(i).parents('tr').find('td');
var selectable = cols.eq(2).text();
var ip = cols.eq(3).text();
var hostnames = cols.eq(4).text();
var network = cols.eq(5).text();
var description = cols.eq(6).text();
editGroupDialog(group, selectable, ip, hostnames, network, description);
}
}
});
// Delete a profile
var deleteLnk = $('<a>Delete</a>');
deleteLnk.click(function() {
var groups = getNodesChecked(tableId);
if (groups) {
deleteGroupDialog(groups);
}
});
// Refresh profiles table
var refreshLnk = $('<a>Refresh</a>');
refreshLnk.click(function() {
queryGroups(panelId);
});
// Create an action menu
var actionsMenu = createMenu([createLnk, editLnk, deleteLnk, refreshLnk]);
actionsMenu.superfish();
actionsMenu.css('display', 'inline-block');
actionBar.append(actionsMenu);
// Set correct theme for action menu
actionsMenu.find('li').hover(function() {
setMenu2Theme($(this));
}, function() {
setMenu2Normal($(this));
});
// Create a division to hold actions menu
var menuDiv = $('<div id="' + tableId + '_menuDiv" class="menuDiv"></div>');
$('#' + tableId + '_wrapper').prepend(menuDiv);
menuDiv.append(actionBar);
$('#' + tableId + '_filter').appendTo(menuDiv);
// Resize accordion
$('#zvmConfigAccordion').accordion('resize');
}
/**
* Panel to configure OS images
*
* @param data Data from HTTP request
*/
function configImagePanel(data) {
var panelId = data.msg;
var rsp = data.rsp;
// Wipe panel clean
$('#' + panelId).empty();
// Add info bar
$('#' + panelId).append(createInfoBar('Create, edit, and delete operating system images for the self-service portal.'));
// Create table
var tableId = 'zvmImageTable';
var table = new DataTable(tableId);
table.init(['<input type="checkbox" onclick="selectAllCheckbox(event, $(this))">', 'Name', 'Selectable', 'OS Version', 'Profile', 'Method', 'Description']);
// Insert images into table
var imagePos = 0;
var profilePos = 0;
var osversPos = 0;
var osarchPos = 0;
var provMethodPos = 0;
var comments = 0;
var desc, selectable, tmp;
// Get column index for each attribute
var colNameArray = rsp[0].substr(1).split(',');
for (var i in colNameArray){
switch (colNameArray[i]){
case 'imagename': {
imagePos = i;
}
break;
case 'profile':{
profilePos = i;
}
break;
case 'osvers':{
osversPos = i;
}
break;
case 'osarch':{
osarchPos = i;
}
break;
case 'comments':{
comments = i;
}
break;
case 'provmethod':{
provMethodPos = i;
}
break;
default :
break;
}
}
// Go through each index
for (var i = 1; i < rsp.length; i++) {
// Get image name
var cols = rsp[i].split(',');
var name = cols[imagePos].replace(new RegExp('"', 'g'), '');
var profile = cols[profilePos].replace(new RegExp('"', 'g'), '');
var provMethod = cols[provMethodPos].replace(new RegExp('"', 'g'), '');
var osVer = cols[osversPos].replace(new RegExp('"', 'g'), '');
var osArch = cols[osarchPos].replace(new RegExp('"', 'g'), '');
var osComments = cols[comments].replace(new RegExp('"', 'g'), '');
// Only save install boot and s390x architectures
if (osArch == "s390x") {
// Set default description and selectable
selectable = "no";
desc = "No description";
if (osComments) {
tmp = osComments.split('|');
for (var j = 0; j < tmp.length; j++) {
// Save description
if (tmp[j].indexOf('description:') > -1) {
desc = tmp[j].replace('description:', '');
desc = jQuery.trim(desc);
}
// Is the image selectable?
if (tmp[j].indexOf('selectable:') > -1) {
selectable = tmp[j].replace('selectable:', '');
selectable = jQuery.trim(selectable);
}
}
}
// Columns are: name, selectable, OS version, profile, method, and description
var cols = new Array(name, selectable, osVer, profile, provMethod, desc);
// Add remove button where id = user name
cols.unshift('<input type="checkbox" name="' + name + '"/>');
// Add row
table.add(cols);
}
}
// Append datatable to tab
$('#' + panelId).append(table.object());
// Turn into datatable
$('#' + tableId).dataTable({
'iDisplayLength': 50,
'bLengthChange': false,
"sScrollX": "100%",
"bAutoWidth": true
});
// Create action bar
var actionBar = $('<div class="actionBar"></div>');
// Create a profile
var createLnk = $('<a>Create</a>');
createLnk.click(function() {
imageDialog();
});
// Edit a profile
var editLnk = $('<a>Edit</a>');
editLnk.click(function() {
var images = $('#' + tableId + ' input[type=checkbox]:checked');
for (var i in images) {
var image = images.eq(i).attr('name');
if (image) {
// Column order is: profile, selectable, disk pool, disk size, and directory entry
var cols = images.eq(i).parents('tr').find('td');
var selectable = cols.eq(2).text();
var osVersion = cols.eq(3).text();
var profile = cols.eq(4).text();
var method = cols.eq(5).text();
var description = cols.eq(6).text();
editImageDialog(image, selectable, osVersion, profile, method, description);
}
}
});
// Delete a profile
var deleteLnk = $('<a>Delete</a>');
deleteLnk.click(function() {
var images = getNodesChecked(tableId);
if (images) {
deleteImageDialog(images);
}
});
// Refresh profiles table
var refreshLnk = $('<a>Refresh</a>');
refreshLnk.click(function() {
queryImages(panelId);
});
// Create an action menu
var actionsMenu = createMenu([createLnk, editLnk, deleteLnk, refreshLnk]);
actionsMenu.superfish();
actionsMenu.css('display', 'inline-block');
actionBar.append(actionsMenu);
// Set correct theme for action menu
actionsMenu.find('li').hover(function() {
setMenu2Theme($(this));
}, function() {
setMenu2Normal($(this));
});
// Create a division to hold actions menu
var menuDiv = $('<div id="' + tableId + '_menuDiv" class="menuDiv"></div>');
$('#' + tableId + '_wrapper').prepend(menuDiv);
menuDiv.append(actionBar);
$('#' + tableId + '_filter').appendTo(menuDiv);
// Resize accordion
$('#zvmConfigAccordion').accordion('resize');
}
/**
* Panel to configure directory entries and disks for a profile
*
@@ -3836,7 +3430,7 @@ function configProfilePanel(panelId) {
$('#' + tableId + '_filter').appendTo(menuDiv);
// Resize accordion
$('#zvmConfigAccordion').accordion('resize');
$('#' + tableId).parents('.ui-accordion').accordion('resize');
// Query directory entries and disk pool/size for each profile
for (var i in profiles) {
@@ -3946,220 +3540,6 @@ function insertDiskInfo(data) {
adjustColumnSize(tableId);
}
/**
* Open group dialog
*/
function groupDialog() {
// Create form to add profile
var dialogId = 'zvmCreateGroup';
var groupForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Provide the following attributes for the group.');
groupForm.append(info);
var group = $('<div><label>Group:</label><input type="text" name="group"/></div>');
var selectable = $('<div><label>Selectable:</label><input type="checkbox" name="selectable"/></div>');
var ip = $('<div><label>IP:</label><input type="text" name="ip"/></div>');
var hostnames = $('<div><label>Hostnames:</label><input type="text" name="hostnames"/></div>');
var network = $('<div><label>Network:</label><input type="text" name="network"/></div>');
var comments = $('<div><label>Description:</label><input type="text" name="comments"/></div>');
groupForm.append(group, selectable, ip, hostnames, network, comments);
// Open dialog to add image
groupForm.dialog({
title:'Create group',
modal: true,
close: function(){
$(this).remove();
},
width: 400,
buttons: {
"Ok": function() {
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Get group attributes
var group = $(this).find('input[name="group"]');
var selectable = $(this).find('input[name="selectable"]');
var ip = $(this).find('input[name="ip"]');
var hostnames = $(this).find('input[name="hostnames"]');
var network = $(this).find('input[name="network"]');
var comments = $(this).find('input[name="comments"]');
// Check that group attributes are provided before continuing
var ready = 1;
var inputs = new Array(group, ip, hostnames, network);
for (var i in inputs) {
if (!inputs[i].val()) {
inputs[i].css('border-color', 'red');
ready = 0;
} else
inputs[i].css('border-color', '');
}
// If inputs are not complete, show warning message
if (!ready) {
var warn = createWarnBar('Please provide a value for each missing field.');
warn.prependTo($(this));
} else {
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Set default description
if (!comments.val())
comments.val('No description');
// Create arguments to send via AJAX
var args = "updategroup;" + group.val() + ";'" + ip.val() + "';'" + hostnames.val() + "';";
if (selectable.attr("checked"))
args += "'description:" + comments.val() + "|network:" + network.val() + "|selectable:yes";
else
args += "'description:" + comments.val() + "|network:" + network.val() + "|selectable:no";
// Add image to xCAT
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : args,
msg : dialogId
},
success : updatePanel
});
}
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}
/**
* Open image dialog
*/
function imageDialog() {
// Create form to add profile
var dialogId = 'zvmCreateImage';
var imageForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Provide the following attributes for the image. The image name will be generated based on the attributes you will give.');
imageForm.append(info);
var imageName = $('<div><label>Image name:</label><input type="text" name="imagename" disabled="disabled"/></div>');
var selectable = $('<div><label>Selectable:</label><input type="checkbox" name="selectable"/></div>');
var imageType = $('<div><label>Image type:</label><input type="text" name="imagetype" value="linux" disabled="disabled"/></div>');
var architecture = $('<div><label>OS architecture:</label><input type="text" name="osarch" value="s390x" disabled="disabled"/></div>');
var osName = $('<div><label>OS name:</label><input type="text" name="osname" value="Linux" disabled="disabled"/></div>');
var osVersion = $('<div><label>OS version:</label><input type="text" name="osvers"/></div>');
var profile = $('<div><label>Profile:</label><input type="text" name="profile"/></div>');
var provisionMethod = $('<div><label>Provision method:</label></div>');
var provisionSelect = $('<select name="provmethod">'
+ '<option value=""></option>'
+ '<option value="install">install</option>'
+ '<option value="netboot">netboot</option>'
+ '<option value="statelite">statelite</option>'
+ '</select>');
provisionMethod.append(provisionSelect);
var comments = $('<div><label>Description:</label><input type="text" name="comments"/></div>');
imageForm.append(imageName, selectable, imageType, architecture, osName, osVersion, profile, provisionMethod, comments);
// Open dialog to add image
imageForm.dialog({
title:'Create image',
modal: true,
close: function(){
$(this).remove();
},
width: 400,
buttons: {
"Ok": function() {
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Get image attributes
var imageType = $(this).find('input[name="imagetype"]');
var selectable = $(this).find('input[name="selectable"]');
var architecture = $(this).find('input[name="osarch"]');
var osName = $(this).find('input[name="osname"]');
var osVersion = $(this).find('input[name="osvers"]');
var profile = $(this).find('input[name="profile"]');
var provisionMethod = $(this).find('select[name="provmethod"]');
var comments = $(this).find('input[name="comments"]');
// Check that image attributes are provided before continuing
var ready = 1;
var inputs = new Array(imageType, architecture, osName, osVersion, profile, provisionMethod);
for (var i in inputs) {
if (!inputs[i].val()) {
inputs[i].css('border-color', 'red');
ready = 0;
} else
inputs[i].css('border-color', '');
}
// If inputs are not complete, show warning message
if (!ready) {
var warn = createWarnBar('Please provide a value for each missing field.');
warn.prependTo($(this));
} else {
// Override image name
$(this).find('input[name="imagename"]').val(osVersion.val() + '-' + architecture.val() + '-' + provisionMethod.val() + '-' + profile.val());
var imageName = $(this).find('input[name="imagename"]');
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Set default description
if (!comments.val())
comments.val('No description');
// Create arguments to send via AJAX
var args = 'updateosimage;' + imageName.val() + ';' +
imageType.val() + ';' +
architecture.val() + ';' +
osName.val() + ';' +
osVersion.val() + ';' +
profile.val() + ';' +
provisionMethod.val() + ';';
if (selectable.attr('checked'))
args += '"description:' + comments.val() + '|selectable:yes"';
else
args += '"description:' + comments.val() + '|selectable:no"';
// Add image to xCAT
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : args,
msg : dialogId
},
success : updatePanel
});
}
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}
/**
* Open profile dialog
*/
@@ -4415,354 +3795,4 @@ function editProfileDialog(profile, pool, size, entry) {
}
}
});
}
/**
* Open dialog to confirm image delete
*
* @param images Images to delete
*/
function deleteImageDialog(images) {
// Create form to delete disk to pool
var dialogId = 'zvmDeleteImage';
var deleteForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Are you sure you want to delete ' + images.replace(new RegExp(',', 'g'), ', ') + '?');
deleteForm.append(info);
// Open dialog to delete user
deleteForm.dialog({
title:'Delete image',
modal: true,
width: 400,
close: function(){
$(this).remove();
},
buttons: {
"Ok": function(){
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Delete user
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : 'rmosimage;' + images,
msg : dialogId
},
success : updatePanel
});
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}
/**
* Open dialog to confirm group delete
*
* @param groups Groups to delete
*/
function deleteGroupDialog(groups) {
// Create form to delete disk to pool
var dialogId = 'zvmDeleteImage';
var deleteForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Are you sure you want to delete ' + groups.replace(new RegExp(',', 'g'), ', ') + '?');
deleteForm.append(info);
// Open dialog to delete user
deleteForm.dialog({
title:'Delete group',
modal: true,
width: 400,
close: function(){
$(this).remove();
},
buttons: {
"Ok": function(){
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Delete user
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : 'rmgroup;' + groups,
msg : dialogId
},
success : updatePanel
});
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}
/**
* Edit image dialog
*
* @param iName Image name
* @param iSelectable Is image selectable from service page
* @param iOsVersion OS version
* @param iProfile Profile name
* @param iMethod Provisioning method
* @param iComments Image description
*/
function editImageDialog(iName, iSelectable, iOsVersion, iProfile, iMethod, iComments) {
// Create form to add profile
var dialogId = 'zvmCreateImage';
var imageForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Provide the following attributes for the image. The image name will be generated based on the attributes you will give.');
imageForm.append(info);
var imageName = $('<div><label>Image name:</label><input type="text" name="imagename" disabled="disabled"/></div>');
var selectable = $('<div><label>Selectable:</label><input type="checkbox" name="selectable"/></div>');
var imageType = $('<div><label>Image type:</label><input type="text" name="imagetype" value="linux" disabled="disabled"/></div>');
var architecture = $('<div><label>OS architecture:</label><input type="text" name="osarch" value="s390x" disabled="disabled"/></div>');
var osName = $('<div><label>OS name:</label><input type="text" name="osname" value="Linux" disabled="disabled"/></div>');
var osVersion = $('<div><label>OS version:</label><input type="text" name="osvers"/></div>');
var profile = $('<div><label>Profile:</label><input type="text" name="profile"/></div>');
var provisionMethod = $('<div><label>Provision method:</label></div>');
var provisionSelect = $('<select name="provmethod">'
+ '<option value=""></option>'
+ '<option value="install">install</option>'
+ '<option value="netboot">netboot</option>'
+ '<option value="statelite">statelite</option>'
+ '</select>');
provisionMethod.append(provisionSelect);
var comments = $('<div><label>Description:</label><input type="text" name="comments"/></div>');
imageForm.append(imageName, selectable, imageType, architecture, osName, osVersion, profile, provisionMethod, comments);
// Fill in image attributes
imageForm.find('input[name="imagename"]').val(iName);
imageForm.find('input[name="osvers"]').val(iOsVersion);
imageForm.find('input[name="profile"]').val(iProfile);
imageForm.find('select[name="provmethod"]').val(iMethod);
imageForm.find('input[name="comments"]').val(iComments);
if (iSelectable == "yes")
imageForm.find('input[name="selectable"]').attr('checked', 'checked');
// Open dialog to add image
imageForm.dialog({
title:'Edit image',
modal: true,
close: function(){
$(this).remove();
},
width: 400,
buttons: {
"Ok": function() {
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Get image attributes
var imageType = $(this).find('input[name="imagetype"]');
var selectable = $(this).find('input[name="selectable"]');
var architecture = $(this).find('input[name="osarch"]');
var osName = $(this).find('input[name="osname"]');
var osVersion = $(this).find('input[name="osvers"]');
var profile = $(this).find('input[name="profile"]');
var provisionMethod = $(this).find('select[name="provmethod"]');
var comments = $(this).find('input[name="comments"]');
// Check that image attributes are provided before continuing
var ready = 1;
var inputs = new Array(imageType, architecture, osName, osVersion, profile, provisionMethod);
for (var i in inputs) {
if (!inputs[i].val()) {
inputs[i].css('border-color', 'red');
ready = 0;
} else
inputs[i].css('border-color', '');
}
// If inputs are not complete, show warning message
if (!ready) {
var warn = createWarnBar('Please provide a value for each missing field.');
warn.prependTo($(this));
} else {
// Override image name
$(this).find('input[name="imagename"]').val(osVersion.val() + '-' + architecture.val() + '-' + provisionMethod.val() + '-' + profile.val());
var imageName = $(this).find('input[name="imagename"]');
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Set default description
if (!comments.val())
comments.val('No description');
// Create arguments to send via AJAX
var args = 'updateosimage;' + imageName.val() + ';' +
imageType.val() + ';' +
architecture.val() + ';' +
osName.val() + ';' +
osVersion.val() + ';' +
profile.val() + ';' +
provisionMethod.val() + ';';
if (selectable.attr('checked'))
args += '"description:' + comments.val() + '|selectable:yes"';
else
args += '"description:' + comments.val() + '|selectable:no"';
// Add image to xCAT
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : args,
msg : dialogId
},
success : updatePanel
});
}
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}
/**
* Edit group dialog
*
* @param iGroup Group name
* @param iSelectable Is group selectable from the service page
* @param iIp Group IP regex
* @param iHostnames Group hostnames regex
* @param iNetwork Group network, e.g. 10.1.2.0/24
* @param iComments Group description
*/
function editGroupDialog(iGroup, iSelectable, iIp, iHostnames, iNetwork, iComments) {
// Create form to add profile
var dialogId = 'zvmCreateGroup';
var groupForm = $('<div id="' + dialogId + '" class="form"></div>');
// Create info bar
var info = createInfoBar('Provide the following attributes for the group.');
groupForm.append(info);
var group = $('<div><label>Group:</label><input type="text" name="group"/></div>');
var selectable = $('<div><label>Selectable:</label><input type="checkbox" name="selectable"/></div>');
var ip = $('<div><label>IP:</label><input type="text" name="ip"/></div>');
var hostnames = $('<div><label>Hostnames:</label><input type="text" name="hostnames"/></div>');
var network = $('<div><label>Network:</label><input type="text" name="network"/></div>');
var comments = $('<div><label>Description:</label><input type="text" name="comments"/></div>');
groupForm.append(group, selectable, ip, hostnames, network, comments);
// Fill in group attributes
groupForm.find('input[name="group"]').val(iGroup);
groupForm.find('input[name="ip"]').val(iIp);
groupForm.find('input[name="hostnames"]').val(iHostnames);
groupForm.find('input[name="network"]').val(iNetwork);
groupForm.find('input[name="comments"]').val(iComments);
if (iSelectable == "yes")
groupForm.find('input[name="selectable"]').attr('checked', 'checked');
// Open dialog to add image
groupForm.dialog({
title:'Edit group',
modal: true,
close: function(){
$(this).remove();
},
width: 400,
buttons: {
"Ok": function() {
// Remove any warning messages
$(this).find('.ui-state-error').remove();
// Get group attributes
var group = $(this).find('input[name="group"]');
var selectable = $(this).find('input[name="selectable"]');
var ip = $(this).find('input[name="ip"]');
var hostnames = $(this).find('input[name="hostnames"]');
var network = $(this).find('input[name="network"]');
var comments = $(this).find('input[name="comments"]');
// Check that group attributes are provided before continuing
var ready = 1;
var inputs = new Array(group, ip, hostnames, network);
for (var i in inputs) {
if (!inputs[i].val()) {
inputs[i].css('border-color', 'red');
ready = 0;
} else
inputs[i].css('border-color', '');
}
// If inputs are not complete, show warning message
if (!ready) {
var warn = createWarnBar('Please provide a value for each missing field.');
warn.prependTo($(this));
} else {
// Change dialog buttons
$(this).dialog('option', 'buttons', {
'Close': function() {$(this).dialog("close");}
});
// Set default description
if (!comments.val())
comments.val('No description');
// Create arguments to send via AJAX
var args = "updategroup;" + group.val() + ";'" + ip.val() + "';'" + hostnames.val() + "';";
if (selectable.attr("checked"))
args += "'description:" + comments.val() + "|network:" + network.val() + "|selectable:yes";
else
args += "'description:" + comments.val() + "|network:" + network.val() + "|selectable:no";
// Add image to xCAT
$.ajax( {
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
args : args,
msg : dialogId
},
success : updatePanel
});
}
},
"Cancel": function() {
$(this).dialog( "close" );
}
}
});
}

16
xCAT-UI/xcat/plugins/webportal.pm
View File

@@ -482,22 +482,6 @@ sub gennodename {
}
} # End of foreach
} # End of foreach
# Are there nodes in this group already?
# If so, use the existing nodes as a base
my $out = `nodels $group`;
@args = split( /\n/, $out );
foreach (@args) {
$_ =~ s/$hostname_regex/$1/g;
# Take the greatest digit
if ( int($_) > $base_digit ) {
$base_digit = int($_);
}
}
# +1 to base digit to obtain next hostname
$base_digit = $base_digit + 1;
# Generate hostname
$hostname = $base_hostname;

44
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@@ -1989,9 +1989,6 @@ sub makeVM {
# SCP file over to zHCP
$out = `scp $userEntry $target:$userEntry`;
# Remove user entry
$out = `rm $userEntry`;
# Create virtual server
$out = `ssh $hcp "$::DIR/createvs $userId $userEntry"`;
@@ -2015,8 +2012,10 @@ sub makeVM {
# Remove user entry file (on zHCP)
$out = `ssh -o ConnectTimeout=5 $hcp "rm $userEntry"`;
}
}
else {
# Remove user entry on xCAT
$out = `rm $userEntry`;
} else {
# Create NOLOG virtual server
$out = `ssh $hcp "$::DIR/createvs $userId"`;
@@ -3518,7 +3517,6 @@ sub nodeSet {
$propVals = xCAT::zvmUtils->getTabPropsByKey( 'networks', 'net', $network, @propNames );
my $mask = $propVals->{'mask'};
my $gateway = $propVals->{'gateway'};
my $ftp = $propVals->{'tftpserver'};
# Convert <xcatmaster> to nameserver IP
my $nameserver;
@@ -3528,13 +3526,22 @@ sub nodeSet {
$nameserver = $propVals->{'nameservers'};
}
if ( !$network || !$mask || !$ftp || !$nameserver ) {
if ( !$network || !$mask || !$nameserver ) {
# It is acceptable to not have a gateway
xCAT::zvmUtils->printLn( $callback, "$node: (Error) Missing network information" );
xCAT::zvmUtils->printLn( $callback, "$node: (Solution) Specify the mask, gateway, tftpserver, and nameservers for the subnet in the networks table" );
xCAT::zvmUtils->printLn( $callback, "$node: (Solution) Specify the mask, gateway, and nameservers for the subnet in the networks table" );
return;
}
@propNames = ( 'nfsserver' );
$propVals = xCAT::zvmUtils->getNodeProps( 'noderes', $node, @propNames );
my $nfs = $propVals->{'nfsserver'};
if ( !$nfs ) {
$nfs = $master;
}
# Combine NFS server and installation directory, e.g. 10.0.0.1/install
$nfs .= $installDir;
# Get broadcast address of NIC
my $ifcfg = xCAT::zvmUtils->getIfcfgByNic( $hcp, $readChannel );
@@ -3679,7 +3686,7 @@ sub nodeSet {
# Install=ftp://10.0.0.1/sles10.2/s390x/1/
# UseVNC=1 VNCPassword=12345678
# InstNetDev=osa OsaInterface=qdio OsaMedium=eth Manual=0
my $ay = "ftp://$ftp/custom/install/sles/" . $node . "." . $profile . ".tmpl";
my $ay = "http://$nfs/custom/install/sles/" . $node . "." . $profile . ".tmpl";
$parms = $parmHeader . "\n";
$parms = $parms . "AutoYaST=$ay\n";
@@ -3696,7 +3703,7 @@ sub nodeSet {
$parms = $parms . "ReadChannel=$readChannel WriteChannel=$writeChannel DataChannel=$dataChannel\n";
$parms = $parms . "Nameserver=$nameserver Portname=$portName Portno=0\n";
$parms = $parms . "Install=ftp://$ftp/$os/s390x/1/\n";
$parms = $parms . "Install=http://$nfs/$os/s390x/1/\n";
$parms = $parms . "UseVNC=1 VNCPassword=12345678\n";
$parms = $parms . "InstNetDev=$instNetDev OsaInterface=$osaInterface OsaMedium=$osaMedium Manual=0\n";
@@ -3792,7 +3799,7 @@ sub nodeSet {
$out = `sed --in-place -e "/%post/r $postScript" $customTmpl`;
# Edit template
my $url = "ftp://$ftp/$os/s390x/";
my $url = "http://$nfs/$os/s390x/";
$out =
`sed --in-place -e "s,replace_url,$url,g" \ -e "s,replace_ip,$hostIP,g" \ -e "s,replace_netmask,$mask,g" \ -e "s,replace_gateway,$gateway,g" \ -e "s,replace_nameserver,$nameserver,g" \ -e "s,replace_hostname,$hostname,g" \ -e "s,replace_rootpw,$passwd,g" \ -e "s,replace_master,$master,g" \ -e "s,replace_install_dir,$installDir,g" $customTmpl`;
@@ -3861,7 +3868,7 @@ sub nodeSet {
# GATEWAY=10.0.0.1 DNS=9.0.2.11 MTU=1500
# PORTNAME=UNASSIGNED PORTNO=0 LAYER2=0
# vnc vncpassword=12345678
my $ks = "ftp://$ftp/custom/install/rh/" . $node . "." . $profile . ".tmpl";
my $ks = "http://$nfs/custom/install/rh/" . $node . "." . $profile . ".tmpl";
$parms = $parmHeader . "\n";
$parms = $parms . "ks=$ks\n";
@@ -4331,8 +4338,7 @@ sub updateNode {
# Exit loop
last;
}
else {
} else {
$network = "";
}
}
@@ -4349,8 +4355,8 @@ sub updateNode {
# Get FTP server
@propNames = ('tftpserver');
$propVals = xCAT::zvmUtils->getTabPropsByKey( 'networks', 'net', $network, @propNames );
my $ftp = $propVals->{'tftpserver'};
if ( !$ftp ) {
my $nfs = $propVals->{'tftpserver'};
if ( !$nfs ) {
# It is acceptable to not have a gateway
xCAT::zvmUtils->printLn( $callback, "$node: (Error) Missing FTP server" );
@@ -4385,7 +4391,7 @@ sub updateNode {
# SLES 11 requires zypper
# SuSE Enterprise Linux path - ftp://10.0.0.1/sles10.3/s390x/1/
$path = "ftp://$ftp/$version/s390x/1/";
$path = "http://$nfs/install/$version/s390x/1/";
# Add installation source using rug
$out = `ssh $node "rug sa -t zypp $path $version"`;
@@ -4406,7 +4412,7 @@ sub updateNode {
else {
# Red Hat Enterprise Linux path - ftp://10.0.0.1/rhel5.4/s390x/Server/
$path = "ftp://$ftp/$version/s390x/Server/";
$path = "http://$nfs/install/$version/s390x/Server/";
# Check if file.repo already has this repository location
$out = `ssh $node "cat /etc/yum.repos.d/file.repo"`;