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

CLOUDSTACK-5252: UI > Infrastructure > Virtual Routers > Select view: group by zone/pod/cluster > (1) pass listAll=true to listRouters. (2) reduce redundant API call.

This commit is contained in:
Jessica Wang 2013-12-10 14:40:51 -08:00
parent 1605e55ebd
commit c80b45c9ed
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ui/scripts/system.js
View File

@ -8246,19 +8246,21 @@
var zoneObjs = json.listzonesresponse.zone;
if (zoneObjs != null) {
for (var i = 0; i < zoneObjs.length; i++) {
var currentPage = 1;
$.ajax({
url: createURL('listRouters'),
data: {
zoneid: zoneObjs[i].id
zoneid: zoneObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
async: false,
success: function(json) {
if (json.listroutersresponse.count != undefined) {
zoneObjs[i].routerCount = json.listroutersresponse.count;
var routerCountFromAllPages = zoneObjs[i].routerCount;
var currentPage = 1;
var routerCountFromFirstPageToCurrentPage = 0;
zoneObjs[i].routerCount = json.listroutersresponse.count;
var routerCountFromAllPages = json.listroutersresponse.count;
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
var callListApiWithPage = function() {
$.ajax({
@ -8266,6 +8268,7 @@
async: false,
data: {
zoneid: zoneObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
@ -8284,7 +8287,10 @@
}
});
}
callListApiWithPage();
if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
currentPage++;
callListApiWithPage();
}
zoneObjs[i].routerRequiresUpgrade = routerRequiresUpgrade;
} else {
@ -8465,26 +8471,29 @@
var podObjs = json.listpodsresponse.pod;
if (podObjs != null) {
for (var i = 0; i < podObjs.length; i++) {
$.ajax({
var currentPage = 1;
$.ajax({
url: createURL('listRouters'),
data: {
podid: podObjs[i].id
podid: podObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
async: false,
success: function (json) {
if (json.listroutersresponse.count != undefined) {
podObjs[i].routerCount = json.listroutersresponse.count;
var routerCountFromAllPages = podObjs[i].routerCount;
var currentPage = 1;
var routerCountFromFirstPageToCurrentPage = 0;
var routerRequiresUpgrade = 0;
var routerCountFromAllPages = json.listroutersresponse.count;
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
var callListApiWithPage = function () {
$.ajax({
url: createURL('listRouters'),
async: false,
data: {
podid: podObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
@ -8502,8 +8511,11 @@
}
}
});
}
callListApiWithPage();
}
if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
currentPage++;
callListApiWithPage();
}
podObjs[i].routerRequiresUpgrade = routerRequiresUpgrade;
} else {
@ -8686,19 +8698,21 @@
var clusterObjs = json.listclustersresponse.cluster;
if (clusterObjs != null) {
for (var i = 0; i < clusterObjs.length; i++) {
$.ajax({
var currentPage = 1;
$.ajax({
url: createURL('listRouters'),
data: {
clusterid: clusterObjs[i].id
clusterid: clusterObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
async: false,
success: function (json) {
if (json.listroutersresponse.count != undefined) {
clusterObjs[i].routerCount = json.listroutersresponse.count;
var routerCountFromAllPages = clusterObjs[i].routerCount;
var currentPage = 1;
var routerCountFromFirstPageToCurrentPage = 0;
var routerCountFromAllPages = json.listroutersresponse.count;
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
var callListApiWithPage = function () {
$.ajax({
@ -8706,6 +8720,7 @@
async: false,
data: {
clusterid: clusterObjs[i].id,
listAll: true,
page: currentPage,
pagesize: pageSize //global variable
},
@ -8724,7 +8739,10 @@
}
});
}
callListApiWithPage();
if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
currentPage++;
callListApiWithPage();
}
clusterObjs[i].routerRequiresUpgrade = routerRequiresUpgrade;
} else {