From c6a78e056daee3595ddbec20e6c3a98aea4c6beb Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 9 Feb 2012 13:07:04 -0800
Subject: [PATCH] bug 13553: network page - display all networks instead of
 only isolated networks with SourceNAT, shared networks with LB,
 StaticNat,SecurityGroup.

---
 ui/scripts/network.js | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 5c0866d853f..b56dd9b0e88 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -259,46 +259,23 @@
 									break;
 								}
 							}
-						}		
-
-            //temporary until Alena fixes listNetworks API to return both isolated and shared networks in one call		
-						var networkObjs1 = [];
+						}		           
 						$.ajax({
               url: createURL("listNetworks&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
-              data: {
-                type: 'isolated',
-                supportedServices: 'SourceNat',
+              data: {               
 								listAll: true
               },
               dataType: 'json',
               async: false,
-              success: function(data) {
-							  if(data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0)
-                  networkObjs1 = data.listnetworksresponse.network;  
+              success: function(data) {							 
+								args.response.success({
+									data: data.listnetworksresponse.network
+								});									
               },
               error: function(data) {
                 args.response.error(parseXMLHttpResponse(data));
               }
-            });							
-						var networkObjs2 = [];
-						$.ajax({
-							url: createURL("listNetworks&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
-							data: {
-								type: 'shared',
-								supportedServices: 'Lb,StaticNat,SecurityGroup',
-								listAll: true
-							},
-							async: false,
-							success: function(data) {			
-                if(data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0)							
-								  networkObjs2 = data.listnetworksresponse.network; 								
-							}
-						});				
-							
-						var networkObjs = $.extend(networkObjs1, networkObjs2);						
-						args.response.success({
-							data: networkObjs
-						});		
+            });						
           },
 
           detailView: {