Updated Branches: refs/heads/vpc d90be0d9b -> 67941f818
S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/67941f81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/67941f81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/67941f81 Branch: refs/heads/vpc Commit: 67941f818d661ec4dd54e708f769e7aade3e72fd Parents: d90be0d Author: Sheng Yang <[email protected]> Authored: Mon Jul 30 15:52:23 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Jul 30 15:52:23 2012 -0700 ---------------------------------------------------------------------- .../response/Site2SiteCustomerGatewayResponse.java | 21 +++++++++++++++ .../cloud/network/Site2SiteCustomerGateway.java | 3 ++ server/src/com/cloud/api/ApiResponseHelper.java | 3 ++ .../cloud/network/Site2SiteCustomerGatewayVO.java | 5 +++- 4 files changed, 31 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/67941f81/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java index 1773187..0e2c353 100644 --- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java +++ b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java @@ -43,6 +43,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; @@ -85,6 +94,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; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/67941f81/api/src/com/cloud/network/Site2SiteCustomerGateway.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/com/cloud/network/Site2SiteCustomerGateway.java index d4facc3..29f580f 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(); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/67941f81/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 ab6ccf9..2b97d03 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3789,6 +3789,9 @@ 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"); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/67941f81/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java b/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java index 5063f78..573d5f1 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; }
