cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [3/4] git commit: updated refs/heads/CLOUDSTACK-8395 to d91d161
Date Thu, 23 Apr 2015 12:10:43 GMT
RemoteAccessVpn: fix regression preshared key is not sent to UI/clients

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7133956
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7133956
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7133956

Branch: refs/heads/CLOUDSTACK-8395
Commit: c71339569d9d3e8e710a4c2490a50ffa6eff4d7f
Parents: 64ab355
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Apr 23 11:22:11 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Apr 23 14:04:32 2015 +0200

----------------------------------------------------------------------
 .../cloudstack/api/response/RemoteAccessVpnResponse.java     | 8 ++++++++
 server/src/com/cloud/api/ApiResponseHelper.java              | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7133956/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
index 60a45b6..28d788b 100644
--- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
@@ -41,6 +41,10 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     @Param(description = "the range of ips to allocate to the clients")
     private String ipRange;
 
+    @SerializedName("presharedkey")
+    @Param(description = "the ipsec preshared key")
+    private String presharedKey;
+
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account of the remote access vpn")
     private String accountName;
@@ -81,6 +85,10 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
         this.ipRange = ipRange;
     }
 
+    public void setPresharedKey(String presharedKey) {
+        this.presharedKey = presharedKey;
+    }
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7133956/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 9f066fb..805d9d7 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1305,6 +1305,7 @@ public class ApiResponseHelper implements ResponseGenerator {
             vpnResponse.setPublicIp(ip.getAddress().addr());
         }
         vpnResponse.setIpRange(vpn.getIpRange());
+        vpnResponse.setPresharedKey(vpn.getIpsecPresharedKey());
         populateOwner(vpnResponse, vpn);
         vpnResponse.setState(vpn.getState().toString());
         vpnResponse.setId(vpn.getUuid());


Mime
View raw message