From a808035b3de2ae546f4e1bd21aaa2dfdec95a5d6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Feb 2012 16:24:45 -0800
Subject: [PATCH] bug 13629: system page - network providers section - basic
 zone: no F5 and SRX.

---
 ui/scripts/system.js | 46 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ccddb197b1c..88ea3594326 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -353,7 +353,53 @@
           }
         },
         dataProvider: function(args) {
+<<<<<<< HEAD
 					refreshNspData();
+=======
+          cloudStack.sections.system.naas.networkProviders.statusCheck({
+            context: args.context
+          });
+
+					var networkProviderData = [
+						{
+							id: 'netscaler',
+							name: 'NetScaler',
+							state: nspMap.netscaler? nspMap.netscaler.state : 'Disabled'
+						},						
+						{
+							id: 'virtualRouter',
+							name: 'virtual.router',
+							state: nspMap.virtualRouter ? nspMap.virtualRouter.state : 'Disabled'
+						}
+					];
+					
+					if(selectedZoneObj.networktype == "Basic") {
+					  networkProviderData.push(
+						  {
+                id: 'securityGroups',
+                name: 'Security Groups',
+                state: nspMap.securityGroups ? nspMap.securityGroups.state : 'Disabled'
+              }
+						);
+					}
+					else if(selectedZoneObj.networktype == "Advanced"){					  
+						networkProviderData.push(
+						  {
+								id: 'f5',
+								name: 'F5',
+								state: nspMap.f5 ? nspMap.f5.state : 'Disabled'
+							}						
+						);					
+					  networkProviderData.push(
+						  {
+								id: 'srx',
+								name: 'SRX',
+								state: nspMap.srx ? nspMap.srx.state : 'Disabled'
+							}		
+						);
+					}
+
+>>>>>>> 07dc16c... bug 13629: system page - network providers section - basic zone: no F5 and SRX.
           args.response.success({
             data: nspHardcodingArray
           })