From 230ce1dfee8216e05f47143eb0501c6a9591e69c Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Mon, 9 Jul 2012 16:53:44 -0700
Subject: [PATCH] S2S VPN: Add state for vpn connection response

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

diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
index 54daf95849a..fcbe56bcd48 100644
--- a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
+++ b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
@@ -55,6 +55,9 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse {
     @SerializedName(ApiConstants.LIFETIME) @Param(description="Lifetime of vpn connection to the customer gateway, in seconds") //from CustomerGateway
     private Long lifetime;
     
+    @SerializedName(ApiConstants.STATE) @Param(description="State of vpn connection")
+    private String state;
+    
     @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the host was created")
     private Date created;
 
@@ -101,6 +104,10 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse {
     	this.lifetime = lifetime;
     }     
     
+    public void setState(String state) {
+        this.state = state;
+    }
+
     public void setCreated(Date created) {
         this.created = created;
     }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index e79ec5856f5..50fb8dc5a88 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3815,6 +3815,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         	response.setLifetime(customerGateway.getLifetime());
         }      
                 
+        response.setState(result.getState().toString());
         response.setCreated(result.getCreated());
         response.setRemoved(result.getRemoved());
         response.setObjectName("vpnconnection");