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

CLOUDSTACK-4713: EIP/ELB Basic Zone: UI > Network > IP Addresses > make extra API call to get IPs allocated at guest network.

Browse Source
This commit is contained in:
Jessica Wang 2013-09-19 18:34:42 -07:00
parent 94e744fe0c
commit 47384e30cc
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ui/scripts/network.js
View File

@ -2054,30 +2054,14 @@
}, },
dataProvider: function(args) { dataProvider: function(args) {
var data = {}; var items = [];
var data = {};
listViewDataProvider(args, data); listViewDataProvider(args, data);
//The following 10 lines caused CLOUDSTACK-4713 (EIP/ELB Basic Zone - unable to see any IPs that are acquired)
/*
if (g_supportELB == "guest") // IPs are allocated on guest network
$.extend(data, {
forvirtualnetwork: false,
forloadbalancing: true
});
else if (g_supportELB == "public") // IPs are allocated on public network
$.extend(data, {
forvirtualnetwork: true,
forloadbalancing: true
});
*/
if (args.context.networks) { if (args.context.networks) {
$.extend(data, { $.extend(data, {
associatedNetworkId: args.context.networks[0].id associatedNetworkId: args.context.networks[0].id
}); });
} }
if ("vpc" in args.context) { if ("vpc" in args.context) {
$.extend(data, { $.extend(data, {
vpcid: args.context.vpc[0].id vpcid: args.context.vpc[0].id
@ -2086,25 +2070,47 @@
$.ajax({ $.ajax({
url: createURL('listPublicIpAddresses'), url: createURL('listPublicIpAddresses'),
data: data, data: $.extend({}, data, {
forvirtualnetwork: true, //IPs are allocated on public network
}),
dataType: "json", dataType: "json",
async: true, async: false,
success: function(json) { success: function(json) {
var items = json.listpublicipaddressesresponse.publicipaddress; var ips = json.listpublicipaddressesresponse.publicipaddress;
if(ips != null) {
$(items).each(function() { for(var i = 0; i < ips.length; i++) {
getExtaPropertiesForIpObj(this, args); getExtaPropertiesForIpObj(ips[i], args);
}); items.push(ips[i]);
}
args.response.success({ }
actionFilter: actionFilters.ipAddress,
data: items
});
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
} }
}); });
if (g_supportELB == "guest") {
$.ajax({
url: createURL('listPublicIpAddresses'),
data: $.extend({}, data, {
forvirtualnetwork: false, // ELB IPs are allocated on guest network
forloadbalancing: true
}),
dataType: "json",
async: false,
success: function(json) {
var ips = json.listpublicipaddressesresponse.publicipaddress;
if(ips != null) {
for(var i = 0; i < ips.length; i++) {
getExtaPropertiesForIpObj(ips[i], args);
items.push(ips[i]);
}
}
}
});
}
args.response.success({
actionFilter: actionFilters.ipAddress,
data: items
});
}, },
// Detail view // Detail view