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

bug 13965 

For regular user, don't do list physical networks API call on instance
wizard
This commit is contained in:
Brian Federle 2012-02-23 12:14:47 -08:00 committed by Salvatore Orlando
parent 3a3dbd2465
commit 8b1daa5466
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ui/scripts/instances.js
View File

@ -315,10 +315,55 @@
});
<<<<<<< HEAD
var apiCmd = "listNetworkOfferings&guestiptype=Isolated&supportedServices=sourceNat&state=Enabled&specifyvlan=false&zoneid=" + args.currentData.zoneid ;
var array1 = [];
var guestTrafficTypeTotal = 0;
=======
//get network offerings (begin) ***
if (isAdmin()) {
$.ajax({
url: createURL('listPhysicalNetworks'),
data: {
zoneid: args.currentData.zoneid
},
async: false,
success: function(json) {
physicalNetworkObjs = json.listphysicalnetworksresponse.physicalnetwork;
}
});
}
var apiCmd = "listNetworkOfferings&guestiptype=Isolated&supportedServices=sourceNat&state=Enabled&specifyvlan=false";
var array1 = [];
if(physicalNetworkObjs != null && physicalNetworkObjs.length > 1) { //multiple physical networks
var guestTrafficTypeTotal = 0;
for(var i = 0; i < physicalNetworkObjs.length; i++) {
if(guestTrafficTypeTotal > 1) //as long as guestTrafficTypeTotal > 1, break for loop, don't need to continue to count. It doesn't matter whether guestTrafficTypeTotal is 2 or 3 or 4 or 5 or more. We only care whether guestTrafficTypeTotal is greater than 1.
break;
$.ajax({
url: createURL("listTrafficTypes&physicalnetworkid=" + physicalNetworkObjs[i].id),
dataType: "json",
async: false,
success: function(json) {
var items = json.listtraffictypesresponse.traffictype;
for(var k = 0; k < items.length; k++) {
if(items[k].traffictype == "Guest") {
guestTrafficTypeTotal++;
break;
}
}
}
});
}
if(guestTrafficTypeTotal > 1) {
array1.push("&istagged=true");
}
}
>>>>>>> ee6dc03... bug 13965
$.ajax({
url: createURL(apiCmd + array1.join("")), //get the network offering for isolated network with sourceNat
dataType: "json",