From 950008048849526cd0e392e7b45fb4fb0f6e5cdb Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 30 Jul 2012 12:06:19 -0700
Subject: [PATCH 01/11] CS-15708 : fix network cleanup

---
 patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +-
 patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
index 35394646854..c624c41e9f3 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -143,7 +143,7 @@ destroy_guest_network() {
   sudo iptables -D INPUT -i $dev -p udp -m udp --dport 53 -j ACCEPT
   sudo iptables -t mangle -D PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark
   sudo iptables -t nat -A POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip
-  destroy_acl_outbound_chain
+  destroy_acl_chain
   desetup_usage
   desetup_dnsmasq
   desetup_apache2
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
index ff88354dc49..3db9a2d1713 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
@@ -33,8 +33,6 @@ usage() {
 add_snat() {
   logger -t cloud "$(basename $0):Added SourceNAT $pubIp on interface $ethDev"
   vpccidr=$(getVPCcidr)
-  sudo iptables -D FORWARD -s $vpccidr ! -d $vpccidr -j ACCEPT
-  sudo iptables -A FORWARD -s $vpccidr ! -d $vpccidr -j ACCEPT
   sudo iptables -t nat -D POSTROUTING   -j SNAT -o $ethDev --to-source $pubIp
   sudo iptables -t nat -A POSTROUTING   -j SNAT -o $ethDev --to-source $pubIp
   return $?

From a17c542fd688356c6cf0c2f8c91a29d3e413e272 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 30 Jul 2012 12:24:07 -0700
Subject: [PATCH 02/11] CS-15680 : set broadcast IP

---
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh         |  2 +-
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
index c624c41e9f3..61c5a7ecb02 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -115,7 +115,7 @@ desetup_usage() {
 create_guest_network() {
   logger -t cloud " $(basename $0): Create network on interface $dev,  gateway $gw, network $ip/$mask "
   # setup ip configuration
-  sudo ip addr add dev $dev $ip/$mask
+  sudo ip addr add dev $dev $ip/$mask brd +
   sudo ip link set $dev up
   sudo arping -c 3 -I $dev -A -U -s $ip $ip
   # setup rules to allow dhcp/dns request
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
index 40c1e4d996a..8ef19e41f45 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
@@ -58,7 +58,7 @@ add_an_ip () {
   sudo ip link show $ethDev | grep "state DOWN" > /dev/null
   local old_state=$?
 
-  sudo ip addr add dev $ethDev $pubIp/$mask
+  sudo ip addr add dev $ethDev $pubIp/$mask brd +
   if [ $old_state -eq 0 ]
   then
     sudo ip link set $ethDev up
@@ -76,7 +76,7 @@ add_an_ip () {
 
 remove_an_ip () {
   logger -t cloud "$(basename $0):Removing ip $pubIp on interface $ethDev"
-  local existingIpMask=$(sudo ip addr show dev $ethDev | grep "inet " | awk '{print $2}')
+  local existingIpMask=$(sudo ip addr show dev $ethDev | grep -v "inet6" | grep "inet " | awk '{print $2}')
 
   sudo ip addr del dev $ethDev $pubIp/$mask
   # reapply IPs in this interface
@@ -86,7 +86,7 @@ remove_an_ip () {
     then
       continue
     fi
-    sudo ip addr add dev $ethDev $ipMask
+    sudo ip addr add dev $ethDev $ipMask brd +
   done
 
   remove_routing
@@ -148,14 +148,14 @@ fi
 
 if [ "$Aflag" == "1" ]
 then
-  add_an_ip  $publicIp  &&
+  add_an_ip
   unlock_exit $? $lock $locked
 fi
 
 
 if [ "$Dflag" == "1" ]
 then
-  remove_an_ip  $publicIp &&
+  remove_an_ip
   unlock_exit $? $lock $locked
 fi
 

From 2388bd8f82d4f6e598730a27ab13616ba26189eb Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Tue, 31 Jul 2012 02:02:17 +0530
Subject: [PATCH 03/11] CS-15044:API changes to provide UI option to view the
 list of instances which are part of the guestnetwork is not availble

---
 .../com/cloud/api/response/NicResponse.java   |  7 ++++
 .../src/com/cloud/api/ApiResponseHelper.java  |  1 +
 ui/scripts/instances.js                       | 33 ++++++++++++++-----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/api/src/com/cloud/api/response/NicResponse.java b/api/src/com/cloud/api/response/NicResponse.java
index 53793f16c31..01d6d3b3740 100755
--- a/api/src/com/cloud/api/response/NicResponse.java
+++ b/api/src/com/cloud/api/response/NicResponse.java
@@ -26,6 +26,9 @@ public class NicResponse extends BaseResponse {
     @SerializedName("networkid") @Param(description="the ID of the corresponding network")
     private final IdentityProxy networkId = new IdentityProxy("networks");
     
+    @SerializedName("networkname") @Param(description="the name of the corresponding network")
+    private String  networkName ;
+
     @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the nic")
     private String netmask;
     
@@ -65,6 +68,10 @@ public class NicResponse extends BaseResponse {
         this.networkId.setValue(networkid);
     }
 
+    public void setNetworkName(String networkname) {
+    	this.networkName = networkname;
+    }
+
     public void setNetmask(String netmask) {
         this.netmask = netmask;
     }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 175baa6dfeb..1e4f82626fd 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1588,6 +1588,7 @@ public class ApiResponseHelper implements ResponseGenerator {
                     nicResponse.setGateway(singleNicProfile.getGateway());
                     nicResponse.setNetmask(singleNicProfile.getNetmask());
                     nicResponse.setNetworkid(singleNicProfile.getNetworkId());
+                    nicResponse.setNetworkName(ApiDBUtils.findNetworkById(singleNicProfile.getNetworkId()).getName() );
                     if (acct.getType() == Account.ACCOUNT_TYPE_ADMIN) {
                         if (singleNicProfile.getBroadCastUri() != null) {
                             nicResponse.setBroadcastUri(singleNicProfile.getBroadCastUri().toString());
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 04b83398ec4..e6bcbf7dbdd 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1179,9 +1179,11 @@
           nics: {
             title: 'label.nics',
             multiple: true,
+            cache:false,
             fields: [
               {
                 name: { label: 'label.name', header: true },
+                networkname: {label: 'Network Name' },
                 ipaddress: { label: 'label.ip.address' },
                 type: { label: 'label.type' },
                 gateway: { label: 'label.gateway' },
@@ -1195,17 +1197,32 @@
               }
             ],
             dataProvider: function(args) {
-              args.response.success({data: $.map(args.context.instances[0].nic, function(nic, index) {
-                var name = 'NIC ' + (index + 1);
+             
+             $.ajax({
+                     url:createURL("listVirtualMachines&details=nics&id=" + args.context.instances[0].id),
+                     dataType: "json",
+                     async:true,
+                     success:function(json) {
+                     
+                     args.response.success({
+                     data: $.map(args.context.instances[0].nic, function(nic, index) {
+                     var name = 'NIC ' + (index + 1);
+                     var networkname = json.listvirtualmachinesresponse.virtualmachine[0].nic[index].networkname;
+                     if (nic.isdefault) {
+                          name += ' (' + _l('label.default') + ')';
+                          }
+                     return $.extend(nic, {
+                        name: name,
+                        networkname: networkname
+                               });
+                            })
+                        });                     
 
-                if (nic.isdefault) {
-                  name += ' (' + _l('label.default') + ')';
-                }
-                return $.extend(nic, {
-                  name: name
+                     }
                 });
-              })});
+
             }
+
           },
 
            /**

From ba2c05cc552167b8a4d1e2e71e8b6dc6fc71adc5 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 30 Jul 2012 13:33:17 -0700
Subject: [PATCH 04/11] Allow EIP/ELB network creation only in Basic zone

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 8c855af2ff2..d4fd891edd7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2935,6 +2935,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
                             "service disabled are allowed in security group enabled zone", null);
                 }
             }
+            
+            //don't allow eip/elb networks in Advance zone
+            if (ntwkOff.getElasticIp() || ntwkOff.getElasticLb()) {
+                throw new InvalidParameterValueException("Elastic IP and Elastic LB services are supported in zone of type " + NetworkType.Basic, null);
+            }
         }
 
         // VlanId can be specified only when network offering supports it

From 587189e3025a8d6cfeb0a701b9eb1d3300241a52 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 30 Jul 2012 14:29:47 -0700
Subject: [PATCH 05/11] CS-15726: Use custom validation for tagger widget

Show a generic dialog box for tagger validation, instead of using
jQuery validate

--it conflicted with the detail view's edit fields and prevented
submission unless the key and value fields were filled out.
---
 ui/scripts/ui/widgets/tagger.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index f671342c99c..c6169454cb2 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -1,13 +1,26 @@
 (function($, cloudStack) {
+  var isFormValid = function($form) {
+    var key = $form.find('input[name=key]').val();
+    var value = $form.find('input[name=value]').val();
+
+    if (!key || !value) {
+      cloudStack.dialog.notice({ message: 'Please specify a tag key and value' });
+      
+      return false;
+    }
+
+    return true;
+  };
+  
   var elems = {
     inputArea: function(args) {
       var $form = $('<form>').addClass('tag-input');
       var $keyField = $('<div>').addClass('field key');
       var $keyLabel = $('<label>').attr('for', 'key').html('Key:');
-      var $key = $('<input>').addClass('key required').attr('name', 'key');
+      var $key = $('<input>').addClass('key').attr('name', 'key');
       var $valueField = $('<div>').addClass('field value');
       var $valueLabel = $('<label>').attr('for', 'value').html('Value:');
-      var $value = $('<input>').addClass('value required').attr('name', 'value');
+      var $value = $('<input>').addClass('value').attr('name', 'value');
       var $submit = $('<input>').attr('type', 'submit').val('Add');
 
       $keyField.append($keyLabel, $key);
@@ -22,7 +35,7 @@
       $form.submit(
         args.onSubmit ?
           function() {
-            if (!$form.valid()) return false;
+            if (!isFormValid($form)) return false;
             
             args.onSubmit({
               data: cloudStack.serializeForm($form),

From c10850e43491f31ff85bf8b642d88ffdd9fd647c Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 30 Jul 2012 14:32:14 -0700
Subject: [PATCH 06/11] Add license header to tagger widget

---
 ui/scripts/ui/widgets/tagger.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index c6169454cb2..dfc31129e95 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -1,3 +1,14 @@
+// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Apache License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License.  Citrix Systems, Inc.
+// reserves all rights not expressly granted by the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 (function($, cloudStack) {
   var isFormValid = function($form) {
     var key = $form.find('input[name=key]').val();

From 431b8fe7086392f4ec4b7a35afb2a75fbfeff2b5 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 30 Jul 2012 15:10:48 -0700
Subject: [PATCH 07/11] CS-15753:

Re-enable 'view all ip addresses' link on tier details.

--this was disabled previously due to a bug in the VPC widget, which
  is also fixed with this commit.
---
 ui/scripts/ui-custom/vpc.js | 1 +
 ui/scripts/vpc.js           | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js
index c65a5b73b78..5d400bbedc3 100644
--- a/ui/scripts/ui-custom/vpc.js
+++ b/ui/scripts/ui-custom/vpc.js
@@ -194,6 +194,7 @@
             maximizeIfSelected: true,
             complete: function($panel) {
               $panel.detailView($.extend(true, {}, detailView, {
+                $browser: $browser,
                 context: context
               }));
             }
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index b73cb7b8625..384e58a7482 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1084,9 +1084,6 @@
     tiers: {
       detailView: { //duplicate from cloudStack.sections.network.sections.networks.listView.detailView (begin)			 
 				name: 'Guest network details',
-				
-				//comment out until JS error "$browser is undefined" is fixed
-				/*
 				viewAll: {
 					path: 'network.ipAddresses',
 					label: 'label.menu.ipaddresses',
@@ -1143,8 +1140,6 @@
 						return false;
 					}
 				},
-				*/
-				
 				actions: {
 					edit: {
 						label: 'label.edit',

From 6948902b75c7db33951bb16a43ea748ea6470f10 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Mon, 30 Jul 2012 11:48:30 -0700
Subject: [PATCH 08/11] S2S VPN: CS-15748: Deleting customer vpn gateway when
 delete account

---
 .../dao/Site2SiteCustomerGatewayDao.java        |  3 +++
 .../dao/Site2SiteCustomerGatewayDaoImpl.java    |  9 +++++++++
 .../cloud/network/vpn/Site2SiteVpnManager.java  |  1 +
 .../network/vpn/Site2SiteVpnManagerImpl.java    | 17 ++++++++++++++++-
 .../src/com/cloud/user/AccountManagerImpl.java  | 16 +++++++++++++++-
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java
index 5b39dbdb080..78546891770 100644
--- a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java
+++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java
@@ -1,9 +1,12 @@
 package com.cloud.network.dao;
 
+import java.util.List;
+
 import com.cloud.network.Site2SiteCustomerGatewayVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface Site2SiteCustomerGatewayDao extends GenericDao<Site2SiteCustomerGatewayVO, Long> {
     Site2SiteCustomerGatewayVO findByGatewayIp(String ip);
     Site2SiteCustomerGatewayVO findByName(String name);
+    List<Site2SiteCustomerGatewayVO> listByAccountId(long accountId);
 }
diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
index 80b5c02f512..c3a4d9446cd 100644
--- a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
+++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
@@ -1,5 +1,7 @@
 package com.cloud.network.dao;
 
+import java.util.List;
+
 import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
@@ -19,6 +21,7 @@ public class Site2SiteCustomerGatewayDaoImpl extends GenericDaoBase<Site2SiteCus
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("gatewayIp", AllFieldsSearch.entity().getGatewayIp(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("accountId", AllFieldsSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
         AllFieldsSearch.done();
     }
     
@@ -36,4 +39,10 @@ public class Site2SiteCustomerGatewayDaoImpl extends GenericDaoBase<Site2SiteCus
         return findOneBy(sc);
     }
 
+    @Override
+    public List<Site2SiteCustomerGatewayVO> listByAccountId(long accountId) {
+        SearchCriteria<Site2SiteCustomerGatewayVO> sc = AllFieldsSearch.create();
+        sc.setParameters("accountId", accountId);
+        return listBy(sc, null);
+    }
 }
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java
index 567b76549df..922ac2c4b6e 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java
@@ -10,4 +10,5 @@ public interface Site2SiteVpnManager extends Site2SiteVpnService {
     boolean cleanupVpnGatewayByVpc(long vpcId);
     void markDisconnectVpnConnByVpc(long vpcId);
     List<Site2SiteVpnConnectionVO> getConnectionsForRouter(DomainRouterVO router);
+    boolean deleteCustomerGatewayByAccount(long accountId);
 }
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 1d2ab5d6bb4..e0d2c877fbb 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -269,11 +269,16 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
             throw new InvalidParameterValueException("Fail to find customer gateway by id", null);
         }
         _accountMgr.checkAccess(caller, null, false, customerGateway);
+        
+        return doDeleteCustomerGateway(customerGateway);
+    }
 
+    protected boolean doDeleteCustomerGateway(Site2SiteCustomerGateway gw) {
+        long id = gw.getId();
         List<Site2SiteVpnConnectionVO> vpnConnections = _vpnConnectionDao.listByCustomerGatewayId(id);
         if (vpnConnections != null && vpnConnections.size() != 0) {
             List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
-            idList.add(new IdentityProxy(customerGateway, id, "customerGatewayId"));
+            idList.add(new IdentityProxy(gw, id, "customerGatewayId"));
             throw new InvalidParameterValueException("Unable to delete VPN customer gateway with specified id because there is still related VPN connections!", idList);
         }
         _customerGatewayDao.remove(id);
@@ -613,4 +618,14 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
         conns.addAll(_vpnConnectionDao.listByVpcId(vpcId));
         return conns;
     }
+
+    @Override
+    public boolean deleteCustomerGatewayByAccount(long accountId) {
+        boolean result = true;;
+        List<Site2SiteCustomerGatewayVO> gws = _customerGatewayDao.listByAccountId(accountId);
+        for (Site2SiteCustomerGatewayVO gw : gws) {
+            result = result & doDeleteCustomerGateway(gw);
+        }
+        return result;
+    }
 }
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 063e8e004d5..7f5d5828f2e 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -70,16 +70,22 @@ import com.cloud.network.IpAddress;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkVO;
 import com.cloud.network.RemoteAccessVpnVO;
+import com.cloud.network.Site2SiteCustomerGatewayVO;
+import com.cloud.network.Site2SiteVpnConnectionVO;
 import com.cloud.network.VpnUserVO;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
 import com.cloud.network.dao.VpnUserDao;
 import com.cloud.network.security.SecurityGroupManager;
 import com.cloud.network.security.dao.SecurityGroupDao;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpn.RemoteAccessVpnService;
+import com.cloud.network.vpn.Site2SiteVpnManager;
 import com.cloud.projects.Project;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.projects.ProjectInvitationVO;
@@ -208,6 +214,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
     private VpcManager _vpcMgr;
     @Inject
     private DomainRouterDao _routerDao;
+    @Inject
+    Site2SiteVpnManager _vpnMgr;
 
     private Adapters<UserAuthenticator> _userAuthenticators;
 
@@ -560,7 +568,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
                 s_logger.warn("Failed to cleanup remote access vpn resources as a part of account id=" + accountId + " cleanup due to Exception: ", ex);
                 accountCleanupNeeded = true;
             }
-
+            
             // Cleanup security groups
             int numRemoved = _securityGroupDao.removeByAccountId(accountId);
             s_logger.info("deleteAccount: Deleted " + numRemoved + " network groups for account " + accountId);
@@ -611,6 +619,12 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
                 }
             }
 
+            // Delete Site 2 Site VPN customer gateway
+            s_logger.debug("Deleting site-to-site VPN customer gateways for account " + accountId);
+            if (!_vpnMgr.deleteCustomerGatewayByAccount(accountId)) {
+                s_logger.warn("Fail to delete site-to-site VPN customer gateways for account " + accountId);
+            }
+
             // delete account specific Virtual vlans (belong to system Public Network) - only when networks are cleaned
             // up successfully
             if (networksDeleted) {

From 33d0e943ebf82f2614170aabeca912b103499d41 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 30 Jul 2012 15:16:36 -0700
Subject: [PATCH 09/11] CS-15620

Fix edit instance 'displayname' parameter not being sent over, even if
content was updated.
---
 ui/scripts/instances.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index e6bcbf7dbdd..39e8d6e9293 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -550,7 +550,7 @@
             label: 'Edit',
             action: function(args) {
               var array1 = [];							
-							if(args.data.displayname != args.context.instances[0].name)
+							if(args.data.displayname != args.context.instances[0].displayname)
                 array1.push("&displayName=" + args.data.displayname);
 								
               array1.push("&group=" + args.data.group);

From 768be1a69b24e86a499b19eec4df3af64101c2bb Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Mon, 30 Jul 2012 15:45:48 -0700
Subject: [PATCH 10/11] S2S VPN: CS-15724: Show more parameter for
 listVpnCustomerGateways API

---
 .../Site2SiteCustomerGatewayResponse.java     | 21 +++++++++++++++++++
 .../network/Site2SiteCustomerGateway.java     |  3 +++
 .../src/com/cloud/api/ApiResponseHelper.java  |  4 ++++
 .../network/Site2SiteCustomerGatewayVO.java   |  5 ++++-
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
index b0a90c9d81e..0b5d286dce6 100644
--- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
+++ b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
@@ -39,6 +39,15 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponse implements Co
     @SerializedName(ApiConstants.IPSEC_PSK) @Param(description="IPsec preshared-key of customer gateway")
     private String ipsecPsk;
 
+    @SerializedName(ApiConstants.IKE_POLICY) @Param(description="IKE policy of customer gateway")
+    private String ikePolicy;
+    
+    @SerializedName(ApiConstants.ESP_POLICY) @Param(description="IPsec policy of customer gateway")
+    private String espPolicy;
+    
+    @SerializedName(ApiConstants.LIFETIME) @Param(description="Lifetime of IKE and IPsec policy of customer gateway")
+    private Long lifetime;
+    
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
     private String accountName;
     
@@ -81,6 +90,18 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponse implements Co
         this.ipsecPsk = ipsecPsk;
     }	
     
+    public void setIkePolicy(String ikePolicy) {
+        this.ikePolicy = ikePolicy;
+    }	
+    
+    public void setEspPolicy(String espPolicy) {
+        this.espPolicy = espPolicy;
+    }	
+    
+    public void setLifetime(Long lifetime) {
+        this.lifetime = lifetime;
+    }	
+    
     public void setRemoved(Date removed) {
         this.removed = removed;
     }	
diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
index d4facc34e75..29f580f18ba 100644
--- a/api/src/com/cloud/network/Site2SiteCustomerGateway.java
+++ b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
@@ -9,6 +9,9 @@ public interface Site2SiteCustomerGateway extends ControlledEntity {
     public String getGatewayIp();
     public String getGuestCidrList();
     public String getIpsecPsk();
+    public String getIkePolicy();
+    public String getEspPolicy();
+    public Long getLifetime();
     public Date getRemoved();
     String getName();
 }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 1e4f82626fd..61edccbbb79 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3915,6 +3915,10 @@ public class ApiResponseHelper implements ResponseGenerator {
         response.setGatewayIp(result.getGatewayIp());
         response.setGuestCidrList(result.getGuestCidrList());
         response.setIpsecPsk(result.getIpsecPsk());
+        response.setIkePolicy(result.getIkePolicy());
+        response.setEspPolicy(result.getEspPolicy());
+        response.setLifetime(result.getLifetime());
+        
         response.setRemoved(result.getRemoved());
         response.setObjectName("vpncustomergateway");
 
diff --git a/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java b/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java
index 5063f780b30..573d5f1445b 100644
--- a/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java
+++ b/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java
@@ -118,7 +118,8 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway {
         this.removed = removed;
     }
 
-    public long getLifetime() {
+    @Override
+    public Long getLifetime() {
         return lifetime;
     }
 
@@ -126,6 +127,7 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway {
         this.lifetime = lifetime;
     }
 
+    @Override
     public String getIkePolicy() {
         return ikePolicy;
     }
@@ -134,6 +136,7 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway {
         this.ikePolicy = ikePolicy;
     }
 
+    @Override
     public String getEspPolicy() {
         return espPolicy;
     }

From 441600f40962ea536b593c48f30044af4c9447c1 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 30 Jul 2012 16:08:41 -0700
Subject: [PATCH 11/11] multiEdit widget: Support field pre-filter

If adding a 'fieldPreFilter' option to a multiEdit, the returned array
specifies field IDs to be hidden.
---
 ui/scripts/network.js              |  7 +++++++
 ui/scripts/ui/widgets/multiEdit.js | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 494e11f964c..2e6d4296a21 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2226,6 +2226,13 @@
                       }
                     },
                     multipleAdd: true,
+                    fieldPreFilter: function(args) {
+                      var context = args.context;
+                      var fields = args.fields;
+
+                      // Returns fields to be hidden
+                      return [];
+                    },
                     fields: {
                       'name': { edit: true, label: 'label.name', isEditable: true },
                       'publicport': { edit: true, label: 'label.public.port' },
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 2243385e0d5..f13adb59f78 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -19,7 +19,7 @@
     /**
      * Append item to list
      */
-    addItem: function(data, fields, $multi, itemData, actions, options) {
+    addItem: function(data, fields, hiddenFields, $multi, itemData, actions, options) {
       if (!options) options = {};
 
       var $tr;
@@ -35,7 +35,8 @@
 
       // Setup columns
       $.each(fields, function(fieldName, field) {
-        if (options.ignoreEmptyFields && !data[fieldName]) {
+        if ((options.ignoreEmptyFields && !data[fieldName]) ||
+            $.inArray(fieldName.toString(), hiddenFields) > -1) {
           return true;
         }
 
@@ -682,6 +683,16 @@
     var context = args.context;
     var ignoreEmptyFields = args.ignoreEmptyFields;
     var actionPreFilter = args.actionPreFilter;
+    var fieldPreFilter = args.fieldPreFilter;
+    var hiddenFields = [];
+
+    if (fieldPreFilter) {
+      hiddenFields = fieldPreFilter({
+        fields: $.map(fields, function(v, k) { return k; }),
+        context: context,
+        $multi: $multi
+      });
+    }
 
     var $thead = $('<tr>').appendTo(
       $('<thead>').appendTo($inputTable)
@@ -693,6 +704,8 @@
 
     // Setup input table headers
     $.each(args.fields, function(fieldName, field) {
+      if ($.inArray(fieldName.toString(), hiddenFields) > -1) return true;
+
       var $th = $('<th>').addClass(fieldName).html(_l(field.label.toString()));
       $th.attr('rel', fieldName);
       $th.appendTo($thead);
@@ -929,6 +942,7 @@
               _medit.addItem(
                 data,
                 fields,
+                hiddenFields,
                 $multi,
                 itemData,
                 actions,