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

cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.

This commit is contained in:
Jessica Wang 2012-07-20 16:49:17 -07:00
parent 2a822de5e0
commit 8712812ca7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
View File

@ -68,9 +68,14 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
ListResponse<Site2SiteVpnGatewayResponse> response = new ListResponse<Site2SiteVpnGatewayResponse>();
List<Site2SiteVpnGatewayResponse> gwResponses = new ArrayList<Site2SiteVpnGatewayResponse>();
if (gws != null && !gws.isEmpty()) {
for (Site2SiteVpnGateway gw : gws) {
gwResponses.add(_responseGenerator.createSite2SiteVpnGatewayResponse(gw));
}
for (Site2SiteVpnGateway gw : gws) {
if (gw == null) {
continue;
}
Site2SiteVpnGatewayResponse site2SiteVpnGatewayRes = _responseGenerator.createSite2SiteVpnGatewayResponse(gw);
site2SiteVpnGatewayRes.setObjectName("vpngateway");
gwResponses.add(site2SiteVpnGatewayRes);
}
}
response.setResponses(gwResponses);
response.setResponseName(getCommandName());

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

@ -3765,10 +3765,16 @@ public class ApiResponseHelper implements ResponseGenerator {
@Override
public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVpnGateway result) {
Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
response.setId(result.getId());
response.setIp(ApiDBUtils.findIpAddressById(result.getAddrId()).getAddress().toString());
response.setVpcId(result.getVpcId());
response.setRemoved(result.getRemoved());
response.setObjectName("vpngateway");
populateAccount(response, result.getAccountId());
populateDomain(response, result.getDomainId());
return response;
}