etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API

This commit is contained in:
Sheng Yang 2012-07-30 15:52:23 -07:00
parent d90be0d9bc
commit 67941f818d
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
View File

@ -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;
}

3
api/src/com/cloud/network/Site2SiteCustomerGateway.java
View File

@ -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();
}

3
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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");

5
server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java
View File

@ -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;
}