Updated Branches: refs/heads/vpc f6aea09a1 -> 8404dba5e
CS-15452: Fix wrong repsonse ID for s2s vpn Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8404dba5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8404dba5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8404dba5 Branch: refs/heads/vpc Commit: 8404dba5e02dc46f2afb6617003f9f4fa934ac37 Parents: f6aea09 Author: Sheng Yang <[email protected]> Authored: Mon Jul 9 16:19:54 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Jul 9 16:21:21 2012 -0700 ---------------------------------------------------------------------- .../api/commands/CreateVpnCustomerGatewayCmd.java | 3 --- .../response/Site2SiteCustomerGatewayResponse.java | 2 +- .../response/Site2SiteVpnConnectionResponse.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8404dba5/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java b/api/src/com/cloud/api/commands/CreateVpnCustomerGatewayCmd.java index d17054b..3b42cb2 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 { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8404dba5/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 75fab2b..06d359c 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; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8404dba5/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java index 4150820..fad4177 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");
