From 2ff01a79cad58597aac2e38a06c891b13ddd6ca9 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Fri, 12 Apr 2013 17:10:19 -0700 Subject: [PATCH] Rename TemplateTO/VolumeTO in cloud-engine-storage to TemplateObjectTO/VolumeObjectTO to avoid name conflicting with the one in cloud-api. --- .../cloudstack/storage/image/store/TemplateObject.java | 4 ++-- .../cloudstack/storage/test/DirectAgentTest.java | 4 ++-- .../command/CreateVolumeFromBaseImageCommand.java | 8 ++++---- .../cloudstack/storage/command/DeleteCommand.java | 2 +- .../storage/to/ImageOnPrimayDataStoreTO.java | 6 +++--- .../to/{TemplateTO.java => TemplateObjectTO.java} | 4 ++-- .../storage/to/{VolumeTO.java => VolumeObjectTO.java} | 4 ++-- .../apache/cloudstack/storage/volume/VolumeObject.java | 4 ++-- .../xen/resource/XenServerStorageResource.java | 10 +++++----- 9 files changed, 23 insertions(+), 23 deletions(-) rename engine/storage/src/org/apache/cloudstack/storage/to/{TemplateTO.java => TemplateObjectTO.java} (95%) rename engine/storage/src/org/apache/cloudstack/storage/to/{VolumeTO.java => VolumeObjectTO.java} (96%) diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java index 2025d27d45d..7727f12d91e 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; import org.apache.cloudstack.storage.image.manager.ImageDataManager; -import org.apache.cloudstack.storage.to.TemplateTO; +import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -187,7 +187,7 @@ public class TemplateObject implements TemplateInfo { public DataTO getTO() { DataTO to = this.dataStore.getDriver().getTO(this); if (to == null) { - to = new TemplateTO(this); + to = new TemplateObjectTO(this); } return to; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java index 71f1beb3365..a5a4cb75877 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.apache.cloudstack.storage.to.ImageStoreTO; import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; -import org.apache.cloudstack.storage.to.TemplateTO; +import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; @@ -134,7 +134,7 @@ public class DirectAgentTest extends CloudStackTestNGBase { ImageStoreTO imageStore = Mockito.mock(ImageStoreTO.class); Mockito.when(imageStore.getType()).thenReturn("http"); - TemplateTO template = Mockito.mock(TemplateTO.class); + TemplateObjectTO template = Mockito.mock(TemplateObjectTO.class); Mockito.when(template.getPath()).thenReturn(this.getTemplateUrl()); Mockito.when(template.getImageDataStore()).thenReturn(imageStore); diff --git a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java index f4be0676b9b..db96571c552 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java +++ b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java @@ -19,20 +19,20 @@ package org.apache.cloudstack.storage.command; import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; -import org.apache.cloudstack.storage.to.VolumeTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import com.cloud.agent.api.Command; public class CreateVolumeFromBaseImageCommand extends Command implements StorageSubSystemCommand { - private final VolumeTO volume; + private final VolumeObjectTO volume; private final ImageOnPrimayDataStoreTO image; - public CreateVolumeFromBaseImageCommand(VolumeTO volume, String image) { + public CreateVolumeFromBaseImageCommand(VolumeObjectTO volume, String image) { this.volume = volume; this.image = null; } - public VolumeTO getVolume() { + public VolumeObjectTO getVolume() { return this.volume; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/command/DeleteCommand.java b/engine/storage/src/org/apache/cloudstack/storage/command/DeleteCommand.java index 5d948d19356..3f62100b832 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/command/DeleteCommand.java +++ b/engine/storage/src/org/apache/cloudstack/storage/command/DeleteCommand.java @@ -18,7 +18,7 @@ */ package org.apache.cloudstack.storage.command; -import org.apache.cloudstack.storage.to.VolumeTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import com.cloud.agent.api.Command; diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java index 18743d70bf2..e3909187467 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java @@ -23,11 +23,11 @@ import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo; public class ImageOnPrimayDataStoreTO { private final String pathOnPrimaryDataStore; private PrimaryDataStoreTO dataStore; - private final TemplateTO template; + private final TemplateObjectTO template; public ImageOnPrimayDataStoreTO(TemplateOnPrimaryDataStoreInfo template) { this.pathOnPrimaryDataStore = template.getPath(); //this.dataStore = template.getPrimaryDataStore().getDataStoreTO(); - this.template = new TemplateTO(template.getTemplate()); + this.template = new TemplateObjectTO(template.getTemplate()); } public String getPathOnPrimaryDataStore() { @@ -38,7 +38,7 @@ public class ImageOnPrimayDataStoreTO { return this.dataStore; } - public TemplateTO getTemplate() { + public TemplateObjectTO getTemplate() { return this.template; } } diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/TemplateTO.java b/engine/storage/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java similarity index 95% rename from engine/storage/src/org/apache/cloudstack/storage/to/TemplateTO.java rename to engine/storage/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java index f54c2c71e1d..76f0d036e29 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/to/TemplateTO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java @@ -23,14 +23,14 @@ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; import org.apache.cloudstack.storage.image.datastore.ImageStoreInfo; -public class TemplateTO implements DataTO { +public class TemplateObjectTO implements DataTO { private final String path; private final String uuid; private DiskFormat diskType; private final ImageStoreTO imageDataStore; private final String name; - public TemplateTO(TemplateInfo template) { + public TemplateObjectTO(TemplateInfo template) { this.path = template.getUri(); this.uuid = template.getUuid(); //this.diskType = template.getDiskType(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/VolumeTO.java b/engine/storage/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java similarity index 96% rename from engine/storage/src/org/apache/cloudstack/storage/to/VolumeTO.java rename to engine/storage/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java index 162ff38cc2f..e556a3bd95b 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/to/VolumeTO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; import org.apache.cloudstack.engine.subsystem.api.storage.type.VolumeType; -public class VolumeTO implements DataTO { +public class VolumeObjectTO implements DataTO { private final String uuid; private final String path; private VolumeType volumeType; @@ -31,7 +31,7 @@ public class VolumeTO implements DataTO { private PrimaryDataStoreTO dataStore; private String name; private final long size; - public VolumeTO(VolumeInfo volume) { + public VolumeObjectTO(VolumeInfo volume) { this.uuid = volume.getUuid(); this.path = volume.getUri(); //this.volumeType = volume.getType(); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index c2fb0cb1133..67f75b085fb 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; -import org.apache.cloudstack.storage.to.VolumeTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -339,7 +339,7 @@ public class VolumeObject implements VolumeInfo { public DataTO getTO() { DataTO to = this.getDataStore().getDriver().getTO(this); if (to == null) { - to = new VolumeTO(this); + to = new VolumeObjectTO(this); } return to; } diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java index 70c992f791f..b629377a4d8 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java @@ -47,8 +47,8 @@ import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol; import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; import org.apache.cloudstack.storage.to.ImageStoreTO; import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; -import org.apache.cloudstack.storage.to.TemplateTO; -import org.apache.cloudstack.storage.to.VolumeTO; +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; @@ -194,7 +194,7 @@ public class XenServerStorageResource { } protected Answer execute(DeleteVolumeCommand cmd) { - VolumeTO volume = null; + VolumeObjectTO volume = null; Connection conn = hypervisorResource.getConnection(); String errorMsg = null; try { @@ -216,7 +216,7 @@ public class XenServerStorageResource { } protected Answer execute(CreateVolumeFromBaseImageCommand cmd) { - VolumeTO volume = cmd.getVolume(); + VolumeObjectTO volume = cmd.getVolume(); ImageOnPrimayDataStoreTO baseImage = cmd.getImage(); Connection conn = hypervisorResource.getConnection(); @@ -683,7 +683,7 @@ public class XenServerStorageResource { try { if (srcStore.getRole() == DataStoreRole.ImageCache && srcData.getObjectType() == DataObjectType.TEMPLATE) { ImageStoreTO srcImageStore = (ImageStoreTO)srcStore; - TemplateTO srcTemplate = (TemplateTO)srcData; + TemplateObjectTO srcTemplate = (TemplateObjectTO)srcData; String storeUrl = srcImageStore.getUri(); if (!storeUrl.startsWith("nfs")) { return new PrimaryStorageDownloadAnswer("only nfs image cache store supported");