From b8c4dce1b71794cc53b32751fd340ec91f8df032 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 23 Feb 2012 13:50:42 -0800 Subject: [PATCH] bug 13965 Remove listPhysicalNetworks API from network step status 13965: resolved fixed reviewed-by: jessica --- ui/scripts/instances.js | 42 +++-------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index f79df3545e9..30521f20169 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -306,46 +306,10 @@ }); - //get network offerings (begin) *** - $.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"); - } - } + var array1 = []; + var guestTrafficTypeTotal = 0; + $.ajax({ url: createURL(apiCmd + array1.join("")), //get the network offering for isolated network with sourceNat dataType: "json",