From 8404dba5e02dc46f2afb6617003f9f4fa934ac37 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 9 Jul 2012 16:19:54 -0700 Subject: [PATCH] CS-15452: Fix wrong repsonse ID for s2s vpn --- .../com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java | 3 --- .../cloud/api/response/Site2SiteCustomerGatewayResponse.java | 2 +- .../com/cloud/api/response/Site2SiteVpnConnectionResponse.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java b/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java index d17054b910d..3b42cb267ea 100644 --- a/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java +++ b/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java @@ -16,9 +16,7 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.IdentityMapper; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -26,7 +24,6 @@ import com.cloud.api.response.Site2SiteCustomerGatewayResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.user.Account; -import com.cloud.user.UserContext; @Implementation(description="Creates site to site vpn customer gateway", responseObject=Site2SiteCustomerGatewayResponse.class) public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd { diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java index 75fab2bcede..06d359c4c0c 100644 --- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java +++ b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java @@ -22,7 +22,7 @@ import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class Site2SiteCustomerGatewayResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID") - private IdentityProxy id = new IdentityProxy("s2s_vpn_gateway"); + private IdentityProxy id = new IdentityProxy("s2s_customer_gateway"); @SerializedName(ApiConstants.GATEWAY) @Param(description="public ip address id of the customer gateway") private String gatewayIp; diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java index 41508202cfd..fad41771b47 100644 --- a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java +++ b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java @@ -22,7 +22,7 @@ import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class Site2SiteVpnConnectionResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID") - private IdentityProxy id = new IdentityProxy("s2s_vpn_gateway"); + private IdentityProxy id = new IdentityProxy("s2s_vpn_connection"); @SerializedName(ApiConstants.S2S_VPN_GATEWAY_ID) @Param(description="the vpn gateway ID") private IdentityProxy vpnGatewayId= new IdentityProxy("s2s_vpn_gateway");