apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13553: network page - display all networks instead of only isolated networks with SourceNAT, shared networks with LB, StaticNat,SecurityGroup.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-09 13:07:04 -08:00
parent 5bfe6be091
commit c6a78e056d
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/scripts/network.js
View File

@ -259,46 +259,23 @@
break; break;
} }
} }
} }
//temporary until Alena fixes listNetworks API to return both isolated and shared networks in one call
var networkObjs1 = [];
$.ajax({ $.ajax({
url: createURL("listNetworks&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), url: createURL("listNetworks&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
data: { data: {
type: 'isolated',
supportedServices: 'SourceNat',
listAll: true listAll: true
}, },
dataType: 'json', dataType: 'json',
async: false, async: false,
success: function(data) { success: function(data) {
if(data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0) args.response.success({
networkObjs1 = data.listnetworksresponse.network; data: data.listnetworksresponse.network
});
}, },
error: function(data) { error: function(data) {
args.response.error(parseXMLHttpResponse(data)); args.response.error(parseXMLHttpResponse(data));
} }
}); });
var networkObjs2 = [];
$.ajax({
url: createURL("listNetworks&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
data: {
type: 'shared',
supportedServices: 'Lb,StaticNat,SecurityGroup',
listAll: true
},
async: false,
success: function(data) {
if(data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0)
networkObjs2 = data.listnetworksresponse.network;
}
});
var networkObjs = $.extend(networkObjs1, networkObjs2);
args.response.success({
data: networkObjs
});
}, },
detailView: { detailView: {