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

CLOUDSTACK-4069: listNetworkOfferings API has been changed to not return system-owned network offerings to regular user(domain user). Therefore, change UI to determine whether a network is EIP/ELB upon listNetworks API response instead of listNetworkOfferings API response.

Browse Source
This commit is contained in:
Jessica Wang 2013-08-08 16:21:51 -07:00
parent 99c3e4f3f5
commit 9c5b293fe0
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ui/scripts/network.js
View File

@ -1964,34 +1964,35 @@
if (zoneObj.networktype == 'Basic') {
var havingEIP = false,
havingELB = false;
$.ajax({
url: createURL('listNetworkOfferings'),
data: {
id: args.context.networks[0].networkofferingid
},
async: false,
success: function(json) {
$(json.listnetworkofferingsresponse.networkoffering[0].service).each(function() {
var thisService = this;
if (thisService.name == "StaticNat") {
$(thisService.capability).each(function() {
if (this.name == "ElasticIp" && this.value == "true") {
havingELB = false;
var services = args.context.networks[0].service;
if(services != null) {
for(var i = 0; i < services.length; i++) {
var thisService = services[i];
var capabilities = thisService.capability;
if (thisService.name == "StaticNat") {
if(capabilities != null) {
for(var k = 0; k < capabilities.length; k++) {
if (capabilities[k].name == "ElasticIp" && capabilities[k].value == "true") {
havingEIP = true;
return false; //break $.each() loop
break;
}
});
} else if (thisService.name == "Lb") {
$(thisService.capability).each(function() {
if (this.name == "ElasticLb" && this.value == "true") {
havingELB = true;
return false; //break $.each() loop
}
}
} else if (thisService.name == "Lb") {
if(capabilities != null) {
for(var k = 0; k < capabilities.length; k++) {
if (capabilities[k].name == "ElasticLb" && capabilities[k].value == "true") {
havingELB = true;
break;
}
});
}
});
}
});
}
}
}
}
}
if (havingEIP != true || havingELB != true) { //not EIP-ELB
return false; //acquire new IP is not allowed in non-EIP-ELB basic zone
}