Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9869810D2E for ; Tue, 30 Jul 2013 11:01:24 +0000 (UTC) Received: (qmail 99420 invoked by uid 500); 30 Jul 2013 11:01:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 99355 invoked by uid 500); 30 Jul 2013 11:01:24 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 99343 invoked by uid 99); 30 Jul 2013 11:01:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 11:01:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 070EA31A62C; Tue, 30 Jul 2013 11:01:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: isaacchiang@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to c24db86 Date: Tue, 30 Jul 2013 11:01:21 +0000 (UTC) Updated Branches: refs/heads/4.2 baa6d0bad -> c24db863a CLOUDSTACK-3935:Inconsistent json object name for image store api Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c24db863 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c24db863 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c24db863 Branch: refs/heads/4.2 Commit: c24db863a6ae7be1894076ae4b053e0f15889285 Parents: baa6d0b Author: Isaac Chiang Authored: Tue Jul 30 18:59:35 2013 +0800 Committer: Isaac Chiang Committed: Tue Jul 30 18:59:35 2013 +0800 ---------------------------------------------------------------------- .../api/command/admin/storage/AddImageStoreCmd.java | 2 +- .../api/command/admin/storage/ListImageStoresCmd.java | 2 +- ui/scripts/system.js | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c24db863/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java ---------------------------------------------------------------------- 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 1e383c9..7e44098 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"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c24db863/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java ---------------------------------------------------------------------- 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 7063e6c..97fc6fb 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 ///////////////////// http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c24db863/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 50cffb3..f25f461 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