From 8d35452493a24d7f782f79cb5cbe57aaf4d6371e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Fri, 29 Jun 2012 15:02:09 -0700
Subject: [PATCH] cloudstack 3.0 UI - site-to-site VPN page - populate listView
 and detailView.

---
 ui/scripts/network.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 1833ff34d9a..d0a77dd5ea0 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3196,9 +3196,9 @@
           id: 'siteToSiteVpn',
           label: 'site-to-site VPN',
           fields: {
-            type: { label: 'label.type' },
-            description: { label: 'label.description' },
-            username: { label: 'label.initiated.by' },
+            id: { label: 'label.id' },
+            s2svpngatewayid: { label: 's2svpngatewayid' },
+						s2scustomergatewayid: { label: 's2scustomergatewayid' },                    
             created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }
           },
           dataProvider: function(args) {					  
@@ -3356,7 +3356,7 @@
 																					if (result.jobstatus == 1) {															
 																						var obj = result.jobresult.vpncustomergateway;
 																						var vpncustomergatewayid = obj.id;	
-                                            //???				
+                                            		
                                             $.ajax({
 																							url: createURL('createVpnConnection'),
 																							data: {
@@ -3377,10 +3377,8 @@
 																											}
 																											else {                                      
 																												clearInterval(createvpnconnectionIntervalID); 														
-																												if (result.jobstatus == 1) {							
-																													debugger;																					
-																													var obj = result.jobresult.vpnconnection;
-																																																
+																												if (result.jobstatus == 1) {								
+																													var obj = result.jobresult.vpnconnection;																																																
 																												}
 																												else if (result.jobstatus == 2) {
 																													alert("Failed to create VPN connection. Error: " + _s(result.jobresult.errortext));
@@ -3394,8 +3392,7 @@
 																									});                              
 																								}, 3000); 																
 																							}
-															});							
-                                            //???																						
+															              });																		
 																					}
 																					else if (result.jobstatus == 2) {
 																						alert("Failed to create VPN customer gateway. Error: " + _s(result.jobresult.errortext));
@@ -3435,8 +3432,9 @@
                 title: 'label.details',
                 fields: [
                   {
-                    type: { label: 'label.type' },
-                    description: { label: 'label.description' },
+                    id: { label: 'label.id' },
+                    s2svpngatewayid: { label: 's2svpngatewayid' },
+										s2scustomergatewayid: { label: 's2scustomergatewayid' },
                     created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }
                   }
                 ],