From d4ce07779f33cfa57b39a0ae36bec5345c459feb Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Thu, 2 Aug 2012 16:18:11 -0700
Subject: [PATCH] S2S VPN: Allow name to be modified in updateCustomerGateway

---
 .../cloud/api/commands/UpdateVpnCustomerGatewayCmd.java    | 7 +++++++
 .../src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/api/src/com/cloud/api/commands/UpdateVpnCustomerGatewayCmd.java b/api/src/com/cloud/api/commands/UpdateVpnCustomerGatewayCmd.java
index 70390c53454..ebd0a8926da 100644
--- a/api/src/com/cloud/api/commands/UpdateVpnCustomerGatewayCmd.java
+++ b/api/src/com/cloud/api/commands/UpdateVpnCustomerGatewayCmd.java
@@ -40,6 +40,9 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
     @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of customer gateway")
     private Long id;
     
+    @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=false, description="name of this customer gateway")
+    private String name;
+    
     @Parameter(name=ApiConstants.GATEWAY, type=CommandType.STRING, required=true, description="public ip address id of the customer gateway")
     private String gatewayIp;
 
@@ -84,6 +87,10 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
         return id;
     }
     
+    public String getName() {
+        return name;
+    }
+
     public String getIpsecPsk() {
         return ipsecPsk;
     }
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 212965045cb..579a6393a3d 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -363,10 +363,14 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
                 }
             }
         }
+        String name = cmd.getName();
         String gatewayIp = cmd.getGatewayIp();
         if (!NetUtils.isValidIp(gatewayIp)) {
             throw new InvalidParameterValueException("The customer gateway ip " + gatewayIp + " is invalid!", null);
         }
+        if (name == null) {
+            name = "VPN-" + gatewayIp;
+        }
         String guestCidrList = cmd.getGuestCidrList();
         if (!NetUtils.validateGuestCidrList(guestCidrList)) {
             throw new InvalidParameterValueException("The customer gateway guest cidr list " + guestCidrList + " contains invalid guest cidr!", null);
@@ -403,6 +407,7 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
             dpd = false;
         }
         
+        gw.setName(name);
         gw.setGatewayIp(gatewayIp);
         gw.setGuestCidrList(guestCidrList);
         gw.setIkePolicy(ikePolicy);