Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2DC3EBE1 for ; Thu, 27 Dec 2012 03:22:33 +0000 (UTC) Received: (qmail 20889 invoked by uid 500); 27 Dec 2012 03:22:33 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 20719 invoked by uid 500); 27 Dec 2012 03:22:32 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 20668 invoked by uid 99); 27 Dec 2012 03:22:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Dec 2012 03:22:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2FD5B8205A8; Thu, 27 Dec 2012 03:22:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Simulator: Fixing the listTemplatesCommand Message-Id: <20121227032232.2FD5B8205A8@tyr.zones.apache.org> Date: Thu, 27 Dec 2012 03:22:32 +0000 (UTC) Simulator: Fixing the listTemplatesCommand Should return the ListTemplatesAnswer and ListVolumes returns ListVolumesAnswer Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/539fca35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/539fca35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/539fca35 Branch: refs/heads/master Commit: 539fca35209bdbf26eecfb22f7a63d2f21488cc1 Parents: bab974c Author: Prasanna Santhanam Authored: Wed Dec 26 19:20:32 2012 -0800 Committer: Prasanna Santhanam Committed: Wed Dec 26 19:22:17 2012 -0800 ---------------------------------------------------------------------- .../agent/manager/MockStorageManagerImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/539fca35/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index a950926..1076089 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -434,13 +434,13 @@ public class MockStorageManagerImpl implements MockStorageManager { List volumes = _mockVolumeDao.findByStorageIdAndType(storage.getId(), MockVolumeType.VOLUME); - Map templateInfos = new HashMap(); + Map templateInfos = new HashMap(); for (MockVolumeVO volume : volumes) { - templateInfos.put(volume.getName(), new TemplateInfo(volume.getName(), volume.getPath() + templateInfos.put(volume.getId(), new TemplateInfo(volume.getName(), volume.getPath() .replaceAll(storage.getMountPoint(), ""), volume.getSize(), volume.getSize(), true, false)); } txn.commit(); - return new ListTemplateAnswer(cmd.getSecUrl(), templateInfos); + return new ListVolumeAnswer(cmd.getSecUrl(), templateInfos); } catch (Exception ex) { txn.rollback(); throw new CloudRuntimeException("Error when finding template on sec storage " + storage.getId(), ex);