' +
+
+ typeFS.append('
');
-
+
// Reset scan results area
$('#addBladeCenter #scanResults').remove();
$('#bcSettings img').remove();
$('#bcSettings button').attr('disabled', '');
if (!results)
return;
-
+
// Do not continue if there are no results
var rows = results.split("\n");
if (rows.length < 2){
$('#bcSettings').prepend(createWarnBar(rows[0]));
return;
}
-
+
// Add the table header
var fields = rows[0].match(/\S+/g);
var column = fields.length;
@@ -472,23 +472,23 @@ function showScanAmmResult(results){
row.append('' + fields[i] + ' ');
}
rTable.append(row);
-
+
// Add table body
var line;
for (var i = 1; i < rows.length; i++) {
line = rows[i];
-
+
if (!line)
continue;
-
+
var fields = line.match(/\S+/g);
if (fields[0] == 'mm')
continue;
-
+
// Create a row for each result
var row = $('
'));
nodeFS.append(nodeAttr);
-
+
// Create image fieldset
var imgFS = $('');
var imgLegend = $('');
imgFS.append(imgLegend);
-
+
var imgAttr = $('');
imgFS.append($('
'));
imgFS.append(imgAttr);
-
+
provExisting.append(nodeFS, imgFS);
-
+
// Create group input
var group = $('');
var groupLabel = $('');
@@ -589,7 +589,7 @@ function createBladeProvisionExisting(inst) {
// Turn on auto complete for group
var dTableDivId = 'bladeNodesDatatableDIV' + inst; // Division ID where nodes datatable will be appended
- var groupNames = $.cookie('groups');
+ var groupNames = $.cookie('xcat_groups');
if (groupNames) {
// Split group names into an array
var tmp = groupNames.split(',');
@@ -642,13 +642,13 @@ function createBladeProvisionExisting(inst) {
method.append(methodLabel);
method.append(methodSelect);
imgAttr.append(method);
-
+
// Create operating system input
var os = $('');
var osLabel = $('');
var osInput = $('');
osInput.one('focus', function() {
- var tmp = $.cookie('osvers');
+ var tmp = $.cookie('xcat_osvers');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -665,7 +665,7 @@ function createBladeProvisionExisting(inst) {
var archLabel = $('');
var archInput = $('');
archInput.one('focus', function() {
- var tmp = $.cookie('osarchs');
+ var tmp = $.cookie('xcat_osarchs');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -682,7 +682,7 @@ function createBladeProvisionExisting(inst) {
var profileLabel = $('');
var profileInput = $('');
profileInput.one('focus', function() {
- var tmp = $.cookie('profiles');
+ var tmp = $.cookie('xcat_profiles');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -706,7 +706,7 @@ function createBladeProvisionExisting(inst) {
// Get provision tab ID
var thisTabId = 'bladeProvisionTab' + inst;
-
+
// Get nodes that were checked
var dTableId = 'bladeNodesDatatable' + inst;
var tgts = getNodesChecked(dTableId);
@@ -714,7 +714,7 @@ function createBladeProvisionExisting(inst) {
errorMessage += 'You need to select a node. ';
ready = false;
}
-
+
// Check booth method
var boot = $('#' + thisTabId + ' select[name=bootMethod]');
if (!boot.val()) {
@@ -724,7 +724,7 @@ function createBladeProvisionExisting(inst) {
} else {
boot.css('border', 'solid #BDBDBD 1px');
}
-
+
// Check operating system image
var os = $('#' + thisTabId + ' input[name=os]');
if (!os.val()) {
@@ -734,7 +734,7 @@ function createBladeProvisionExisting(inst) {
} else {
os.css('border', 'solid #BDBDBD 1px');
}
-
+
// Check architecture
var arch = $('#' + thisTabId + ' input[name=arch]');
if (!arch.val()) {
@@ -744,7 +744,7 @@ function createBladeProvisionExisting(inst) {
} else {
arch.css('border', 'solid #BDBDBD 1px');
}
-
+
// Check profile
var profile = $('#' + thisTabId + ' input[name=profile]');
if (!profile.val()) {
@@ -754,12 +754,12 @@ function createBladeProvisionExisting(inst) {
} else {
profile.css('border', 'solid #BDBDBD 1px');
}
-
+
// If all inputs are valid, ready to provision
- if (ready) {
+ if (ready) {
// Disable provision button
$(this).attr('disabled', 'true');
-
+
// Prepend status bar
var statBar = createStatusBar('bladeProvisionStatBar' + inst);
statBar.append(createLoader(''));
@@ -768,11 +768,11 @@ function createBladeProvisionExisting(inst) {
// Disable all inputs
var inputs = $('#' + thisTabId + ' input');
inputs.attr('disabled', 'disabled');
-
+
// Disable all selects
var selects = $('#' + thisTabId + ' select');
selects.attr('disabled', 'disabled');
-
+
/**
* (1) Set operating system
*/
@@ -801,7 +801,7 @@ function createBladeProvisionExisting(inst) {
/**
* Update the provision existing node status
- *
+ *
* @param data Data returned from HTTP request
*/
function updateBladeProvisionExistingStatus(data) {
@@ -813,11 +813,11 @@ function updateBladeProvisionExistingStatus(data) {
var cmd = args[0].replace('cmd=', '');
// Get provision tab instance
var inst = args[1].replace('out=', '');
-
+
// Get provision tab and status bar ID
var statBarId = 'bladeProvisionStatBar' + inst;
var tabId = 'bladeProvisionTab' + inst;
-
+
/**
* (2) Remote install
*/
@@ -830,11 +830,11 @@ function updateBladeProvisionExistingStatus(data) {
var os = $('#' + tabId + ' input[name="os"]').val();
var profile = $('#' + tabId + ' input[name="profile"]').val();
var arch = $('#' + tabId + ' input[name="arch"]').val();
-
+
// Get nodes that were checked
var dTableId = 'bladeNodesDatatable' + inst;
var tgts = getNodesChecked(dTableId);
-
+
// Begin installation
$.ajax( {
url : 'lib/cmd.php',
@@ -848,19 +848,19 @@ function updateBladeProvisionExistingStatus(data) {
success : updateBladeProvisionExistingStatus
});
- }
-
+ }
+
/**
* (3) Prepare node for boot
*/
if (cmd == 'nodeadd') {
// Get provision method
var bootMethod = $('#' + tabId + ' select[name=bootMethod]').val();
-
+
// Get nodes that were checked
var dTableId = 'bladeNodesDatatable' + inst;
var tgts = getNodesChecked(dTableId);
-
+
// Prepare node for boot
$.ajax( {
url : 'lib/cmd.php',
@@ -875,18 +875,18 @@ function updateBladeProvisionExistingStatus(data) {
success : updateBladeProvisionExistingStatus
});
}
-
+
/**
* (4) Power on node
*/
if (cmd == 'nodeset') {
- var prg = writeRsp(rsp, '');
+ var prg = writeRsp(rsp, '');
$('#' + statBarId).find('div').append(prg);
-
+
// Get nodes that were checked
var dTableId = 'bladeNodesDatatable' + inst;
var tgts = getNodesChecked(dTableId);
-
+
// Prepare node for boot
$.ajax( {
url : 'lib/cmd.php',
@@ -901,16 +901,16 @@ function updateBladeProvisionExistingStatus(data) {
success : updateBladeProvisionExistingStatus
});
}
-
+
/**
* (5) Done
*/
else if (cmd == 'rpower') {
// Write ajax response to status bar
- var prg = writeRsp(rsp, '');
+ var prg = writeRsp(rsp, '');
$('#' + statBarId).find('div').append(prg);
$('#' + statBarId).find('img').remove();
-
+
// If installation was successful
if (prg.html().indexOf('Error') == -1) {
$('#' + statBarId).find('div').append(''));
nodeFS.append(nodeAttr);
-
+
// Create image fieldset
var imgFS = $('');
var imgLegend = $('');
imgFS.append(imgLegend);
container.append(imgFS);
-
+
var imgAttr = $('');
imgFS.append($(''));
imgFS.append(imgAttr);
-
+
var query = window.location.search;
var args = query.substr(1).split('&');
var parms = new Object();
var tmp;
-
+
// Turn URL arguments into hash array
for (var i = 0; i < args.length; i++) {
tmp = args[i].split('=');
parms[tmp[0]] = tmp[1];
}
-
+
var master = '';
if (parms['master'])
master = parms['master'];
-
+
var nfsserver = '';
if (parms['nfsserver'])
nfsserver = parms['nfsserver'];
-
+
var tftpserver = '';
if (parms['tftpserver'])
tftpserver = parms['tftpserver'];
-
+
nodeAttr.append('');
-
+
imgAttr.append('');
imgAttr.append('');
imgAttr.append( '');
- imgAttr.append('');
+ imgAttr.append('');
imgAttr.append('');
imgAttr.append('');
imgAttr.append('');
-
+
return;
}
/**
* Create section to provision node using no URL
- *
+ *
* @param plugin Create provision section for given plugin
* @param container Container to hold provision section
*/
function appendProvision4NoUrl(plugin, container){
// Get provision tab ID
var tabId = container.parents('.tab').attr('id');
-
+
// Create node fieldset
var nodeFS = $('');
var nodeLegend = $('');
nodeFS.append(nodeLegend);
container.append(nodeFS);
-
+
var nodeAttr = $('');
nodeFS.append($(''));
nodeFS.append(nodeAttr);
-
+
// Create image fieldset
var imgFS = $('');
var imgLegend = $('');
imgFS.append(imgLegend);
container.append(imgFS);
-
+
var imgAttr = $('');
imgFS.append($(''));
imgFS.append(imgAttr);
-
+
// Select group name
var group = $('').append('');
var groupSelect = $('');
group.append(groupSelect);
- var groupNames = $.cookie('groups');
+ var groupNames = $.cookie('xcat_groups');
if (groupNames) {
var tmp = groupNames.split(',');
groupSelect.append(''); // Append empty group name
@@ -569,14 +569,14 @@ function appendProvision4NoUrl(plugin, container){
var nodesTable = $('');
nodes.append(nodesTable);
nodeAttr.append(nodes);
-
+
// Select architecture
- var arch = $('').append('');
- var archName = $.cookie('osarchs');
+ var arch = $('').append('');
+ var archName = $.cookie('xcat_osarchs');
if (archName) {
var archSelect = $('');
arch.append(archSelect);
-
+
var tmp = archName.split(',');
for (var i in tmp)
archSelect.append('');
@@ -591,30 +591,30 @@ function appendProvision4NoUrl(plugin, container){
imgAttr.append('');
imgAttr.append('');
imgAttr.append('');
-
+
// When a group is selected, show the nodes belonging to that group
groupSelect.bind('change', function() {
var nodesTableId = '#' + tabId + ' #nodesTable';
$(nodesTableId).append(createLoader());
createNodesTable($(this).val(), nodesTableId);
});
-
+
return;
}
/**
* Provision node
- *
+ *
* @param tabId Provision tab ID
*/
function provisionNode(tabId) {
var errorMessage = "";
var args = new Array();
var node = "";
-
+
// Delete any existing warnings
$('#' + tabId + ' .ui-state-error').remove();
-
+
// Go through each input
$('#' + tabId + ' input[type!="checkbox"]').each(function() {
if (!$(this).val()) {
@@ -624,13 +624,13 @@ function provisionNode(tabId) {
args.push($(this).val());
}
});
-
+
// Do not continue if error was found
if (errorMessage) {
$('#' + tabId).prepend(createWarnBar(errorMessage));
return;
}
-
+
// If jumped from nodes page, get node name
if (tabId == 'quick') {
node = args.shift();
@@ -639,25 +639,25 @@ function provisionNode(tabId) {
args.unshift($('#' + tabId + ' input[name=arch]').val());
node = getCheckedByObj($('#' + tabId + ' #nodesTable'));
}
-
+
// Do not continue if a node is not given
if (!node) {
$('#' + tabId).prepend(createWarnBar('Please select a node!'));
return;
}
-
+
var software = getCheckedByObj($('#' + tabId + ' #advanced'));
var imageName = $('#' + tabId + ' select[name=image]').val();
var provision = args.join(',');
-
- var url = 'lib/cmd.php?cmd=webrun&tgt=&args=provision;' +
+
+ var url = 'lib/cmd.php?cmd=webrun&tgt=&args=provision;' +
node + ';' + imageName + ';' + provision + ';' + software + '&msg=&opts=flush';
$('#' + tabId).prepend(createIFrame(url));
}
/**
* Create advance option
- *
+ *
* @param image Image name
* @param outId Output area ID
*/
@@ -678,29 +678,29 @@ function createAdvancedOptions(image, outId) {
var provMethod = '';
var tmpStr = '';
var position = 0;
-
+
for (var i = 0; i < data.rsp.length; i++) {
tmpStr = data.rsp[i];
if (tmpStr.indexOf('osname') != -1) {
position = tmpStr.indexOf('=');
osName = tmpStr.substr(position + 1);
}
-
+
if (tmpStr.indexOf('provmethod') != -1) {
position = tmpStr.indexOf('=');
provMethod = tmpStr.substr(position + 1);
}
}
-
+
$('#' + outId + ' #advanced').remove();
if (osName.toLowerCase() == 'aix')
return;
-
+
if (provMethod == 'install') {
// Create advanced fieldset
var advancedFS = $('').append($(''));
$('#' + outId + ' div.form fieldset:eq(1)').after(advancedFS);
-
+
advancedFS.append('
');
var tHead = $(' Node ');
nTable.append(tHead);
var tBody = $('');
nTable.append(tBody);
-
+
for (var i in nodes) {
var node = nodes[i][0];
-
+
// Go to next node if there is nothing here
if (!node)
continue;
// Insert node into table
tBody.append('' + node + ' 
'));
hwFS.append(hwAttr);
-
+
// Create image fieldset
var imgFS = $('');
var imgLegend = $('');
imgFS.append(imgLegend);
-
+
var imgAttr = $('');
imgFS.append($(''));
imgFS.append(imgAttr);
-
+
provForm.append(vmFS, hwFS, imgFS);
-
+
// Create hypervisor input
var host = $('');
var hostLabel = $('');
@@ -260,14 +260,14 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
var hostInput = $('');
host.append(hostInput);
vmAttr.append(host);
-
+
// Create group input
var group = $('');
var groupLabel = $('');
group.append(groupLabel);
// Turn on auto complete for group
- var groupNames = $.cookie('groups');
+ var groupNames = $.cookie('xcat_groups');
if (groupNames) {
// Split group names into an array
var tmp = groupNames.split(',');
@@ -303,7 +303,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
memory.append(memoryLabel);
memory.append(memoryInput);
hwAttr.append(memory);
-
+
// Create processor dropdown
var cpu = $('');
var cpuLabel = $('');
@@ -320,7 +320,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
cpu.append(cpuLabel);
cpu.append(cpuSelect);
hwAttr.append(cpu);
-
+
// Create NIC dropdown
var nic = $('');
var nicLabel = $('');
@@ -328,7 +328,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
nic.append(nicLabel);
nic.append(nicInput);
hwAttr.append(nic);
-
+
// Create disk input
var disk = $('');
var diskLabel = $('');
@@ -339,7 +339,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
);
disk.append(diskLabel, diskInput, diskSizeSelect);
hwAttr.append(disk);
-
+
// Create disk storage input
var storage = $('');
var storageLabel = $('');
@@ -347,13 +347,13 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
storage.append(storageLabel);
storage.append(storageInput);
hwAttr.append(storage);
-
+
// Create operating system input
var os = $('');
var osLabel = $('');
var osInput = $('');
osInput.one('focus', function() {
- var tmp = $.cookie('osvers');
+ var tmp = $.cookie('xcat_osvers');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -364,13 +364,13 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
os.append(osLabel);
os.append(osInput);
imgAttr.append(os);
-
+
// Create architecture input
var arch = $('');
var archLabel = $('');
var archInput = $('');
archInput.one('focus', function() {
- var tmp = $.cookie('osarchs');
+ var tmp = $.cookie('xcat_osarchs');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -381,13 +381,13 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
arch.append(archLabel);
arch.append(archInput);
imgAttr.append(arch);
-
+
// Create profile input
var profile = $('');
var profileLabel = $('');
var profileInput = $('');
profileInput.one('focus', function() {
- var tmp = $.cookie('profiles');
+ var tmp = $.cookie('xcat_profiles');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -398,7 +398,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
profile.append(profileLabel);
profile.append(profileInput);
imgAttr.append(profile);
-
+
// Create boot method dropdown
var method = $('');
var methodLabel = $('');
@@ -422,10 +422,10 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
// Remove any warning messages
$(this).parents('.ui-tabs-panel').find('.ui-state-error').remove();
var ready = true;
-
+
// Get tab ID
var tabId = $(this).parents('.ui-tabs-panel').attr('id');
-
+
// Check if fields are properly filled in
var inputs = $('#' + tabId + ' input:visible');
for ( var i = 0; i < inputs.length; i++) {
@@ -436,7 +436,7 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
inputs.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
-
+
var selects = $('#' + tabId + ' select:visible');
for ( var i = 0; i < selects.length; i++) {
if (!selects.eq(i).val()) {
@@ -446,30 +446,30 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
selects.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
-
+
if (ready) {
var inst = tabId.replace('kvmProvisionTab', '');
-
+
// Prepend status bar
var statBar = createStatusBar('kvmProvisionStatBar' + inst);
statBar.append(createLoader(''));
statBar.prependTo($('#' + tabId));
-
+
var host = $('#' + tabId + ' input[name=host]').val();
var group = $('#' + tabId + ' select[name=group]').val();
var node = $('#' + tabId + ' input[name=node]').val();
-
+
var memory = $('#' + tabId + ' input[name=memory]').val();
var cpu = $('#' + tabId + ' select[name=cpu]').val();
var nic = $('#' + tabId + ' input[name=nic]').val();
var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val();
var storage = $('#' + tabId + ' input[name=storage]').val();
-
+
var os = $('#' + tabId + ' input[name=os]').val();
var arch = $('#' + tabId + ' input[name=arch]').val();
var profile = $('#' + tabId + ' input[name=profile]').val();
var boot = $('#' + tabId + ' select[name=bootMethod]').val();
-
+
/**
* (1) Define node
*/
@@ -517,14 +517,14 @@ esxPlugin.prototype.loadResources = function() {
var tabId = 'esxResourceTab';
// Remove loader
$('#' + tabId).find('img').remove();
-
+
// Create info bar
var infoBar = createInfoBar('Not yet supported');
// Create resource form
var resrcForm = $('');
resrcForm.append(infoBar);
-
+
$('#' + tabId).append(resrcForm);
};
@@ -535,13 +535,13 @@ esxPlugin.prototype.addNode = function() {
var dialog = $('');
var info = createInfoBar('Add a ESX node');
dialog.append(info);
-
+
// Create node inputs
dialog.append($(''));
dialog.append($(''));
dialog.append($(''));
dialog.append($(''));
-
+
dialog.dialog({
title: 'Add node',
modal: true,
@@ -560,13 +560,13 @@ esxPlugin.prototype.addNode = function() {
function addEsxNode(){
var attr, args;
var errorMessage = '';
-
+
// Remove existing warnings
$('#addEsx .ui-state-error').remove();
-
+
// Return input border colors to normal
$('#addEsx input').css('border', 'solid #BDBDBD 1px');
-
+
// Check node attributes
$('#addEsx input').each(function(){
attr = $(this).val();
@@ -575,28 +575,28 @@ function addEsxNode(){
$(this).css('border', 'solid #FF0000 1px');
}
});
-
+
// Show error message (if any)
if (errorMessage) {
$('#addEsx').prepend(createWarnBar(errorMessage));
return;
}
-
+
// Create loader
$('#addEsx').append(createLoader());
-
+
// Change dialog buttons
$('#addEsx').dialog('option', 'buttons', {
'Close':function() {
$('#addEsx').dialog('destroy').remove();
}
});
-
+
// Generate chdef arguments
args = '-t;node;-o;' + $('#addEsx input[name="node"]').val()
+ ';ip=' + $('#addEsx input[name="ip"]').val()
- + ';groups=' + $('#addEsx input[name="groups"]').val()
- + ';vmhost=' + $('#addEsx input[name="vmhost"]').val()
+ + ';groups=' + $('#addEsx input[name="groups"]').val()
+ + ';vmhost=' + $('#addEsx input[name="vmhost"]').val()
+ ';mgt=esx;netboot=xnba;nodetype=osi;profile=compute';
$.ajax({
url : 'lib/cmd.php',
@@ -619,16 +619,16 @@ function addEsxNode(){
msg : ''
}
});
-
+
// Remove loader
$('#addEsx img').remove();
-
+
// Get return message
var message = '';
for (var i in data.rsp) {
message += data.rsp[i] + '
'; } - + // Show return message if (message) $('#addEsx').prepend(createInfoBar(message)); @@ -638,7 +638,7 @@ function addEsxNode(){ /** * Update the provision node status - * + * * @param data Data returned from HTTP request */ function updateESXProvisionStatus(data) { @@ -650,24 +650,24 @@ function updateESXProvisionStatus(data) { var cmd = args[0].replace('cmd=', ''); // Get provision tab instance var inst = args[1].replace('out=', ''); - + // Get provision tab and status bar ID var statBarId = 'kvmProvisionStatBar' + inst; var tabId = 'kvmProvisionTab' + inst; - + var node = $('#' + tabId + ' input[name=node]').val(); - + /** * (2) Create virtual machine */ if (cmd == 'chdef') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); // Get parameters var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val(); - + // Begin installation $.ajax( { url : 'lib/cmd.php', @@ -681,19 +681,19 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); - } - + } + /** * (3) Prepare node for boot */ if (cmd == 'mkvm') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Get provision method var boot = $('#' + tabId + ' select[name=bootMethod]').val(); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -708,14 +708,14 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); } - + /** * (4) Power on node */ if (cmd == 'nodeset') { - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -730,16 +730,16 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); } - + /** * (5) Done */ else if (cmd == 'rpower') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); $('#' + statBarId).find('img').remove(); - + // If installation was successful if (prg.html().indexOf('Error') == -1) { $('#' + statBarId).find('div').append('Start IP: Nodes number
per Frame: Name Range: Start IP: Name Range: Start IP: Nodes number
per Switch: ');
-
+
// Create accordion panel for profiles
var profileSection = $('');
var profileLnk = $(''));
vmFS.append(vmAttr);
-
+
// Create hardware fieldset
var hwFS = $('');
var hwLegend = $('');
hwFS.append(hwLegend);
-
+
var hwAttr = $('');
hwFS.append($(''));
hwFS.append(hwAttr);
-
+
// Create image fieldset
var imgFS = $('');
var imgLegend = $('');
imgFS.append(imgLegend);
-
+
var imgAttr = $('');
imgFS.append($(''));
imgFS.append(imgAttr);
-
+
provForm.append(vmFS, hwFS, imgFS);
-
+
// Create hypervisor input
var host = $('');
var hostLabel = $('');
@@ -255,14 +255,14 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
var hostInput = $('');
host.append(hostInput);
vmAttr.append(host);
-
+
// Create group input
var group = $('');
var groupLabel = $('');
group.append(groupLabel);
// Turn on auto complete for group
- var groupNames = $.cookie('groups');
+ var groupNames = $.cookie('xcat_groups');
if (groupNames) {
// Split group names into an array
var tmp = groupNames.split(',');
@@ -298,7 +298,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
memory.append(memoryLabel);
memory.append(memoryInput);
hwAttr.append(memory);
-
+
// Create processor dropdown
var cpu = $('');
var cpuLabel = $('');
@@ -315,7 +315,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
cpu.append(cpuLabel);
cpu.append(cpuSelect);
hwAttr.append(cpu);
-
+
// Create NIC dropdown
var nic = $('');
var nicLabel = $('');
@@ -323,7 +323,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
nic.append(nicLabel);
nic.append(nicInput);
hwAttr.append(nic);
-
+
// Create disk input
var disk = $('');
var diskLabel = $('');
@@ -334,7 +334,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
);
disk.append(diskLabel, diskInput, diskSizeSelect);
hwAttr.append(disk);
-
+
// Create disk storage input
var storage = $('');
var storageLabel = $('');
@@ -342,13 +342,13 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
storage.append(storageLabel);
storage.append(storageInput);
hwAttr.append(storage);
-
+
// Create operating system input
var os = $('');
var osLabel = $('');
var osInput = $('');
osInput.one('focus', function() {
- var tmp = $.cookie('osvers');
+ var tmp = $.cookie('xcat_osvers');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -359,13 +359,13 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
os.append(osLabel);
os.append(osInput);
imgAttr.append(os);
-
+
// Create architecture input
var arch = $('');
var archLabel = $('');
var archInput = $('');
archInput.one('focus', function() {
- var tmp = $.cookie('osarchs');
+ var tmp = $.cookie('xcat_osarchs');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -376,13 +376,13 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
arch.append(archLabel);
arch.append(archInput);
imgAttr.append(arch);
-
+
// Create profile input
var profile = $('');
var profileLabel = $('');
var profileInput = $('');
profileInput.one('focus', function() {
- var tmp = $.cookie('profiles');
+ var tmp = $.cookie('xcat_profiles');
if (tmp) {
// Turn on auto complete
$(this).autocomplete({
@@ -393,7 +393,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
profile.append(profileLabel);
profile.append(profileInput);
imgAttr.append(profile);
-
+
// Create boot method dropdown
var method = $('');
var methodLabel = $('');
@@ -417,10 +417,10 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
// Remove any warning messages
$(this).parents('.ui-tabs-panel').find('.ui-state-error').remove();
var ready = true;
-
+
// Get tab ID
var tabId = $(this).parents('.ui-tabs-panel').attr('id');
-
+
// Check if fields are properly filled in
var inputs = $('#' + tabId + ' input:visible');
for ( var i = 0; i < inputs.length; i++) {
@@ -431,7 +431,7 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
inputs.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
-
+
var selects = $('#' + tabId + ' select:visible');
for ( var i = 0; i < selects.length; i++) {
if (!selects.eq(i).val()) {
@@ -441,30 +441,30 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
selects.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
-
+
if (ready) {
var inst = tabId.replace('kvmProvisionTab', '');
-
+
// Prepend status bar
var statBar = createStatusBar('kvmProvisionStatBar' + inst);
statBar.append(createLoader(''));
statBar.prependTo($('#' + tabId));
-
+
var host = $('#' + tabId + ' input[name=host]').val();
var group = $('#' + tabId + ' select[name=group]').val();
var node = $('#' + tabId + ' input[name=node]').val();
-
+
var memory = $('#' + tabId + ' input[name=memory]').val();
var cpu = $('#' + tabId + ' select[name=cpu]').val();
var nic = $('#' + tabId + ' input[name=nic]').val();
var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val();
var storage = $('#' + tabId + ' input[name=storage]').val();
-
+
var os = $('#' + tabId + ' input[name=os]').val();
var arch = $('#' + tabId + ' input[name=arch]').val();
var profile = $('#' + tabId + ' input[name=profile]').val();
var boot = $('#' + tabId + ' select[name=bootMethod]').val();
-
+
/**
* (1) Define node
*/
@@ -512,14 +512,14 @@ kvmPlugin.prototype.loadResources = function() {
var tabId = 'kvmResourceTab';
// Remove loader
$('#' + tabId).find('img').remove();
-
+
// Create info bar
var infoBar = createInfoBar('Not yet supported');
// Create resource form
var resrcForm = $('');
resrcForm.append(infoBar);
-
+
$('#' + tabId).append(resrcForm);
};
@@ -530,13 +530,13 @@ kvmPlugin.prototype.addNode = function() {
var dialog = $('');
var info = createInfoBar('Add a KVM node');
dialog.append(info);
-
+
// Create node inputs
dialog.append($(''));
dialog.append($(''));
dialog.append($(''));
dialog.append($(''));
-
+
dialog.dialog({
title: 'Add node',
modal: true,
@@ -555,13 +555,13 @@ kvmPlugin.prototype.addNode = function() {
function addKvmNode(){
var attr, args;
var errorMessage = '';
-
+
// Remove existing warnings
$('#addKvm .ui-state-error').remove();
-
+
// Return input border colors to normal
$('#addKvm input').css('border', 'solid #BDBDBD 1px');
-
+
// Check node attributes
$('#addKvm input').each(function(){
attr = $(this).val();
@@ -570,28 +570,28 @@ function addKvmNode(){
$(this).css('border', 'solid #FF0000 1px');
}
});
-
+
// Show error message (if any)
if (errorMessage) {
$('#addKvm').prepend(createWarnBar(errorMessage));
return;
}
-
+
// Create loader
$('#addKvm').append(createLoader());
-
+
// Change dialog buttons
$('#addKvm').dialog('option', 'buttons', {
'Close':function(){
$('#addKvm').dialog('destroy').remove();
}
});
-
+
// Generate chdef arguments
args = '-t;node;-o;' + $('#addKvm input[name="node"]').val()
+ ';ip=' + $('#addKvm input[name="ip"]').val()
- + ';groups=' + $('#addKvm input[name="groups"]').val()
- + ';vmhost=' + $('#addKvm input[name="vmhost"]').val()
+ + ';groups=' + $('#addKvm input[name="groups"]').val()
+ + ';vmhost=' + $('#addKvm input[name="vmhost"]').val()
+ ';mgt=kvm;netboot=xnba;nodetype=osi;profile=compute';
$.ajax({
url : 'lib/cmd.php',
@@ -614,16 +614,16 @@ function addKvmNode(){
msg : ''
}
});
-
+
// Remove loader
$('#addKvm img').remove();
-
+
// Get return message
var message = '';
for (var i in data.rsp) {
message += data.rsp[i] + '
'; } - + // Show return message if (message) $('#addKvm').prepend(createInfoBar(message)); @@ -633,7 +633,7 @@ function addKvmNode(){ /** * Update the provision node status - * + * * @param data Data returned from HTTP request */ function updateKVMProvisionStatus(data) { @@ -645,24 +645,24 @@ function updateKVMProvisionStatus(data) { var cmd = args[0].replace('cmd=', ''); // Get provision tab instance var inst = args[1].replace('out=', ''); - + // Get provision tab and status bar ID var statBarId = 'kvmProvisionStatBar' + inst; var tabId = 'kvmProvisionTab' + inst; - + var node = $('#' + tabId + ' input[name=node]').val(); - + /** * (2) Create virtual machine */ if (cmd == 'chdef') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); // Get parameters var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val(); - + // Begin installation $.ajax( { url : 'lib/cmd.php', @@ -676,19 +676,19 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); - } - + } + /** * (3) Prepare node for boot */ if (cmd == 'mkvm') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Get provision method var boot = $('#' + tabId + ' select[name=bootMethod]').val(); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -703,14 +703,14 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); } - + /** * (4) Power on node */ if (cmd == 'nodeset') { - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -725,16 +725,16 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); } - + /** * (5) Done */ else if (cmd == 'rpower') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); $('#' + statBarId).find('img').remove(); - + // If installation was successful if (prg.html().indexOf('Error') == -1) { $('#' + statBarId).find('div').append('
Finding pools and networks..."); findingPools = 1; @@ -152,7 +152,7 @@ function loadHcpInfo(data) { } // If there is no cookie for the zFCP pool names - if (!$.cookie(hcp + 'zfcppools') || $.cookie(hcp + 'zfcppools') === null) { + if (!$.cookie('xcat_' + hcp + 'zfcppools') || $.cookie('xcat_' + hcp + 'zfcppools') === null) { if (nodeInfoBar !== null) { if (findingPools = 0) { @@ -183,7 +183,7 @@ function loadHcpInfo(data) { } // If there is no cookie for the network names - if (!$.cookie(hcp + 'networks') || $.cookie(hcp + 'networks') === null) { + if (!$.cookie('xcat_' + hcp + 'networks') || $.cookie('xcat_' + hcp + 'networks') === null) { if (nodeInfoBar !== null) { if (findingPools = 0) { @@ -374,13 +374,13 @@ function loadUserEntry(data) { */ function incrementNodeProcess(node) { // Get current processes - var procs = $.cookie(node + 'processes'); + var procs = $.cookie('xcat_' + node + 'processes'); if (procs) { // One more process procs = parseInt(procs) + 1; - $.cookie(node + 'processes', procs); + $.cookie('xcat_' + node + 'processes', procs); } else { - $.cookie(node + 'processes', 1); + $.cookie('xcat_' + node + 'processes', 1); } } @@ -517,7 +517,7 @@ function updateZProvisionNewStatus(data) { // Set cookie for number of disks var diskRows = $('#' + tabId + ' table:eq(0):visible tbody tr'); - $.cookie('disks2add' + out2Id, diskRows.length); + $.cookie('xcat_disks2add' + out2Id, diskRows.length, {path: '/xcat', secure:true }); if (diskRows.length > 0) { for (var i = 0; i < diskRows.length; i++) { var diskArgs = diskRows.eq(i).find('td'); @@ -558,7 +558,7 @@ function updateZProvisionNewStatus(data) { // Set cookie for number of zFCP devices var zfcpRows = $('#' + tabId + ' table:eq(1):visible tbody tr'); - $.cookie('zfcp2add' + out2Id, zfcpRows.length); + $.cookie('xcat_zfcp2add' + out2Id, zfcpRows.length, {path: '/xcat', secure:true }); if (zfcpRows.length > 0) { for ( var i = 0; i < zfcpRows.length; i++) { var diskArgs = zfcpRows.eq(i).find('td'); @@ -581,10 +581,16 @@ function updateZProvisionNewStatus(data) { var args = '--addzfcp;' + pool + ';' + address + ';' + loaddev + ';' + size; if (tag && tag != "null") { args += ';' + tag; + } else { + args += ';'; } if (portName && tag != "null") { args += ';' + portName; + } else { + args += ';'; } if (unitNo && tag != "null") { args += ';' + unitNo; + } else { + args += ';'; } // Attach zFCP device to node @@ -625,19 +631,19 @@ function updateZProvisionNewStatus(data) { } else { // Set cookie for number of disks // One less disk to add - var disks2add = $.cookie('disks2add' + out2Id); + var disks2add = $.cookie('xcat_disks2add' + out2Id); if (lastCmd == 'chvm-disk') { if (disks2add > 0) { disks2add--; - $.cookie('disks2add' + out2Id, disks2add); + $.cookie('xcat_disks2add' + out2Id, disks2add, {path: '/xcat', secure:true }); } } - var zfcp2add = $.cookie('zfcp2add' + out2Id); + var zfcp2add = $.cookie('xcat_zfcp2add' + out2Id); if (lastCmd == 'chvm-zfcp') { if (zfcp2add > 0) { zfcp2add--; - $.cookie('zfcp2add' + out2Id, zfcp2add); + $.cookie('xcat_zfcp2add' + out2Id, zfcp2add, {path: '/xcat', secure:true }); } } @@ -887,10 +893,10 @@ function updateZNodeStatus(data) { var rsp = data.rsp; // Get cookie for number processes performed against this node - var actions = $.cookie(node + 'processes'); + var actions = $.cookie('xcat_' + node + 'processes'); // One less process actions = actions - 1; - $.cookie(node + 'processes', actions); + $.cookie('xcat_' + node + 'processes', actions, {path: '/xcat', secure:true }); if (actions < 1) { // Hide loader when there are no more processes @@ -1116,7 +1122,7 @@ function getZResources(data) { } // Set hardware control point cookie - $.cookie('hcp', hcps); + $.cookie('xcat_hcp', hcps, {path: '/xcat', secure:true }); // Delete loader $('#' + tabId).find('img[src="images/loader.gif"]').remove(); @@ -1137,10 +1143,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } // Query the disk pools for each hcp @@ -1185,10 +1191,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } @@ -1235,10 +1241,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } // Query the networks for each @@ -1442,7 +1448,7 @@ function openAddProcDialog(node) { */ function openAddDiskDialog(node, hcp) { // Get list of disk pools - var cookie = $.cookie(hcp + 'diskpools'); + var cookie = $.cookie('xcat_' + hcp + 'diskpools'); var pools = new Array(); if (cookie) { pools = cookie.split(','); @@ -1605,7 +1611,7 @@ function openAddDiskDialog(node, hcp) { */ function openAddZfcpDialog(node, hcp, zvm) { // Get list of disk pools - var cookie = $.cookie(hcp + 'zfcppools'); + var cookie = $.cookie('xcat_' + hcp + 'zfcppools'); var pools = new Array(); if (cookie) { pools = cookie.split(','); @@ -2492,8 +2498,8 @@ function openAddScsi2SystemDialog(hcp) { var fcpWwpn = $('
Unexpected, no data returned on the lsvm --zfcppool call.'; + if (!info.length) { + info = createInfoBar(msgError); + $('#' + panelId).append(info); + } else { + info.append(msgError); + } + return; + } + if (data.rsp[0].indexOf("Failed") > 0 || data.rsp[0].indexOf("Error") > 0) { + if (typeof console == "object"){ + console.log("Failed on lsvm call for --zfcppool"); + } + var msgError = '
Error: Error on call to check zfcp pools: '+ data.rsp[0]; + // If there is no info bar, create info bar + if (!info.length) { + info = createInfoBar(msgError); + $('#' + panelId).append(info); + } else { + info.append(msgError); + } return; } @@ -4200,13 +4237,14 @@ function loadZfcpPoolTable(data) { tmp = data.rsp[0].split(hcp + ': '); } else { // Provide empty values so the table will be generated + if (typeof console == "object"){ + console.log("Creating empty zfcp pool table."); + } hcp = ''; pool = '' tmp = new Array(); } - // Resource tab ID - var info = $('#' + panelId).find('.ui-state-highlight'); // If there is no info bar, create info bar if (!info.length) { info = createInfoBar('Below are devices that are defined internally in the zFCP pools.'); @@ -4248,7 +4286,8 @@ function loadZfcpPoolTable(data) { tmp[i] = jQuery.trim(tmp[i]); var diskAttrs = tmp[i].split(','); diskAttrs[0] = diskAttrs[0].toLowerCase(); - var key = hcp2zvm[hcp] + '-' + pool + '-' + diskAttrs[2]; + // Key contains row data to be returned when the checkbox is selected + var key = hcp2zvm[hcp] + '-' + pool + '-' + diskAttrs[2] + '-' + diskAttrs[1]; dTable.fnAddData( [ '', hcp2zvm[hcp], pool, diskAttrs[0], diskAttrs[1], diskAttrs[2], diskAttrs[3], diskAttrs[4], diskAttrs[5], diskAttrs[6], diskAttrs[7] ]); } } @@ -4266,6 +4305,9 @@ function loadZfcpPoolTable(data) { // Delete disk from pool var removeLnk = $('Remove'); removeLnk.bind('click', function(event){ + if (typeof console == "object"){ + console.log("Remove button clicked for tableId:"+tableId); + } var disks = getNodesChecked(tableId); openRemoveZfcpFromPoolDialog(disks); }); @@ -4278,10 +4320,10 @@ function loadZfcpPoolTable(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) + hcps = $.cookie('xcat_hcp').split(','); else - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); // Query the disk pools for each zhcpQueryCountForZfcps = hcps.length; @@ -4643,7 +4685,11 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { // Verify disks are in the same zFCP pool var devices = devices2remove.split(','); + if (typeof console == "object"){ + console.log("Entering openRemoveZfcpFromPoolDialog. Device to remove:<"+devices2remove+">"); + } var tmp, tgtPool, tgtHcp; + var tgtPort = ""; var tgtUnitNo = ""; for (var i in devices) { if( !devices[i] || 0 === devices[i].length) continue; @@ -4658,6 +4704,7 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { tgtHcp = tmp[0]; // Assume it is just one zHCP. Otherwise, this cannot be done on multiple zHCPs. tgtUnitNo += tmp[2] + ","; + tgtPort = tmp[3]; } // Strip out last comma @@ -4673,7 +4720,7 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { var pool = $(''); var unitNo = $(''); - var portName = $(''); + var portName = $(''); deleteDiskForm.append(system, pool, unitNo, portName); // Append options for hardware control points @@ -4760,7 +4807,9 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { msg : dialogId }, - success : updateResourceDialog + success : function(data) { + updateResourceDialog(data); + } }); }, "Cancel": function() { @@ -4984,7 +5033,7 @@ function loadNetworkTable(data) { } // Get zVM host names - if (!$.cookie('zvms')) { + if (!$.cookie('xcat_zvms')) { $.ajax({ url : 'lib/cmd.php', dataType : 'json', @@ -5002,7 +5051,7 @@ function loadNetworkTable(data) { }); } - var zvms = $.cookie('zvms').split(','); + var zvms = $.cookie('xcat_zvms').split(','); var hcp2zvm = new Object(); var args, zvm, iHcp, tmp; for (var i in zvms) { @@ -5132,10 +5181,10 @@ function loadNetworkTable(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) + hcps = $.cookie('xcat_hcp').split(','); else - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); // Query networks zhcpQueryCountForNetworks = hcps.length; @@ -5206,7 +5255,7 @@ function connect2GuestLan(data) { $('#' + node + 'StatusBar').find('div').append(prg); // Continue if no errors found - if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1) { + if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1 && data.rsp[0].indexOf("Error") == -1) { // Connect NIC to Guest LAN $.ajax( { url : 'lib/cmd.php', @@ -5261,7 +5310,7 @@ function connect2VSwitch(data) { $('#' + node + 'StatusBar').find('div').append(prg); // Continue if no errors found - if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1) { + if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1 && data.rsp[0].indexOf("Error") == -1) { // Connect NIC to VSwitch $.ajax( { url : 'lib/cmd.php', @@ -5317,7 +5366,7 @@ function createZProvisionExisting(inst) { group.append(groupLabel); // Turn on auto complete for group - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Split group names into an array var tmp = groupNames.split(','); @@ -5363,7 +5412,7 @@ function createZProvisionExisting(inst) { var osSelect = $(''); osSelect.append($('')); - var imageNames = $.cookie('imagenames').split(','); + var imageNames = $.cookie('xcat_imagenames').split(','); if (imageNames) { imageNames.sort(); for (var i in imageNames) { @@ -5542,7 +5591,7 @@ function createZProvisionNew(inst) { var groupInput = $(''); // Get groups on-focus groupInput.one('focus', function(){ - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Turn on auto complete $(this).autocomplete({ @@ -5603,7 +5652,7 @@ function createZProvisionNew(inst) { }, success: function(data) { - if (data.rsp.length && (data.rsp[0].indexOf("Failed") > -1 || data.rsp[0].indexOf("Invalid") > -1) ) { + if (data.rsp.length && (data.rsp[0].indexOf("Failed") > -1 || data.rsp[0].indexOf("Invalid") > -1 || data.rsp[0].indexOf("Error") > -1) ) { // Remove the progress gif, since bailing out removeProvisionLoadingGif(provisionStatusBar); @@ -5711,7 +5760,7 @@ function createZProvisionNew(inst) { console.log("Looking for cookies from <" + zhcpToCheck + ">"); } - if (!$.cookie(zhcpToCheck + 'diskpools')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'diskpools')) { // Get disk pools $.ajax({ url : 'lib/cmd.php', @@ -5732,7 +5781,7 @@ function createZProvisionNew(inst) { checkProvisionCallsDone(provisionStatusBar, ajaxCalls, "diskpoolnames"); } - if (!$.cookie(zhcpToCheck + 'zfcppools')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'zfcppools')) { // Get zFCP pools $.ajax({ url : 'lib/cmd.php', @@ -5753,7 +5802,7 @@ function createZProvisionNew(inst) { checkProvisionCallsDone(provisionStatusBar, ajaxCalls, "zfcppoolnames"); } - if (!$.cookie(zhcpToCheck + 'userprofiles')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'userprofiles')) { // Get zFCP pools $.ajax( { url : 'lib/cmd.php', @@ -5780,7 +5829,7 @@ function createZProvisionNew(inst) { var thisUserProfile = $('#' + thisTabId + ' select[name=userProfile]'); thisUserProfile.children().remove(); - var definedUserProfiles = $.cookie(zhcpToCheck + 'userprofiles').split(','); + var definedUserProfiles = $.cookie('xcat_' + zhcpToCheck + 'userprofiles').split(','); for (var i in definedUserProfiles) { if( !definedUserProfiles[i] || 0 === definedUserProfiles[i].length) continue; thisUserProfile.append(''); @@ -5789,7 +5838,7 @@ function createZProvisionNew(inst) { var thisNetwork = $('#' + thisTabId + ' select[name=network]'); thisNetwork.children().remove(); thisNetwork.append(''); // No profile option - var definedNetworks = $.cookie(zhcpToCheck + 'networks').split(','); + var definedNetworks = $.cookie('xcat_' + zhcpToCheck + 'networks').split(','); for (var i in definedNetworks) { if( !definedNetworks[i] || 0 === definedNetworks[i].length) continue; if (!jQuery.trim(definedNetworks[i])) @@ -5854,7 +5903,7 @@ function createZProvisionNew(inst) { var osSelect = $(''); osSelect.append($('')); - var imageNames = $.cookie('imagenames').split(','); + var imageNames = $.cookie('xcat_imagenames').split(','); if (imageNames) { imageNames.sort(); for (var i in imageNames) { @@ -5939,7 +5988,6 @@ function createZProvisionNew(inst) { '' + ''); var cpuSelect = $('
' + @@ -181,11 +181,11 @@ function checkGangliaRunning(data) { // Get summary data and draw on page $('#gangliaGridSummary').append('Getting grid summary data
');
sendGridSummaryAjax();
-
+
// Get all nodes location data which can support the zoom monitor
$('#gangliaNodes').append('Getting all nodes status ');
sendLocationAjax();
-
+
// Bind the hide/show button event
$('#gangliamon #hidesup').bind('click', function(){
if ('[Hide]' == $(this).text()) {
@@ -193,7 +193,7 @@ function checkGangliaRunning(data) {
} else {
$(this).html('[Hide]');
}
-
+
$('#gangliaGridSummary').toggle();
});
}
@@ -211,16 +211,16 @@ function sendLocationAjax() {
args : 'graph',
msg : ''
},
-
+
success: function(data){
if (!data.rsp[0]) {
return;
}
-
+
extractLocationlData(data.rsp[0]);
// Get nodes current status and draw on the page
sendNodeCurrentAjax();
-
+
// Start the timer to update page per minute
gangliaTimer = window.setTimeout('updateGangliaPage()', 60000);
}
@@ -235,14 +235,14 @@ function extractLocationlData(locationData) {
cechash = new Object();
bladehash = new Object();
rackhash = new Object();
-
+
// Linux nodes which has no parent
linuxArray = new Array();
-
+
// Other unknown nodes only have one parent, use number 1 as there parent
otherhash = new Object();
otherhash[1] = new Array();
-
+
var allnodearray = locationData.split(';');
var temparray;
var parent = '';
@@ -250,7 +250,7 @@ function extractLocationlData(locationData) {
for (var i in allnodearray) {
temparray = allnodearray[i].split(':');
name = temparray[0];
-
+
// If there is not parent (or mpa, or rack) information
parent = temparray[2];
if (!parent) {
@@ -258,26 +258,26 @@ function extractLocationlData(locationData) {
otherhash[1].push(name);
continue;
}
-
+
switch (temparray[1].toLowerCase()) {
case 'blade': {
if (!bladehash[parent]) {
bladehash[parent] = new Array();
}
-
+
bladehash[parent].push(name);
}
break;
-
+
case 'systemx': {
if (!rackhash[parent]) {
rackhash[parent] = new Array();
}
-
+
rackhash[parent].push(name);
}
break;
-
+
case 'frame': {
if (!framehash[name]) {
framehash[name] = new Array();
@@ -289,21 +289,21 @@ function extractLocationlData(locationData) {
if (!framehash[parent]) {
framehash[parent] = new Array();
}
-
+
framehash[parent].push(name);
}
break;
-
+
case 'lpar':
case 'lpar,osi':
case 'osi,lpar': {
if (!cechash[parent]) {
cechash[parent] = new Array();
}
-
+
cechash[parent].push(name);
}
-
+
break;
default: {
otherhash[1].push(name);
@@ -327,7 +327,7 @@ function sendGridSummaryAjax() {
args : 'gangliashow;_grid_;hour;_summary_',
msg : ''
},
-
+
success: function(data) {
createGridSummaryData(data.rsp[0]);
drawGridSummary();
@@ -339,7 +339,7 @@ function sendGridSummaryAjax() {
* Send AJAX request to get nodes current load information
*/
function sendNodeCurrentAjax() {
-
+
// Get all nodes current status
$.ajax({
url : 'lib/cmd.php',
@@ -350,7 +350,7 @@ function sendNodeCurrentAjax() {
args : 'gangliacurrent;node;',
msg : ''
},
-
+
success: function(data){
createNodeStatusData(data.rsp[0]);
drawGangliaNodesArea($('#gangliaorder').val());
@@ -372,7 +372,7 @@ function sendGridCurrentAjax(){
args : 'gangliacurrent;grid',
msg : ''
},
-
+
success: function(data){
updateGridSummaryData(data.rsp[0]);
drawGridSummary();
@@ -381,13 +381,13 @@ function sendGridCurrentAjax(){
}
/**
- * Save the grid summary data to local global variable
+ * Save the grid summary data to local global variable
*/
function createGridSummaryData(summaryString){
// Empty the global data
// The data structure looks like: metric1:time11,val11,time12,val12,...;metric2:time21,val21,time22,val22,...;....
gridData = new Object();
-
+
var metricArray = summaryString.split(';');
var metricname = '';
var valueArray = '';
@@ -395,13 +395,13 @@ function createGridSummaryData(summaryString){
var tempLength = 0;
for (var index = 0; index < metricArray.length; index++) {
position = metricArray[index].indexOf(':');
-
+
// Get the metric name and init its global array to save timestamp and value pair
metricname = metricArray[index].substr(0, position);
gridData[metricname] = new Array();
valueArray = metricArray[index].substr(position + 1).split(',');
tempLength = valueArray.length;
-
+
// Save timestamp and value into global array
for (var i = 0; i < tempLength; i++) {
gridData[metricname].push(Number(valueArray[i]));
@@ -420,7 +420,7 @@ function updateGridSummaryData(currentString){
var tempLength = 0;
var index = 0;
var tempArray;
-
+
tempLength = metricArray.length;
for (index = 0; index < tempLength; index++) {
position = metricArray[index].indexOf(':');
@@ -442,19 +442,19 @@ function drawGridSummary() {
var gridDrawArea = $('#gangliaGridSummary');
var showStr = '';
var tempStr = $('#gangliamon').attr('class');
-
+
// jqflot only draws on the visible area
// If the tab is hide, return directly
if (tempStr.indexOf('hide') != -1) {
return;
}
-
+
if ($('#gangliamon #hidesup').text() == '[Show]') {
return;
}
-
+
gridDrawArea.empty();
- showStr = '
' +
'' +
'' +
'
');
-
+
// Change dialog width
$('#addBladeCenter').dialog('option', 'width', '400');
-
+
typeFS.find('#typeSelect').bind('change', function(){
// Remove any existing warnings
$('#addBladeCenter .ui-state-error').remove();
settingsFS.find('div').remove();
-
+
// Change dialog width
$('#addBladeCenter').dialog('option', 'width', '400');
-
+
var nodeType = $(this).val();
switch (nodeType) {
case 'amm':
@@ -208,17 +208,17 @@ bladePlugin.prototype.addNode = function() {
break;
case 'scan':
settingsFS.append('');
-
+
// Change dialog width
$('#addBladeCenter').dialog('option', 'width', '650');
break;
}
-
+
// Do not continue if node type is AMM
if ($(this).val() == 'amm') {
return;
}
-
+
// Gather AMM nodes
settingsFS.find('select:eq(0)').after(createLoader());
$.ajax({
@@ -234,16 +234,16 @@ bladePlugin.prototype.addNode = function() {
var position = 0;
var tmp = '';
var options = '';
-
+
// Remove the loading image
settingsFS.find('img').remove();
-
+
// Do not continue if no AMM nodes are found
if (data.rsp.length < 1) {
$('#addBladeCenter').prepend(createWarnBar('Please define an AMM node before continuing'));
return;
}
-
+
// Create options for AMM nodes
for (var i in data.rsp){
tmp = data.rsp[i];
@@ -257,7 +257,7 @@ bladePlugin.prototype.addNode = function() {
if (data.msg != 'scan') {
return;
}
-
+
// Create Scan button
var scan = createButton('Scan');
scan.bind('click', function(){
@@ -273,10 +273,10 @@ bladePlugin.prototype.addNode = function() {
args : '',
msg : ''
},
-
+
/**
* Show scanned results for AMM
- *
+ *
* @param data Data returned from HTTP request
*/
success: function(data){
@@ -284,12 +284,12 @@ bladePlugin.prototype.addNode = function() {
}
});
});
-
+
settingsFS.find('select:eq(0)').after(scan);
}
});
});
-
+
// Create dialog for BladeCenter
addNodeForm.dialog({
modal : true,
@@ -306,7 +306,7 @@ bladePlugin.prototype.addNode = function() {
// Remove any existing warnings
$('#addBladeCenter .ui-state-error').remove();
var addMethod = $('#typeSelect').val();
-
+
if (addMethod == "amm") {
addAmmNode();
} else if(addMethod == "blade") {
@@ -320,7 +320,7 @@ bladePlugin.prototype.addNode = function() {
}
}
});
-
+
addNodeForm.find('#typeSelect').trigger('change');
};
@@ -331,16 +331,16 @@ bladePlugin.prototype.addNode = function() {
function addAmmNode(){
var args = '';
var errorMsg = '';
-
+
// Check for missing inputs
$('#addBladeCenter input').each(function(){
if (!$(this).val()) {
errorMsg = 'Please provide a value for each missing field!';
}
-
+
args += $(this).val() + ',';
});
-
+
// Do not continue if error was found
if (errorMsg) {
$('#addBladeCenter').prepend(createWarnBar(errorMsg));
@@ -348,7 +348,7 @@ function addAmmNode(){
}
args = args.substring(0, args.length - 1);
-
+
// Add the loader
$('#addBladeCenter').append(createLoader());
$('.ui-dialog-buttonpane .ui-button').attr('disabled', true);
@@ -385,17 +385,17 @@ function addBladeNode(){
var series = $('#bcSettings input[name="bladeSeries"]:selected').val();
var mpa = $('#bcSettings select[name="bladeMpa"]').val();
- var args = '-t;node;-o;' + name
- + ';id=' + id
- + ';nodetype=osi;groups=' + group
- + ';mgt=blade;mpa=' + mpa
+ var args = '-t;node;-o;' + name
+ + ';id=' + id
+ + ';nodetype=osi;groups=' + group
+ + ';mgt=blade;mpa=' + mpa
+ ';serialflow=hard';
-
+
// Set the serial speed and port for LS series blade
if (series != 'js') {
args += ';serialspeed=19200;serialport=1';
}
-
+
// Check for missing inputs
if (!name || !group || !id || !mpa) {
$('#addBladeCenter').prepend(createWarnBar("Please provide a value for each missing field!"));
@@ -427,7 +427,7 @@ function addBladeNode(){
// Append response message to dialog
$('#addBladeCenter').prepend(createInfoBar(rspMessage));
-
+
// Change dialog button
$('#addBladeCenter').dialog("option", "buttons", {
"Close" : function() {
@@ -440,29 +440,29 @@ function addBladeNode(){
/**
* Show rscan results
- *
+ *
* @param results Results from rscan of blade MPA
*/
function showScanAmmResult(results){
var rSection = $('');
-
+
// Create table to hold results
var rTable = $('It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.'); diff --git a/xCAT-UI/js/custom/customUtils.js b/xCAT-UI/js/custom/customUtils.js index 51ab0498b..56b10854c 100644 --- a/xCAT-UI/js/custom/customUtils.js +++ b/xCAT-UI/js/custom/customUtils.js @@ -1,6 +1,6 @@ /** * Create nodes datatable for a given group - * + * * @param group Group name * @param outId Division ID to append datatable * @return Nodes datatable @@ -19,26 +19,26 @@ function createNodesDatatable(group, outId) { /** * Create nodes datatable - * + * * @param data Data returned from HTTP request */ success : function(data) { // Data returned var rsp = data.rsp; - + // Get output ID var outId = data.msg; // Get datatable ID var dTableId = outId.replace('DIV', ''); - + // Node attributes hash var attrs = new Object(); // Node attributes var headers = new Object(); - + // Clear nodes datatable division $('#' + outId).empty(); - + // Create nodes datatable var node = null; var args; @@ -48,22 +48,22 @@ function createNodesDatatable(group, outId) { if (pos > -1) { var temp = rsp[i].split(': '); node = jQuery.trim(temp[1]); - + // Create a hash for the node attributes attrs[node] = new Object(); i++; } - + // Get key and value args = rsp[i].split('='); var key = jQuery.trim(args[0]); var val = jQuery.trim(args[1]); - + // Create hash table attrs[node][key] = val; headers[key] = 1; } - + // Sort headers var sorted = new Array(); for ( var key in headers) { @@ -73,14 +73,14 @@ function createNodesDatatable(group, outId) { } } sorted.sort(); - + // Add column for check box and node sorted.unshift('', 'node'); - + // Create nodes datatable var dTable = new DataTable(dTableId); dTable.init(sorted); - + // Go through each node for ( var node in attrs) { // Create a row @@ -88,7 +88,7 @@ function createNodesDatatable(group, outId) { // Create a check box var checkBx = ''; row.push(checkBx, node); - + // Go through each header for ( var i = 2; i < sorted.length; i++) { // Add node attributes to the row @@ -100,11 +100,11 @@ function createNodesDatatable(group, outId) { row.push(''); } } - + // Add row to table dTable.add(row); } - + $('#' + outId).append(dTable.object()); $('#' + dTableId).dataTable({ 'iDisplayLength': 50, @@ -120,7 +120,7 @@ function createNodesDatatable(group, outId) { } } }); - + // Fix table styling $('#' + dTableId + '_wrapper .dataTables_filter label').css('width', '250px'); } // End of function(data) @@ -129,7 +129,7 @@ function createNodesDatatable(group, outId) { /** * Create provision existing node division - * + * * @param plugin Plugin name to create division for * @param inst Provision tab instance * @return Provision existing node division @@ -145,7 +145,7 @@ function createProvisionExisting(plugin, inst) { // Turn on auto complete for group var dTableDivId = plugin + 'NodesDatatableDIV' + inst; // Division ID where nodes datatable will be appended - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Split group names into an array var tmp = groupNames.split(','); @@ -215,7 +215,7 @@ function createProvisionExisting(plugin, inst) { var osLabel = $(''); var osInput = $(''); osInput.one('focus', function() { - var tmp = $.cookie('osvers'); + var tmp = $.cookie('xcat_osvers'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -232,7 +232,7 @@ function createProvisionExisting(plugin, inst) { var archLabel = $(''); var archInput = $(''); archInput.one('focus', function() { - var tmp = $.cookie('osarchs'); + var tmp = $.cookie('xcat_osarchs'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -249,7 +249,7 @@ function createProvisionExisting(plugin, inst) { var profileLabel = $(''); var profileInput = $(''); profileInput.one('focus', function() { - var tmp = $.cookie('profiles'); + var tmp = $.cookie('xcat_profiles'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -276,7 +276,7 @@ function createProvisionExisting(plugin, inst) { /** * Create provision new node division - * + * * @param inst Provision tab instance * @return Provision new node division */ @@ -293,7 +293,7 @@ function createProvisionNew(plugin, inst) { var groupLabel = $(''); var groupInput = $(''); groupInput.one('focus', function() { - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Turn on auto complete $(this).autocomplete({ @@ -336,7 +336,7 @@ function createProvisionNew(plugin, inst) { var osLabel = $(''); var osInput = $(''); osInput.one('focus', function() { - var tmp = $.cookie('osvers'); + var tmp = $.cookie('xcat_osvers'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -353,7 +353,7 @@ function createProvisionNew(plugin, inst) { var archLabel = $(''); var archInput = $(''); archInput.one('focus', function() { - var tmp = $.cookie('osarchs'); + var tmp = $.cookie('xcat_osarchs'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -370,7 +370,7 @@ function createProvisionNew(plugin, inst) { var profileLabel = $(''); var profileInput = $(''); profileInput.one('focus', function() { - var tmp = $.cookie('profiles'); + var tmp = $.cookie('xcat_profiles'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -397,31 +397,31 @@ function createProvisionNew(plugin, inst) { /** * Create section to provision node - * + * * @param plugin Plugin name * @param container Container to hold provision section */ function appendProvisionSection(plugin, container) { // Get provision tab ID var tabId = container.parents('.tab').attr('id'); - - if (plugin == 'quick') + + if (plugin == 'quick') appendProvision4Url(container); // For provisioning based on argmunents found in URL else appendProvision4NoUrl(plugin, container); - + // Add provision button var provisionBtn = createButton('Provision'); provisionBtn.bind('click', function(){ provisionNode(tabId); }); container.append(provisionBtn); - + // Bind image select to change event container.find('select[name=image]').bind('change', function() { createAdvancedOptions($(this).val(), tabId); }); - + $.ajax({ url : 'lib/cmd.php', dataType : 'json', @@ -441,15 +441,15 @@ function appendProvisionSection(plugin, container) { $('#' + tabId).prepend(createWarnBar('Please run copycds and genimage in provision page before continuing!')); return; } - + for (i in data.rsp) { imageName = data.rsp[i]; position = imageName.indexOf(' '); imageName = imageName.substr(0, position); - + $('#' + tabId + ' select[name=image]').append($('')); } - + // Trigger select change event $('#' + tabId + ' select[name=image]').trigger('change'); // Show provision button @@ -460,102 +460,102 @@ function appendProvisionSection(plugin, container) { /** * Create provision node section using URL - * + * * @param container Container to hold provision section * @returns Nothing */ -function appendProvision4Url(container){ +function appendProvision4Url(container){ // Create node fieldset var nodeFS = $(''); var nodeLegend = $(''); nodeFS.append(nodeLegend); container.append(nodeFS); - + var nodeAttr = $(''); nodeFS.append($('
Select a group to view its nodes
Install Ganglia monitoring
');
}
}
@@ -709,11 +709,11 @@ function createAdvancedOptions(image, outId) {
/**
* Create nodes table
- *
+ *
* @param group Group name
* @param outId Output section ID
*/
-function createNodesTable(group, outId) {
+function createNodesTable(group, outId) {
// Get group nodes
$.ajax({
url : 'lib/cmd.php',
@@ -728,26 +728,26 @@ function createNodesTable(group, outId) {
success : function(data) {
var outId = $(data.msg);
var nodes = data.rsp;
-
+
// Create table to hold nodes
var nTable = $('Profiles
').click(function () { @@ -34,11 +34,11 @@ esxPlugin.prototype.loadConfigPage = function(tabId) { // Add info bar $('#esxConfigProfile').append(createInfoBar('Not yet supported')); - + // Resize accordion configAccordion.accordion('resize'); }); - + // Create accordion panel for images var imgSection = $(''); var imgLnk = $('Images
').click(function () { @@ -50,7 +50,7 @@ esxPlugin.prototype.loadConfigPage = function(tabId) { queryImages('esxConfigImages'); }); - + // Create accordion panel for groups var groupsSection = $(''); var groupsLnk = $('Groups
').click(function () { @@ -62,17 +62,17 @@ esxPlugin.prototype.loadConfigPage = function(tabId) { queryGroups('esxConfigGroups'); }); - + configAccordion.append(profileLnk, profileSection, imgLnk, imgSection, groupsLnk, groupsSection); $('#' + tabId).append(configAccordion); configAccordion.accordion(); - + profileLnk.trigger('click'); }; /** * Migrate node - * + * * @param node Node to migrate */ esxPlugin.prototype.loadMigratePage = function(node) { @@ -81,7 +81,7 @@ esxPlugin.prototype.loadMigratePage = function(node) { /** * Clone node (service page) - * + * * @param node Node to clone */ esxPlugin.prototype.serviceClone = function(node) { @@ -90,7 +90,7 @@ esxPlugin.prototype.serviceClone = function(node) { /** * Load provision page (service page) - * + * * @param tabId * Tab ID where page will reside * @return Nothing @@ -101,23 +101,23 @@ esxPlugin.prototype.loadServiceProvisionPage = function(tabId) { /** * Show node inventory (service page) - * + * * @param data Data from HTTP request */ esxPlugin.prototype.loadServiceInventory = function(data) { - + }; /** * Load node inventory - * + * * @param data Data from HTTP request */ esxPlugin.prototype.loadInventory = function(data) { var args = data.msg.split(','); var tabId = args[0].replace('out=', ''); var node = args[1].replace('node=', ''); - + // Get node inventory var inv = data.rsp; @@ -127,12 +127,12 @@ esxPlugin.prototype.loadInventory = function(data) { // Create division to hold inventory var invDivId = tabId + 'Inventory'; var invDiv = $(''); - + // Create a fieldset var fieldSet = $(''); var legend = $(''); fieldSet.append(legend); - + var oList = $(''; } - + // Show return message if (message) $('#addEsx').prepend(createInfoBar(message)); @@ -638,7 +638,7 @@ function addEsxNode(){ /** * Update the provision node status - * + * * @param data Data returned from HTTP request */ function updateESXProvisionStatus(data) { @@ -650,24 +650,24 @@ function updateESXProvisionStatus(data) { var cmd = args[0].replace('cmd=', ''); // Get provision tab instance var inst = args[1].replace('out=', ''); - + // Get provision tab and status bar ID var statBarId = 'kvmProvisionStatBar' + inst; var tabId = 'kvmProvisionTab' + inst; - + var node = $('#' + tabId + ' input[name=node]').val(); - + /** * (2) Create virtual machine */ if (cmd == 'chdef') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); // Get parameters var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val(); - + // Begin installation $.ajax( { url : 'lib/cmd.php', @@ -681,19 +681,19 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); - } - + } + /** * (3) Prepare node for boot */ if (cmd == 'mkvm') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Get provision method var boot = $('#' + tabId + ' select[name=bootMethod]').val(); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -708,14 +708,14 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); } - + /** * (4) Power on node */ if (cmd == 'nodeset') { - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -730,16 +730,16 @@ function updateESXProvisionStatus(data) { success : updateESXProvisionStatus }); } - + /** * (5) Done */ else if (cmd == 'rpower') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); $('#' + statBarId).find('img').remove(); - + // If installation was successful if (prg.html().indexOf('Error') == -1) { $('#' + statBarId).find('div').append('
It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.'); diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js index 839d94d60..8adf1c915 100644 --- a/xCAT-UI/js/custom/ipmi.js +++ b/xCAT-UI/js/custom/ipmi.js @@ -14,7 +14,7 @@ var ipmiPlugin = function() { /** * Steps for hardware discovery wizard - * + * * @return Discovery steps */ ipmiPlugin.prototype.getStep = function() { @@ -37,7 +37,7 @@ ipmiPlugin.prototype.getNextFunction = function() { /** * Load node inventory - * + * * @param data Data from HTTP request */ ipmiPlugin.prototype.loadInventory = function(data) { @@ -82,7 +82,7 @@ ipmiPlugin.prototype.loadInventory = function(data) { /** * Load clone page - * + * * @param node Source node to clone */ ipmiPlugin.prototype.loadClonePage = function(node) { @@ -108,7 +108,7 @@ ipmiPlugin.prototype.loadClonePage = function(node) { /** * Load provision page - * + * * @param tabId The provision tab ID */ ipmiPlugin.prototype.loadProvisionPage = function(tabId) { @@ -297,7 +297,7 @@ function addIdataplex() { /** * Create provision existing node division - * + * * @param inst Provision tab instance * @return Provision existing node division */ @@ -336,7 +336,7 @@ function createIpmiProvisionExisting(inst) { var dTableDivId = 'ipmiNodesDatatableDIV' + inst; // Division ID where // nodes datatable will // be appended - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Split group names into an array var tmp = groupNames.split(','); @@ -397,7 +397,7 @@ function createIpmiProvisionExisting(inst) { var osLabel = $(''); var osInput = $(''); osInput.one('focus', function() { - var tmp = $.cookie('osvers'); + var tmp = $.cookie('xcat_osvers'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -414,7 +414,7 @@ function createIpmiProvisionExisting(inst) { var archLabel = $(''); var archInput = $(''); archInput.one('focus', function() { - var tmp = $.cookie('osarchs'); + var tmp = $.cookie('xcat_osarchs'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -431,7 +431,7 @@ function createIpmiProvisionExisting(inst) { var profileLabel = $(''); var profileInput = $(''); profileInput.one('focus', function() { - var tmp = $.cookie('profiles'); + var tmp = $.cookie('xcat_profiles'); if (tmp) { // Turn on auto complete $(this).autocomplete({ @@ -553,7 +553,7 @@ function createIpmiProvisionExisting(inst) { /** * Update the provision existing node status - * + * * @param data Data returned from HTTP request */ function updateIpmiProvisionExistingStatus(data) { @@ -645,17 +645,17 @@ function idataplexInitBasic() { } showString += '
per Frame:
BMCs:
Switches:
per Switch:
Profiles
').click(function () { @@ -32,11 +32,11 @@ kvmPlugin.prototype.loadConfigPage = function(tabId) { // Add info bar $('#kvmConfigProfile').append(createInfoBar('Not yet supported')); - + // Resize accordion configAccordion.accordion('resize'); }); - + // Create accordion panel for images var imgSection = $(''); var imgLnk = $('Images
').click(function () { @@ -48,7 +48,7 @@ kvmPlugin.prototype.loadConfigPage = function(tabId) { queryImages('kvmConfigImages'); }); - + // Create accordion panel for groups var groupsSection = $(''); var groupsLnk = $('Groups
').click(function () { @@ -60,17 +60,17 @@ kvmPlugin.prototype.loadConfigPage = function(tabId) { queryGroups('kvmConfigGroups'); }); - + configAccordion.append(profileLnk, profileSection, imgLnk, imgSection, groupsLnk, groupsSection); $('#' + tabId).append(configAccordion); configAccordion.accordion(); - + profileLnk.trigger('click'); }; /** * Migrate node - * + * * @param node Node to migrate */ kvmPlugin.prototype.loadMigratePage = function(node) { @@ -79,7 +79,7 @@ kvmPlugin.prototype.loadMigratePage = function(node) { /** * Clone node (service page) - * + * * @param node Node to clone */ kvmPlugin.prototype.serviceClone = function(node) { @@ -88,7 +88,7 @@ kvmPlugin.prototype.serviceClone = function(node) { /** * Load provision page (service page) - * + * * @param tabId Tab ID where page will reside */ kvmPlugin.prototype.loadServiceProvisionPage = function(tabId) { @@ -97,23 +97,23 @@ kvmPlugin.prototype.loadServiceProvisionPage = function(tabId) { /** * Show node inventory (service page) - * + * * @param data Data from HTTP request */ kvmPlugin.prototype.loadServiceInventory = function(data) { - + }; /** * Load node inventory - * + * * @param data Data from HTTP request */ kvmPlugin.prototype.loadInventory = function(data) { var args = data.msg.split(','); var tabId = args[0].replace('out=', ''); var node = args[1].replace('node=', ''); - + // Get node inventory var inv = data.rsp; @@ -122,12 +122,12 @@ kvmPlugin.prototype.loadInventory = function(data) { // Create division to hold inventory var invDiv = $(''); - + // Create a fieldset var fieldSet = $(''); var legend = $(''); fieldSet.append(legend); - + var oList = $(''; } - + // Show return message if (message) $('#addKvm').prepend(createInfoBar(message)); @@ -633,7 +633,7 @@ function addKvmNode(){ /** * Update the provision node status - * + * * @param data Data returned from HTTP request */ function updateKVMProvisionStatus(data) { @@ -645,24 +645,24 @@ function updateKVMProvisionStatus(data) { var cmd = args[0].replace('cmd=', ''); // Get provision tab instance var inst = args[1].replace('out=', ''); - + // Get provision tab and status bar ID var statBarId = 'kvmProvisionStatBar' + inst; var tabId = 'kvmProvisionTab' + inst; - + var node = $('#' + tabId + ' input[name=node]').val(); - + /** * (2) Create virtual machine */ if (cmd == 'chdef') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); // Get parameters var disk = $('#' + tabId + ' input[name=disk]').val() + $('#' + tabId + ' select[name=diskUnit]').val(); - + // Begin installation $.ajax( { url : 'lib/cmd.php', @@ -676,19 +676,19 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); - } - + } + /** * (3) Prepare node for boot */ if (cmd == 'mkvm') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Get provision method var boot = $('#' + tabId + ' select[name=bootMethod]').val(); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -703,14 +703,14 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); } - + /** * (4) Power on node */ if (cmd == 'nodeset') { - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); - + // Prepare node for boot $.ajax( { url : 'lib/cmd.php', @@ -725,16 +725,16 @@ function updateKVMProvisionStatus(data) { success : updateKVMProvisionStatus }); } - + /** * (5) Done */ else if (cmd == 'rpower') { // Write ajax response to status bar - var prg = writeRsp(rsp, ''); + var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); $('#' + statBarId).find('img').remove(); - + // If installation was successful if (prg.html().indexOf('Error') == -1) { $('#' + statBarId).find('div').append('
It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.'); diff --git a/xCAT-UI/js/custom/zvm.js b/xCAT-UI/js/custom/zvm.js index 98e1311d6..9d6525481 100644 --- a/xCAT-UI/js/custom/zvm.js +++ b/xCAT-UI/js/custom/zvm.js @@ -166,7 +166,7 @@ zvmPlugin.prototype.loadServiceProvisionPage = function(tabId) { loadGoldenImages(imgCol); // Get zVM host names - if (!$.cookie('zvms')){ + if (!$.cookie('xcat_zvms')){ $.ajax( { url : 'lib/srv_cmd.php', dataType : 'json', @@ -669,7 +669,7 @@ zvmPlugin.prototype.loadClonePage = function(node, nodeOS, nodeArch) { var groupLabel = $(''); var groupInput = $(''); groupInput.one('focus', function(){ - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Turn on auto complete $(this).autocomplete({ @@ -704,7 +704,7 @@ zvmPlugin.prototype.loadClonePage = function(node, nodeOS, nodeArch) { } // Get list of disk pools var temp = hcp.split('.'); - var diskPools = $.cookie(temp[0] + 'diskpools'); + var diskPools = $.cookie('xcat_' + temp[0] + 'diskpools'); // Create disk pool input var poolDiv = $(''); @@ -992,7 +992,7 @@ zvmPlugin.prototype.loadInventory = function(data) { // Get node var node = args[1].replace('node=', ''); // Clear any existing cookie - $.cookie(node + 'processes', null); + $.cookie('xcat_' + node + 'processes', null, {path: '/xcat', secure:true }); // Remove loader $('#' + tabId).find('img').remove(); @@ -1127,7 +1127,7 @@ zvmPlugin.prototype.loadInventory = function(data) { // Start off an ajax request to save the zhcp node name // in a cookie for possible later use by addNic dialog var hcpHostname = attrs['hcp']; - if (!$.cookie(node+'_hcpnodename')){ + if (!$.cookie('xcat_' + node+'_hcpnodename')){ $.ajax( { url : 'lib/cmd.php', dataType : 'json', @@ -2310,7 +2310,7 @@ zvmPlugin.prototype.addNode = function() { * @param tgtNode Targets to migrate */ zvmPlugin.prototype.loadMigratePage = function(tgtNode, fromhcp) { - var hosts = $.cookie('zvms').split(','); + var hosts = $.cookie('xcat_zvms').split(','); var radio, zvmBlock, args; var zvms = new Array(); var hcp = new Object(); diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js index 33926ad27..3ff044834 100644 --- a/xCAT-UI/js/custom/zvmUtils.js +++ b/xCAT-UI/js/custom/zvmUtils.js @@ -124,7 +124,7 @@ function loadHcpInfo(data) { if (userEntry[0].indexOf('Failed') < 0) { if (hcp) { // If there is no cookie for the disk pool names - if (!$.cookie(hcp + 'diskpools') || $.cookie(hcp + 'diskpools') === null) { + if (!$.cookie('xcat_' + hcp + 'diskpools') || $.cookie('xcat_' + hcp + 'diskpools') === null) { if (nodeInfoBar !== null) { nodeInfoBar.append("
Finding pools and networks..."); findingPools = 1; @@ -152,7 +152,7 @@ function loadHcpInfo(data) { } // If there is no cookie for the zFCP pool names - if (!$.cookie(hcp + 'zfcppools') || $.cookie(hcp + 'zfcppools') === null) { + if (!$.cookie('xcat_' + hcp + 'zfcppools') || $.cookie('xcat_' + hcp + 'zfcppools') === null) { if (nodeInfoBar !== null) { if (findingPools = 0) { @@ -183,7 +183,7 @@ function loadHcpInfo(data) { } // If there is no cookie for the network names - if (!$.cookie(hcp + 'networks') || $.cookie(hcp + 'networks') === null) { + if (!$.cookie('xcat_' + hcp + 'networks') || $.cookie('xcat_' + hcp + 'networks') === null) { if (nodeInfoBar !== null) { if (findingPools = 0) { @@ -374,13 +374,13 @@ function loadUserEntry(data) { */ function incrementNodeProcess(node) { // Get current processes - var procs = $.cookie(node + 'processes'); + var procs = $.cookie('xcat_' + node + 'processes'); if (procs) { // One more process procs = parseInt(procs) + 1; - $.cookie(node + 'processes', procs); + $.cookie('xcat_' + node + 'processes', procs); } else { - $.cookie(node + 'processes', 1); + $.cookie('xcat_' + node + 'processes', 1); } } @@ -517,7 +517,7 @@ function updateZProvisionNewStatus(data) { // Set cookie for number of disks var diskRows = $('#' + tabId + ' table:eq(0):visible tbody tr'); - $.cookie('disks2add' + out2Id, diskRows.length); + $.cookie('xcat_disks2add' + out2Id, diskRows.length, {path: '/xcat', secure:true }); if (diskRows.length > 0) { for (var i = 0; i < diskRows.length; i++) { var diskArgs = diskRows.eq(i).find('td'); @@ -558,7 +558,7 @@ function updateZProvisionNewStatus(data) { // Set cookie for number of zFCP devices var zfcpRows = $('#' + tabId + ' table:eq(1):visible tbody tr'); - $.cookie('zfcp2add' + out2Id, zfcpRows.length); + $.cookie('xcat_zfcp2add' + out2Id, zfcpRows.length, {path: '/xcat', secure:true }); if (zfcpRows.length > 0) { for ( var i = 0; i < zfcpRows.length; i++) { var diskArgs = zfcpRows.eq(i).find('td'); @@ -581,10 +581,16 @@ function updateZProvisionNewStatus(data) { var args = '--addzfcp;' + pool + ';' + address + ';' + loaddev + ';' + size; if (tag && tag != "null") { args += ';' + tag; + } else { + args += ';'; } if (portName && tag != "null") { args += ';' + portName; + } else { + args += ';'; } if (unitNo && tag != "null") { args += ';' + unitNo; + } else { + args += ';'; } // Attach zFCP device to node @@ -625,19 +631,19 @@ function updateZProvisionNewStatus(data) { } else { // Set cookie for number of disks // One less disk to add - var disks2add = $.cookie('disks2add' + out2Id); + var disks2add = $.cookie('xcat_disks2add' + out2Id); if (lastCmd == 'chvm-disk') { if (disks2add > 0) { disks2add--; - $.cookie('disks2add' + out2Id, disks2add); + $.cookie('xcat_disks2add' + out2Id, disks2add, {path: '/xcat', secure:true }); } } - var zfcp2add = $.cookie('zfcp2add' + out2Id); + var zfcp2add = $.cookie('xcat_zfcp2add' + out2Id); if (lastCmd == 'chvm-zfcp') { if (zfcp2add > 0) { zfcp2add--; - $.cookie('zfcp2add' + out2Id, zfcp2add); + $.cookie('xcat_zfcp2add' + out2Id, zfcp2add, {path: '/xcat', secure:true }); } } @@ -887,10 +893,10 @@ function updateZNodeStatus(data) { var rsp = data.rsp; // Get cookie for number processes performed against this node - var actions = $.cookie(node + 'processes'); + var actions = $.cookie('xcat_' + node + 'processes'); // One less process actions = actions - 1; - $.cookie(node + 'processes', actions); + $.cookie('xcat_' + node + 'processes', actions, {path: '/xcat', secure:true }); if (actions < 1) { // Hide loader when there are no more processes @@ -1116,7 +1122,7 @@ function getZResources(data) { } // Set hardware control point cookie - $.cookie('hcp', hcps); + $.cookie('xcat_hcp', hcps, {path: '/xcat', secure:true }); // Delete loader $('#' + tabId).find('img[src="images/loader.gif"]').remove(); @@ -1137,10 +1143,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } // Query the disk pools for each hcp @@ -1185,10 +1191,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } @@ -1235,10 +1241,10 @@ function getZResources(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) { - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) { + hcps = $.cookie('xcat_hcp').split(','); } else { - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); } // Query the networks for each @@ -1442,7 +1448,7 @@ function openAddProcDialog(node) { */ function openAddDiskDialog(node, hcp) { // Get list of disk pools - var cookie = $.cookie(hcp + 'diskpools'); + var cookie = $.cookie('xcat_' + hcp + 'diskpools'); var pools = new Array(); if (cookie) { pools = cookie.split(','); @@ -1605,7 +1611,7 @@ function openAddDiskDialog(node, hcp) { */ function openAddZfcpDialog(node, hcp, zvm) { // Get list of disk pools - var cookie = $.cookie(hcp + 'zfcppools'); + var cookie = $.cookie('xcat_' + hcp + 'zfcppools'); var pools = new Array(); if (cookie) { pools = cookie.split(','); @@ -2492,8 +2498,8 @@ function openAddScsi2SystemDialog(hcp) { var fcpWwpn = $('
Unexpected, no data returned on the lsvm --zfcppool call.'; + if (!info.length) { + info = createInfoBar(msgError); + $('#' + panelId).append(info); + } else { + info.append(msgError); + } + return; + } + if (data.rsp[0].indexOf("Failed") > 0 || data.rsp[0].indexOf("Error") > 0) { + if (typeof console == "object"){ + console.log("Failed on lsvm call for --zfcppool"); + } + var msgError = '
Error: Error on call to check zfcp pools: '+ data.rsp[0]; + // If there is no info bar, create info bar + if (!info.length) { + info = createInfoBar(msgError); + $('#' + panelId).append(info); + } else { + info.append(msgError); + } return; } @@ -4200,13 +4237,14 @@ function loadZfcpPoolTable(data) { tmp = data.rsp[0].split(hcp + ': '); } else { // Provide empty values so the table will be generated + if (typeof console == "object"){ + console.log("Creating empty zfcp pool table."); + } hcp = ''; pool = '' tmp = new Array(); } - // Resource tab ID - var info = $('#' + panelId).find('.ui-state-highlight'); // If there is no info bar, create info bar if (!info.length) { info = createInfoBar('Below are devices that are defined internally in the zFCP pools.'); @@ -4248,7 +4286,8 @@ function loadZfcpPoolTable(data) { tmp[i] = jQuery.trim(tmp[i]); var diskAttrs = tmp[i].split(','); diskAttrs[0] = diskAttrs[0].toLowerCase(); - var key = hcp2zvm[hcp] + '-' + pool + '-' + diskAttrs[2]; + // Key contains row data to be returned when the checkbox is selected + var key = hcp2zvm[hcp] + '-' + pool + '-' + diskAttrs[2] + '-' + diskAttrs[1]; dTable.fnAddData( [ '', hcp2zvm[hcp], pool, diskAttrs[0], diskAttrs[1], diskAttrs[2], diskAttrs[3], diskAttrs[4], diskAttrs[5], diskAttrs[6], diskAttrs[7] ]); } } @@ -4266,6 +4305,9 @@ function loadZfcpPoolTable(data) { // Delete disk from pool var removeLnk = $('Remove'); removeLnk.bind('click', function(event){ + if (typeof console == "object"){ + console.log("Remove button clicked for tableId:"+tableId); + } var disks = getNodesChecked(tableId); openRemoveZfcpFromPoolDialog(disks); }); @@ -4278,10 +4320,10 @@ function loadZfcpPoolTable(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) + hcps = $.cookie('xcat_hcp').split(','); else - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); // Query the disk pools for each zhcpQueryCountForZfcps = hcps.length; @@ -4643,7 +4685,11 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { // Verify disks are in the same zFCP pool var devices = devices2remove.split(','); + if (typeof console == "object"){ + console.log("Entering openRemoveZfcpFromPoolDialog. Device to remove:<"+devices2remove+">"); + } var tmp, tgtPool, tgtHcp; + var tgtPort = ""; var tgtUnitNo = ""; for (var i in devices) { if( !devices[i] || 0 === devices[i].length) continue; @@ -4658,6 +4704,7 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { tgtHcp = tmp[0]; // Assume it is just one zHCP. Otherwise, this cannot be done on multiple zHCPs. tgtUnitNo += tmp[2] + ","; + tgtPort = tmp[3]; } // Strip out last comma @@ -4673,7 +4720,7 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { var pool = $(''); var unitNo = $(''); - var portName = $(''); + var portName = $(''); deleteDiskForm.append(system, pool, unitNo, portName); // Append options for hardware control points @@ -4760,7 +4807,9 @@ function openRemoveZfcpFromPoolDialog(devices2remove) { msg : dialogId }, - success : updateResourceDialog + success : function(data) { + updateResourceDialog(data); + } }); }, "Cancel": function() { @@ -4984,7 +5033,7 @@ function loadNetworkTable(data) { } // Get zVM host names - if (!$.cookie('zvms')) { + if (!$.cookie('xcat_zvms')) { $.ajax({ url : 'lib/cmd.php', dataType : 'json', @@ -5002,7 +5051,7 @@ function loadNetworkTable(data) { }); } - var zvms = $.cookie('zvms').split(','); + var zvms = $.cookie('xcat_zvms').split(','); var hcp2zvm = new Object(); var args, zvm, iHcp, tmp; for (var i in zvms) { @@ -5132,10 +5181,10 @@ function loadNetworkTable(data) { // Create a array for hardware control points var hcps = new Array(); - if ($.cookie('hcp').indexOf(',') > -1) - hcps = $.cookie('hcp').split(','); + if ($.cookie('xcat_hcp').indexOf(',') > -1) + hcps = $.cookie('xcat_hcp').split(','); else - hcps.push($.cookie('hcp')); + hcps.push($.cookie('xcat_hcp')); // Query networks zhcpQueryCountForNetworks = hcps.length; @@ -5206,7 +5255,7 @@ function connect2GuestLan(data) { $('#' + node + 'StatusBar').find('div').append(prg); // Continue if no errors found - if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1) { + if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1 && data.rsp[0].indexOf("Error") == -1) { // Connect NIC to Guest LAN $.ajax( { url : 'lib/cmd.php', @@ -5261,7 +5310,7 @@ function connect2VSwitch(data) { $('#' + node + 'StatusBar').find('div').append(prg); // Continue if no errors found - if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1) { + if (data.rsp.length && data.rsp[0].indexOf("Failed") == -1 && data.rsp[0].indexOf("Error") == -1) { // Connect NIC to VSwitch $.ajax( { url : 'lib/cmd.php', @@ -5317,7 +5366,7 @@ function createZProvisionExisting(inst) { group.append(groupLabel); // Turn on auto complete for group - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Split group names into an array var tmp = groupNames.split(','); @@ -5363,7 +5412,7 @@ function createZProvisionExisting(inst) { var osSelect = $(''); osSelect.append($('')); - var imageNames = $.cookie('imagenames').split(','); + var imageNames = $.cookie('xcat_imagenames').split(','); if (imageNames) { imageNames.sort(); for (var i in imageNames) { @@ -5542,7 +5591,7 @@ function createZProvisionNew(inst) { var groupInput = $(''); // Get groups on-focus groupInput.one('focus', function(){ - var groupNames = $.cookie('groups'); + var groupNames = $.cookie('xcat_groups'); if (groupNames) { // Turn on auto complete $(this).autocomplete({ @@ -5603,7 +5652,7 @@ function createZProvisionNew(inst) { }, success: function(data) { - if (data.rsp.length && (data.rsp[0].indexOf("Failed") > -1 || data.rsp[0].indexOf("Invalid") > -1) ) { + if (data.rsp.length && (data.rsp[0].indexOf("Failed") > -1 || data.rsp[0].indexOf("Invalid") > -1 || data.rsp[0].indexOf("Error") > -1) ) { // Remove the progress gif, since bailing out removeProvisionLoadingGif(provisionStatusBar); @@ -5711,7 +5760,7 @@ function createZProvisionNew(inst) { console.log("Looking for cookies from <" + zhcpToCheck + ">"); } - if (!$.cookie(zhcpToCheck + 'diskpools')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'diskpools')) { // Get disk pools $.ajax({ url : 'lib/cmd.php', @@ -5732,7 +5781,7 @@ function createZProvisionNew(inst) { checkProvisionCallsDone(provisionStatusBar, ajaxCalls, "diskpoolnames"); } - if (!$.cookie(zhcpToCheck + 'zfcppools')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'zfcppools')) { // Get zFCP pools $.ajax({ url : 'lib/cmd.php', @@ -5753,7 +5802,7 @@ function createZProvisionNew(inst) { checkProvisionCallsDone(provisionStatusBar, ajaxCalls, "zfcppoolnames"); } - if (!$.cookie(zhcpToCheck + 'userprofiles')) { + if (!$.cookie('xcat_' + zhcpToCheck + 'userprofiles')) { // Get zFCP pools $.ajax( { url : 'lib/cmd.php', @@ -5780,7 +5829,7 @@ function createZProvisionNew(inst) { var thisUserProfile = $('#' + thisTabId + ' select[name=userProfile]'); thisUserProfile.children().remove(); - var definedUserProfiles = $.cookie(zhcpToCheck + 'userprofiles').split(','); + var definedUserProfiles = $.cookie('xcat_' + zhcpToCheck + 'userprofiles').split(','); for (var i in definedUserProfiles) { if( !definedUserProfiles[i] || 0 === definedUserProfiles[i].length) continue; thisUserProfile.append(''); @@ -5789,7 +5838,7 @@ function createZProvisionNew(inst) { var thisNetwork = $('#' + thisTabId + ' select[name=network]'); thisNetwork.children().remove(); thisNetwork.append(''); // No profile option - var definedNetworks = $.cookie(zhcpToCheck + 'networks').split(','); + var definedNetworks = $.cookie('xcat_' + zhcpToCheck + 'networks').split(','); for (var i in definedNetworks) { if( !definedNetworks[i] || 0 === definedNetworks[i].length) continue; if (!jQuery.trim(definedNetworks[i])) @@ -5854,7 +5903,7 @@ function createZProvisionNew(inst) { var osSelect = $(''); osSelect.append($('')); - var imageNames = $.cookie('imagenames').split(','); + var imageNames = $.cookie('xcat_imagenames').split(','); if (imageNames) { imageNames.sort(); for (var i in imageNames) { @@ -5939,7 +5988,6 @@ function createZProvisionNew(inst) { '' + ''); var cpuSelect = $('
Grid Overview
' + '[Hide]' + @@ -181,11 +181,11 @@ function checkGangliaRunning(data) { // Get summary data and draw on page $('#gangliaGridSummary').append('Getting grid summary data
');
sendGridSummaryAjax();
-
+
// Get all nodes location data which can support the zoom monitor
$('#gangliaNodes').append('Getting all nodes status ');
sendLocationAjax();
-
+
// Bind the hide/show button event
$('#gangliamon #hidesup').bind('click', function(){
if ('[Hide]' == $(this).text()) {
@@ -193,7 +193,7 @@ function checkGangliaRunning(data) {
} else {
$(this).html('[Hide]');
}
-
+
$('#gangliaGridSummary').toggle();
});
}
@@ -211,16 +211,16 @@ function sendLocationAjax() {
args : 'graph',
msg : ''
},
-
+
success: function(data){
if (!data.rsp[0]) {
return;
}
-
+
extractLocationlData(data.rsp[0]);
// Get nodes current status and draw on the page
sendNodeCurrentAjax();
-
+
// Start the timer to update page per minute
gangliaTimer = window.setTimeout('updateGangliaPage()', 60000);
}
@@ -235,14 +235,14 @@ function extractLocationlData(locationData) {
cechash = new Object();
bladehash = new Object();
rackhash = new Object();
-
+
// Linux nodes which has no parent
linuxArray = new Array();
-
+
// Other unknown nodes only have one parent, use number 1 as there parent
otherhash = new Object();
otherhash[1] = new Array();
-
+
var allnodearray = locationData.split(';');
var temparray;
var parent = '';
@@ -250,7 +250,7 @@ function extractLocationlData(locationData) {
for (var i in allnodearray) {
temparray = allnodearray[i].split(':');
name = temparray[0];
-
+
// If there is not parent (or mpa, or rack) information
parent = temparray[2];
if (!parent) {
@@ -258,26 +258,26 @@ function extractLocationlData(locationData) {
otherhash[1].push(name);
continue;
}
-
+
switch (temparray[1].toLowerCase()) {
case 'blade': {
if (!bladehash[parent]) {
bladehash[parent] = new Array();
}
-
+
bladehash[parent].push(name);
}
break;
-
+
case 'systemx': {
if (!rackhash[parent]) {
rackhash[parent] = new Array();
}
-
+
rackhash[parent].push(name);
}
break;
-
+
case 'frame': {
if (!framehash[name]) {
framehash[name] = new Array();
@@ -289,21 +289,21 @@ function extractLocationlData(locationData) {
if (!framehash[parent]) {
framehash[parent] = new Array();
}
-
+
framehash[parent].push(name);
}
break;
-
+
case 'lpar':
case 'lpar,osi':
case 'osi,lpar': {
if (!cechash[parent]) {
cechash[parent] = new Array();
}
-
+
cechash[parent].push(name);
}
-
+
break;
default: {
otherhash[1].push(name);
@@ -327,7 +327,7 @@ function sendGridSummaryAjax() {
args : 'gangliashow;_grid_;hour;_summary_',
msg : ''
},
-
+
success: function(data) {
createGridSummaryData(data.rsp[0]);
drawGridSummary();
@@ -339,7 +339,7 @@ function sendGridSummaryAjax() {
* Send AJAX request to get nodes current load information
*/
function sendNodeCurrentAjax() {
-
+
// Get all nodes current status
$.ajax({
url : 'lib/cmd.php',
@@ -350,7 +350,7 @@ function sendNodeCurrentAjax() {
args : 'gangliacurrent;node;',
msg : ''
},
-
+
success: function(data){
createNodeStatusData(data.rsp[0]);
drawGangliaNodesArea($('#gangliaorder').val());
@@ -372,7 +372,7 @@ function sendGridCurrentAjax(){
args : 'gangliacurrent;grid',
msg : ''
},
-
+
success: function(data){
updateGridSummaryData(data.rsp[0]);
drawGridSummary();
@@ -381,13 +381,13 @@ function sendGridCurrentAjax(){
}
/**
- * Save the grid summary data to local global variable
+ * Save the grid summary data to local global variable
*/
function createGridSummaryData(summaryString){
// Empty the global data
// The data structure looks like: metric1:time11,val11,time12,val12,...;metric2:time21,val21,time22,val22,...;....
gridData = new Object();
-
+
var metricArray = summaryString.split(';');
var metricname = '';
var valueArray = '';
@@ -395,13 +395,13 @@ function createGridSummaryData(summaryString){
var tempLength = 0;
for (var index = 0; index < metricArray.length; index++) {
position = metricArray[index].indexOf(':');
-
+
// Get the metric name and init its global array to save timestamp and value pair
metricname = metricArray[index].substr(0, position);
gridData[metricname] = new Array();
valueArray = metricArray[index].substr(position + 1).split(',');
tempLength = valueArray.length;
-
+
// Save timestamp and value into global array
for (var i = 0; i < tempLength; i++) {
gridData[metricname].push(Number(valueArray[i]));
@@ -420,7 +420,7 @@ function updateGridSummaryData(currentString){
var tempLength = 0;
var index = 0;
var tempArray;
-
+
tempLength = metricArray.length;
for (index = 0; index < tempLength; index++) {
position = metricArray[index].indexOf(':');
@@ -442,19 +442,19 @@ function drawGridSummary() {
var gridDrawArea = $('#gangliaGridSummary');
var showStr = '';
var tempStr = $('#gangliamon').attr('class');
-
+
// jqflot only draws on the visible area
// If the tab is hide, return directly
if (tempStr.indexOf('hide') != -1) {
return;
}
-
+
if ($('#gangliamon #hidesup').text() == '[Show]') {
return;
}
-
+
gridDrawArea.empty();
- showStr = '| ' + + showStr = ' |
| ' + ' | ' + ' | |||||
| ' + @@ -470,7 +470,7 @@ function drawGridSummary() { /** * Draw the load flot by data (summary data or one node data) - * + * * @param areaid Which DIV draw this flot * @param loadpair The load timestamp and value pair * @param cpupair The CPU number and value pair @@ -481,7 +481,7 @@ function drawLoadFlot(areaid, titleprefix, loadpair, cpupair) { var index = 0; var yaxismax = 0; var interval = 1; - + $('#' + areaid).empty(); // Parse load pair, the timestamp must mutiply 1000, javascript time stamp is millisecond for (index = 0; index < loadpair.length; index += 2) { @@ -490,7 +490,7 @@ function drawLoadFlot(areaid, titleprefix, loadpair, cpupair) { yaxismax = loadpair[index + 1]; } } - + // Parse cpu pair for (index = 0; index < cpupair.length; index += 2) { cpunum.push([cpupair[index] * 1000, cpupair[index + 1]]); @@ -498,12 +498,12 @@ function drawLoadFlot(areaid, titleprefix, loadpair, cpupair) { yaxismax = cpupair[index + 1]; } } - + interval = parseInt(yaxismax / 3); if (interval < 1) { interval = 1; } - + $.jqplot(areaid, [load, cpunum], { title: titleprefix + ' Loads/Procs Last Hour', axes:{ @@ -531,7 +531,7 @@ function drawLoadFlot(areaid, titleprefix, loadpair, cpupair) { /** * Draw the CPU usage flot by data (maybe summary data or one node data) - * + * * @param areaid Which DIV draw this flot * @param titleprefix Title used name * @param cpupair The CPU timestamp and value pair @@ -539,15 +539,15 @@ function drawLoadFlot(areaid, titleprefix, loadpair, cpupair) { function drawCpuFlot(areaid, titleprefix, cpupair) { var cpu = new Array(); var index = 0; - + $('#' + areaid).empty(); - + // Time stamp should be mutiplied by 1000 // We get the CPU idle from server for (index = 0; index < cpupair.length; index +=2) { cpu.push([(cpupair[index] * 1000), (100 - cpupair[index + 1])]); } - + $.jqplot(areaid, [cpu],{ title: titleprefix + ' Cpu Use Last Hour', axes:{ @@ -571,7 +571,7 @@ function drawCpuFlot(areaid, titleprefix, cpupair) { /** * Draw the memory usage flot by data (summary data or one node data) - * + * * @param areaid Which DIV draw this flot * @param titleprefix Title used name * @param cpupair The CPU timestamp and value pair @@ -581,14 +581,14 @@ function drawMemFlot(areaid, titleprefix, freepair, totalpair){ var total = new Array(); var tempsize = 0; var index = 0; - + $('#' + areaid).empty(); if (freepair.length < totalpair.length) { tempsize = freepair.length; } else { tempsize = freepair.length; } - + for (index = 0; index < tempsize; index += 2) { var temptotal = totalpair[index + 1]; var tempuse = temptotal - freepair[index + 1]; @@ -597,7 +597,7 @@ function drawMemFlot(areaid, titleprefix, freepair, totalpair){ total.push([totalpair[index] * 1000, temptotal]); use.push([freepair[index] * 1000, tempuse]); } - + $.jqplot(areaid, [use, total], { title: titleprefix + ' Memory Use Last Hour', axes:{ @@ -625,7 +625,7 @@ function drawMemFlot(areaid, titleprefix, freepair, totalpair){ /** * Draw the disk usage flot by data (summary data or one node's data) - * + * * @param areaid Which div draw this flot * @param titleprefix Title used name * @param freepair The free disk number, Ganglia only logs the free data @@ -636,21 +636,21 @@ function drawDiskFlot(areaid, titleprefix, freepair, totalpair) { var total = new Array(); var tempsize = 0; var index = 0; - + $('#' + areaid).empty(); if (freepair.length < totalpair.length) { tempsize = freepair.length; } else{ tempsize = freepair.length; } - + for (index = 0; index < tempsize; index += 2) { var temptotal = totalpair[index + 1]; var tempuse = temptotal - freepair[index + 1]; total.push([totalpair[index] * 1000, temptotal]); use.push([freepair[index] * 1000, tempuse]); } - + $.jqplot(areaid, [use, total], { title: titleprefix + ' Disk Use Last Hour', axes:{ @@ -678,7 +678,7 @@ function drawDiskFlot(areaid, titleprefix, freepair, totalpair) { /** * Draw the network load flot by data (summary data or one node data) - * + * * @param areaid Which div draw this flot * @param titleprefix Title used name * @param inpair The timestamp and value pair for download @@ -691,19 +691,19 @@ function drawNetworkFlot(areaid, titleprefix, inpair, outpair) { var maxvalue = 0; var unitname = 'B'; var divisor = 1; - + for (index = 0; index < inpair.length; index += 2) { if (inpair[index + 1] > maxvalue) { maxvalue = inpair[index + 1]; } } - + for (index = 0; index < outpair.length; index += 2) { if (outpair[index + 1] > maxvalue) { maxvalue = outpair[index + 1]; } } - + if (maxvalue > 3000000) { divisor = 1000000; unitname = 'GB'; @@ -713,15 +713,15 @@ function drawNetworkFlot(areaid, titleprefix, inpair, outpair) { } else { // Do nothing } - + for (index = 0; index < inpair.length; index += 2) { inArray.push([(inpair[index] * 1000), (inpair[index + 1] / divisor)]); } - + for (index = 0; index < outpair.length; index += 2) { outArray.push([(outpair[index] * 1000), (outpair[index + 1] / divisor)]); } - + $.jqplot(areaid, [inArray, outArray], { title: titleprefix + ' Network Last Hour', axes:{ @@ -749,7 +749,7 @@ function drawNetworkFlot(areaid, titleprefix, inpair, outpair) { /** * Create node status data - * + * * @param nodesStatus Node status */ function createNodeStatusData(nodesStatus) { @@ -759,15 +759,15 @@ function createNodeStatusData(nodesStatus) { var index = 0; var tempArray; var tempStr = ''; - + for (index in nodePath) { delete(nodePath[index]); } - + for (index in nodeStatus) { delete(nodeStatus[index]); } - + for (index = 0; index < nodesArray.length; index++) { tempStr = nodesArray[index]; position = tempStr.indexOf(':'); @@ -785,18 +785,18 @@ function createNodeStatusData(nodesStatus) { */ function drawGangliaNodesArea() { var position = 0; - + // Find out the last child's type and name var currentobj = $('#zoomDiv span:last'); var type = currentobj.attr('name').toLowerCase(); var name = currentobj.text(); position = name.indexOf('('); - + if (position > -1) { name = name.substr(3, position - 3); } $('#gangliaNodes').empty(); - + switch (type) { // Draw the node current status case 'blade': @@ -806,7 +806,7 @@ function drawGangliaNodesArea() { drawGangliaNodesAreaPic(type, name); } break; - + // Draw a summary table case 'all': case 'frame': { @@ -825,7 +825,7 @@ function drawGangliaNodesAreaPic(type, name) { var showStr = ''; var nodename = ''; var temparray; - + switch(type) { case 'blade': { arraypoint = bladehash[name]; @@ -846,10 +846,10 @@ function drawGangliaNodesAreaPic(type, name) { break; } $('#gangliaNodes').html(' |
' . $tmp . ''; ob_flush(); @@ -180,7 +180,7 @@ function submit_request($req, $skipVerify, $opts_array){ $rsp = FALSE; } } - + return $rsp; } @@ -201,10 +201,10 @@ function xorcrypt($data, $key) { * Get password */ function getpassword() { - if (isset($GLOBALS['xcatauthsecret'])) { - $cryptext = $GLOBALS['xcatauthsecret']; - } else if (isset($_COOKIE["xcatauthsecret"])) { - $cryptext = $_COOKIE["xcatauthsecret"]; + if (isset($GLOBALS['xcat_authsecret'])) { + $cryptext = $GLOBALS['xcat_authsecret']; + } else if (isset($_COOKIE["xcat_authsecret"])) { + $cryptext = $_COOKIE["xcat_authsecret"]; } else { return false; } @@ -214,7 +214,7 @@ function getpassword() { /** * Get the password splitting knowledge between server and client side persistant storage. - * Caller should regenerate session ID when contemplating a new user/password, + * Caller should regenerate session ID when contemplating a new user/password, * to preclude session fixation, though fixation is limited without the secret. * * @param $password Password @@ -226,8 +226,8 @@ function setpassword($password) { // Non-ascii characters, encode it in base64 $cryptext = base64_encode($cryptext); - setcookie("xcatauthsecret",$cryptext,0,'/'); - $GLOBALS["xcatauthsecret"] = $cryptext; + setcookie("xcat_authsecret",$cryptext,0,'/xcat','',true); + $GLOBALS["xcat_authsecret"] = $cryptext; $_SESSION["secretkey"] = $key; } @@ -342,18 +342,31 @@ function isRootAcess() { * Log out of current user session */ function logout() { + session_start(); // Clear the secret cookie from browser - if (isset($_COOKIE["xcatauthsecret"])) { - setcookie("xcatauthsecret",'',time()-86400*7,'/'); + if (isset($_COOKIE["xcat_authsecret"])) { + setcookie("xcat_authsecret",'',time()-86400*7,'/xcat','',true); + } + + // Clear any cookies where the key starts with "xcat_" + foreach ($_COOKIE as $key => $value) { + if (substr($key,0,5) === "xcat_") { + unset($_COOKIE[$key]); + setcookie($key, null, time() - 3600, '/xcat','',true); + } } // Expire session cookie if (isset($_COOKIE[session_name()])) { - setcookie(session_name(),"",time()-86400*7,"/"); + setcookie(session_name(),"",time()-86400*7,"/xcat",'',true); } + // Clear session id + setcookie(session_id(),"",time()-86400*7,"/"); + // Clear server store of data $_SESSION=array(); + session_destroy(); } /** diff --git a/xCAT-UI/lib/srv_functions.php b/xCAT-UI/lib/srv_functions.php index 6dafe540e..4481eba3c 100644 --- a/xCAT-UI/lib/srv_functions.php +++ b/xCAT-UI/lib/srv_functions.php @@ -208,10 +208,10 @@ function format_TBD($str) { * Get password */ function getpassword() { - if (isset($GLOBALS['xcatauthsecret'])) { - $cryptext = $GLOBALS['xcatauthsecret']; - } else if (isset($_COOKIE["xcatauthsecret"])) { - $cryptext = $_COOKIE["xcatauthsecret"]; + if (isset($GLOBALS['xcat_authsecret'])) { + $cryptext = $GLOBALS['xcat_authsecret']; + } else if (isset($_COOKIE["xcat_authsecret"])) { + $cryptext = $_COOKIE["xcat_authsecret"]; } else { return false; } @@ -233,8 +233,8 @@ function setpassword($password) { // Non-ascii characters, encode it in base64 $cryptext = base64_encode($cryptext); - setcookie("xcatauthsecret",$cryptext,0,'/'); - $GLOBALS["xcatauthsecret"] = $cryptext; + setcookie("xcat_authsecret",$cryptext,0,'/xcat','',true); + $GLOBALS["xcat_authsecret"] = $cryptext; $_SESSION["secretkey"] = $key; } @@ -285,13 +285,13 @@ function isAuthenticated() { */ function logout() { // Clear the secret cookie from browser - if (isset($_COOKIE["xcatauthsecret"])) { - setcookie("xcatauthsecret",'',time()-86400*7,'/'); + if (isset($_COOKIE["xcat_authsecret"])) { + setcookie("xcat_authsecret",'',time()-86400*7,'/xcat','',true); } // Expire session cookie if (isset($_COOKIE[session_name()])) { - setcookie(session_name(),"",time()-86400*7,"/"); + setcookie(session_name(),"",time()-86400*7,"/xcat",'',true); } // Clear server store of data diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index 0881b8f8a..15b714315 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -1,12 +1,12 @@ Summary: Web Client for xCAT 2 Name: xCAT-UI Version: %{?version:%{version}}%{!?version:%(cat Version)} -Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} +Release: %{?release:%{release}}%{!?release:%(cat Release)} License: EPL Group: Applications/System -URL: http://xcat.org +URL: https://xcat.org/ Packager: IBM -Vendor: IBM +Vendor: IBM Corp. Source: xCAT-UI-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root diff --git a/xCAT-buildkit/debian/compat b/xCAT-buildkit/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-buildkit/debian/compat +++ b/xCAT-buildkit/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-buildkit/debian/control b/xCAT-buildkit/debian/control index dfe2c644d..ee045d41e 100644 --- a/xCAT-buildkit/debian/control +++ b/xCAT-buildkit/debian/control @@ -1,11 +1,11 @@ Source: xcat-buildkit Section: admin Priority: extra -Maintainer: xu qing