From d922b99c648a1522f0f00974671b45feee98ac10 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 29 Jun 2012 11:05:10 -0700 Subject: [PATCH] cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. --- api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java | 4 +++- server/src/com/cloud/api/ApiResponseHelper.java | 1 + ui/scripts/network.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java index 46d5d7dcffc..543110e8971 100644 --- a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java +++ b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java @@ -65,7 +65,9 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd { List gwResponses = new ArrayList(); 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); diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index d0ac92626c7..6926c2bde90 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -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; } diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 67c3adb552e..7339894e467 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -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 }