From 8b1daa5466364d21c2c19ac6751092449731cdcb Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 23 Feb 2012 12:14:47 -0800
Subject: [PATCH] bug 13965

For regular user, don't do list physical networks API call on instance
wizard
---
 ui/scripts/instances.js | 45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index b5809df9fa6..6017d0651e9 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -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",