From aa53ddf4f8e3d8c30bcab24f2da17d559b9be03c Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 13 Jan 2012 17:24:30 -0800 Subject: [PATCH] don't need to check secondary storage for simulator --- .../com/cloud/agent/manager/MockStorageManagerImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index 1e12ce93c89..c37670700ee 100644 --- a/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -111,11 +111,6 @@ public class MockStorageManagerImpl implements MockStorageManager { } @Override public PrimaryStorageDownloadAnswer primaryStorageDownload(PrimaryStorageDownloadCommand cmd) { - MockVolumeVO template = findVolumeFromSecondary(cmd.getUrl(),cmd.getSecondaryStorageUrl(), MockVolumeType.TEMPLATE); - if (template == null) { - return new PrimaryStorageDownloadAnswer("Can't find primary storage"); - } - MockStoragePoolVO primaryStorage = _mockStoragePoolDao.findByUuid(cmd.getPoolUuid()); if (primaryStorage == null) { return new PrimaryStorageDownloadAnswer("Can't find primary storage"); @@ -126,7 +121,7 @@ public class MockStorageManagerImpl implements MockStorageManager { newVolume.setName(volumeName); newVolume.setPath(primaryStorage.getMountPoint() + volumeName); newVolume.setPoolId(primaryStorage.getId()); - newVolume.setSize(template.getSize()); + newVolume.setSize(1000000); newVolume.setType(MockVolumeType.VOLUME); _mockVolumeDao.persist(newVolume);