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-06-29 11:05:10 -07:00
parent afa52cd554
commit d922b99c64
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -3625,6 +3625,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setId(result.getId());
response.setIp(ApiDBUtils.findIpAddressById(result.getAddrId()).getAddress().toString());
response.setRemoved(result.getRemoved());
response.setObjectName("vpngateway");
return response;
}

4
ui/scripts/network.js
View File

@ -3261,7 +3261,7 @@
validation: { required: true }
},
cidrlist: {
label: 'guest cidr list',
label: 'CIDR list',
validation: { required: true }
},
ipsecpsk: {
@ -3320,7 +3320,7 @@
url: createURL("queryAsyncJobResult&jobid=" + jid),
dataType: "json",
success: function(json) {
var result = json.queryasyncjobresultresponse;
var result = json.queryasyncjobresultresponse;
if (result.jobstatus == 0) {
return; //Job has not completed
}