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

CLOUDSTACK-5200: UI > Infrastructure > Sockets > listView > fix a bug that Hosts and Sockets displayed wrong number.

This commit is contained in:
Jessica Wang 2013-12-04 14:10:24 -08:00
parent e85334ff51
commit 19e855e5dc
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ui/scripts/system.js
View File

@ -392,19 +392,22 @@
var currentPage = 1;
var returnedHostCount = 0;
var returnedHostCpusocketsSum = 0;
var returnedHostHavingCpusockets = true;
var callListHostsWithPage = function(setTotalHostCount) {
$.ajax({
url: createURL('listHosts'),
async: false,
data: {
type: 'routing',
hypervisortype: hypervisor.name,
hypervisor: hypervisor.name,
page: currentPage,
pagesize: pageSize //global variable
},
success: function(json) {
success: function(json) {
if (json.listhostsresponse.count == undefined) {
return;
}
if (setTotalHostCount) {
totalHostCount = json.listhostsresponse.count;
}
@ -414,9 +417,7 @@
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) {
@ -428,10 +429,8 @@
}
callListHostsWithPage(true);
if (returnedHostHavingCpusockets) {
socketCount += returnedHostCpusocketsSum;
}
socketCount += returnedHostCpusocketsSum;
})
});
}
@ -7496,19 +7495,22 @@
var currentPage = 1;
var returnedHostCount = 0;
var returnedHostCpusocketsSum = 0;
var returnedHostHavingCpusockets = true;
var callListHostsWithPage = function(setTotalHostCount) {
$.ajax({
url: createURL('listHosts'),
async: false,
data: {
type: 'routing',
hypervisortype: hypervisor.name,
hypervisor: hypervisor.name,
page: currentPage,
pagesize: pageSize //global variable
},
success: function(json) {
success: function(json) {
if (json.listhostsresponse.count == undefined) {
return;
}
if (setTotalHostCount) {
totalHostCount = json.listhostsresponse.count;
}
@ -7518,9 +7520,7 @@
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) {
@ -7532,11 +7532,11 @@
}
callListHostsWithPage(true);
return {
hypervisor: hypervisor.name,
hosts: totalHostCount,
sockets: (returnedHostHavingCpusockets? returnedHostCpusocketsSum : 'unknown')
sockets: returnedHostCpusocketsSum
};
})
});