From e0c8454a960a794adae7f99a531dc123d11f0910 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 2 Jul 2012 14:03:00 -0700
Subject: [PATCH] cloudstack 3.0 UI: site-to-site VPN - listView, detailView -
 add 7 new properties of listVpnConnections API response.

---
 ui/scripts/network.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d0a77dd5ea0..ebfb7349b6f 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3195,11 +3195,13 @@
         listView: {
           id: 'siteToSiteVpn',
           label: 'site-to-site VPN',
-          fields: {
-            id: { label: 'label.id' },
-            s2svpngatewayid: { label: 's2svpngatewayid' },
-						s2scustomergatewayid: { label: 's2scustomergatewayid' },                    
-            created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }
+          fields: {			
+            publicip: { label: 'label.ip.address' },				
+					  gateway: { label: 'label.gateway' },
+						cidrlist: { label: 'CIDR list' },
+						ipsecpsk: { label: 'IPsec Preshared-Key' },
+						ikepolicy: { label: 'IKE policy' },
+						esppolicy: { label: 'ESP policy' }								
           },
           dataProvider: function(args) {					  
 						var array1 = [];  
@@ -3299,7 +3301,7 @@
 										}
 									},
 								  lifetime: { 
-									  label: 'Lifetime of vpn connection (second)',
+									  label: 'Lifetime (second)',
                     defaultValue: '86400',
 										validation: { required: false, number: true }
 									}		
@@ -3431,11 +3433,21 @@
               details: {
                 title: 'label.details',
                 fields: [
-                  {
-                    id: { label: 'label.id' },
-                    s2svpngatewayid: { label: 's2svpngatewayid' },
-										s2scustomergatewayid: { label: 's2scustomergatewayid' },
-                    created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }
+                  {                   
+										id: { label: 'label.id' },
+										
+										//s2svpngatewayid: { label: 'VPN gateway ID' },
+										publicip: { label: 'label.ip.address' },
+										
+										//s2scustomergatewayid: { label: 'Customer gateway ID' }, 
+										gateway: { label: 'label.gateway' },
+										cidrlist: { label: 'CIDR list' },
+										ipsecpsk: { label: 'IPsec Preshared-Key' },
+										ikepolicy: { label: 'IKE policy' },
+										esppolicy: { label: 'ESP policy' },
+										lifetime: { label: 'Lifetime (second)' },
+																			 
+										created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }										
                   }
                 ],
                 dataProvider: function(args) {