etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4908: UI > Infrastructure > Sockets > (1) calculate total number of CPU Sockets for all hypervisors. 

(2) > view all > calculate CPU Sockets for each hypervisor.
This commit is contained in:
Jessica Wang 2013-11-05 11:55:06 -08:00
parent fdf7639eb8
commit c61d2eedf4
2 changed files with 99 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/scripts/sharedFunctions.js
View File

@ -46,6 +46,7 @@ var md5HashedLogin = false;
//page size for API call (e.g."listXXXXXXX&pagesize=N" )
var pageSize = 20;
//var pageSize = 1; //for testing only
var rootAccountId = 1;

113
ui/scripts/system.js
View File

@ -380,9 +380,64 @@
}
},
socketInfo: function(data) {
socketInfo: function(data) {
var socketCount = 0;
$.ajax({
url: createURL('listHypervisors'),
async: false,
success: function(json) {
args.response.success({
data: $(json.listhypervisorsresponse.hypervisor).map(function(index, hypervisor) {
var totalHostCount = 0;
var currentPage = 1;
var returnedHostCount = 0;
var returnedHostCpusocketsSum = 0;
var returnedHostHavingCpusockets = true;
var callListHostsWithPage = function(setTotalHostCount) {
$.ajax({
url: createURL('listHosts'),
async: false,
data: {
hypervisortype: hypervisor.name,
page: currentPage,
pagesize: pageSize //global variable
},
success: function(json) {
if (setTotalHostCount) {
totalHostCount = json.listhostsresponse.count;
}
returnedHostCount += json.listhostsresponse.host.length;
var items = json.listhostsresponse.host;
for (var i = 0; i < items.length; i++) {
if (items[i].cpusockets != undefined && isNaN(items[i].cpusockets) == false) {
returnedHostCpusocketsSum += items[i].cpusockets;
} else {
returnedHostHavingCpusockets = false;
}
}
if (returnedHostCount < totalHostCount) {
currentPage++;
callListHostsWithPage(false);
}
}
});
}
callListHostsWithPage(true);
if (returnedHostHavingCpusockets) {
socketCount += returnedHostCpusocketsSum;
}
})
});
}
});
complete($.extend(data, {
socketCount: 0
socketCount: socketCount
}));
}
};
@ -7135,22 +7190,50 @@
success: function(json) {
args.response.success({
data: $(json.listhypervisorsresponse.hypervisor).map(function(index, hypervisor) {
var hostCount;
$.ajax({
url: createURL('listHosts'),
async: false,
data: {
hypervisortype: hypervisor.name
},
success: function(json) {
hostCount = json.listhostsresponse.count;
}
});
var totalHostCount = 0;
var currentPage = 1;
var returnedHostCount = 0;
var returnedHostCpusocketsSum = 0;
var returnedHostHavingCpusockets = true;
var callListHostsWithPage = function(setTotalHostCount) {
$.ajax({
url: createURL('listHosts'),
async: false,
data: {
hypervisortype: hypervisor.name,
page: currentPage,
pagesize: pageSize //global variable
},
success: function(json) {
if (setTotalHostCount) {
totalHostCount = json.listhostsresponse.count;
}
returnedHostCount += json.listhostsresponse.host.length;
var items = json.listhostsresponse.host;
for (var i = 0; i < items.length; i++) {
if (items[i].cpusockets != undefined && isNaN(items[i].cpusockets) == false) {
returnedHostCpusocketsSum += items[i].cpusockets;
} else {
returnedHostHavingCpusockets = false;
}
}
if (returnedHostCount < totalHostCount) {
currentPage++;
callListHostsWithPage(false);
}
}
});
}
callListHostsWithPage(true);
return {
hypervisor: hypervisor.name,
hosts: hostCount,
sockets: 0
hosts: totalHostCount,
sockets: (returnedHostHavingCpusockets? returnedHostCpusocketsSum : 'unknown')
};
})
});