From 6cf45ad29b1cea688f54cf95d33d8fd4ab6d1c85 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Fri, 29 Jun 2012 14:40:00 -0700
Subject: [PATCH] cloudstack 3.0 API: CreateVpnCustomerGateway API,
 ListVpnCustomerGateways API: set object name for API response.

---
 .../cloud/api/commands/ListVpnCustomerGatewaysCmd.java   | 4 +++-
 server/src/com/cloud/api/ApiResponseHelper.java          | 1 +
 ui/scripts/network.js                                    | 9 ++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
index 9f5a14306b3..4f1488b68c5 100644
--- a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
@@ -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);
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 6926c2bde90..1491ac5ec07 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -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;
     }
 
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 23b13ef6fca..5446d10bc6b 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -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));