From 452176c0b43c9122e73f89d6ccd86cb36823ec68 Mon Sep 17 00:00:00 2001 From: Isaac Chiang Date: Tue, 30 Jul 2013 18:59:35 +0800 Subject: [PATCH] CLOUDSTACK-3935:Inconsistent json object name for image store api --- .../api/command/admin/storage/AddImageStoreCmd.java | 2 +- .../command/admin/storage/ListImageStoresCmd.java | 2 +- ui/scripts/system.js | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java index 1e383c9647b..7e4409895c4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java @@ -141,7 +141,7 @@ public class AddImageStoreCmd extends BaseCmd { if (result != null ) { storeResponse = _responseGenerator.createImageStoreResponse(result); storeResponse.setResponseName(getCommandName()); - storeResponse.setObjectName("secondarystorage"); + storeResponse.setObjectName("imagestore"); this.setResponseObject(storeResponse); } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add secondary storage"); diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java index 7063e6c6bda..97fc6fbc249 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java @@ -29,7 +29,7 @@ import org.apache.log4j.Logger; public class ListImageStoresCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListImageStoresCmd.class.getName()); - private static final String s_name = "listimagestoreresponse"; + private static final String s_name = "listimagestoresresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 50cffb34776..f25f4617fd8 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -291,7 +291,7 @@ data: data2, success: function(json) { dataFns.systemVmCount($.extend(data, { - secondaryStorageCount: json.listimagestoreresponse.imagestore ? json.listimagestoreresponse.count : 0 + secondaryStorageCount: json.listimagestoresresponse.imagestore ? json.listimagestoresresponse.count : 0 })); } }); @@ -7336,7 +7336,7 @@ data: data, success: function(json) { args.response.success({ - data: json.listimagestoreresponse.imagestore + data: json.listimagestoresresponse.imagestore }); }, error: function(json) { @@ -14794,7 +14794,7 @@ url: createURL('addImageStore'), data: data, success: function(json) { - var item = json.addimagestoreresponse.secondarystorage; + var item = json.addimagestoreresponse.imagestore; args.response.success({ data: item }); @@ -14844,7 +14844,7 @@ data: data, success: function(json) { havingS3 = true; - var item = json.addimagestoreresponse.secondarystorage; + var item = json.addimagestoreresponse.imagestore; args.response.success({ data: item }); @@ -14904,7 +14904,7 @@ data: data, success: function(json) { havingSwift = true; - var item = json.addimagestoreresponse.secondarystorage; + var item = json.addimagestoreresponse.imagestore; args.response.success({ data: item }); @@ -15014,7 +15014,7 @@ dataType: "json", async: true, success: function(json) { - var item = json.listimagestoreresponse.imagestore[0]; + var item = json.listimagestoresresponse.imagestore[0]; args.response.success({ actionFilter: secondarystorageActionfilter, data: item