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: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.

This commit is contained in:
Jessica Wang 2012-06-29 14:40:00 -07:00
parent 68a82ae1e3
commit 6cf45ad29b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,9 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc
List<Site2SiteCustomerGatewayResponse> gwResponses = new ArrayList<Site2SiteCustomerGatewayResponse>();
if (gws != null && !gws.isEmpty()) {
for (Site2SiteCustomerGateway gw : gws) {
gwResponses.add(_responseGenerator.createSite2SiteCustomerGatewayResponse(gw));
Site2SiteCustomerGatewayResponse site2SiteCustomerGatewayRes = _responseGenerator.createSite2SiteCustomerGatewayResponse(gw);
site2SiteCustomerGatewayRes.setObjectName("vpncustomergateway");
gwResponses.add(site2SiteCustomerGatewayRes);
}
}
response.setResponses(gwResponses);

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

@ -3637,6 +3637,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setGuestCidrList(result.getGuestCidrList());
response.setIpsecPsk(result.getIpsecPsk());
response.setRemoved(result.getRemoved());
response.setObjectName("vpncustomergateway");
return response;
}

9
ui/scripts/network.js
View File

@ -3328,7 +3328,7 @@
if (result.jobstatus == 1) {
var obj = result.jobresult.vpngateway;
var vpngatewayid = obj.id;
//???
$.ajax({
url: createURL('createVpnCustomerGateway'),
data: {
@ -3348,7 +3348,6 @@
dataType: "json",
success: function(json) {
var result = json.queryasyncjobresultresponse;
debugger;
if (result.jobstatus == 0) {
return; //Job has not completed
}
@ -3356,7 +3355,8 @@
clearInterval(createvpncustomergatewayIntervalID);
if (result.jobstatus == 1) {
var obj = result.jobresult.vpncustomergateway;
var vpncustomergatewayid = obj.id;
var vpncustomergatewayid = obj.id;
//???
}
else if (result.jobstatus == 2) {
alert("Failed to create VPN customer gateway. Error: " + _s(result.jobresult.errortext));
@ -3370,8 +3370,7 @@
});
}, 3000);
}
});
//???
});
}
else if (result.jobstatus == 2) {
alert("Failed to create VPN gateway. Error: " + _s(result.jobresult.errortext));