You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/07/23 21:11:06 UTC
git commit: cloudstack 3.0 API - CreateVpnConnection API,
ListVpnConnections API: set object name for API response.
Updated Branches:
refs/heads/vpc 497c324ef -> aac0a808c
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aac0a808
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aac0a808
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aac0a808
Branch: refs/heads/vpc
Commit: aac0a808c1515fd748571458133ff46f33cb289e
Parents: 497c324
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Jul 23 12:10:29 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Jul 23 12:10:29 2012 -0700
----------------------------------------------------------------------
.../cloud/api/commands/ListVpnConnectionsCmd.java | 9 +++++++--
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aac0a808/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
index 5cbf8f3..96cc061 100644
--- a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
@@ -68,8 +68,13 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
ListResponse<Site2SiteVpnConnectionResponse> response = new ListResponse<Site2SiteVpnConnectionResponse>();
List<Site2SiteVpnConnectionResponse> connResponses = new ArrayList<Site2SiteVpnConnectionResponse>();
if (conns != null && !conns.isEmpty()) {
- for (Site2SiteVpnConnection conn : conns) {
- connResponses.add(_responseGenerator.createSite2SiteVpnConnectionResponse(conn));
+ for (Site2SiteVpnConnection conn : conns) {
+ if (conn == null) {
+ continue;
+ }
+ Site2SiteVpnConnectionResponse site2SiteVpnConnectonRes = _responseGenerator.createSite2SiteVpnConnectionResponse(conn);
+ site2SiteVpnConnectonRes.setObjectName("vpnconnection");
+ connResponses.add(site2SiteVpnConnectonRes);
}
}
response.setResponses(connResponses);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aac0a808/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 f957223..e01bcd2 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3793,6 +3793,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setCustomerGatewayId(result.getCustomerGatewayId());
response.setCreated(result.getCreated());
response.setRemoved(result.getRemoved());
+ response.setObjectName("vpnconnection");
return response;
}
}