apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Edison Su 2012-08-15 17:44:30 -07:00
parent fe3786341f
commit 5ba4913f63
195 changed files with 2776 additions and 2293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
View File

@ -85,9 +85,9 @@ import com.cloud.simulator.dao.MockStoragePoolDao;
import com.cloud.simulator.dao.MockVMDao;
import com.cloud.simulator.dao.MockVolumeDao;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.template.TemplateInfo;
import com.cloud.utils.component.Inject;
import com.cloud.vm.DiskProfile;

2
agent-simulator/src/com/cloud/resource/AgentRoutingResource.java
View File

@ -54,7 +54,7 @@ import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.simulator.MockVMVO;
import com.cloud.storage.Storage.StorageResourceType;
import com.cloud.storage.pool.Storage.StorageResourceType;
import com.cloud.storage.template.TemplateInfo;
import com.cloud.utils.Pair;
import com.cloud.vm.VirtualMachine.State;

2
agent-simulator/src/com/cloud/simulator/MockStoragePoolVO.java
View File

@ -25,7 +25,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
@Entity
@Table(name="mockstoragepool")

2
agent-simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java
View File

@ -19,7 +19,7 @@ package com.cloud.simulator.dao;
import javax.ejb.Local;
import com.cloud.simulator.MockStoragePoolVO;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;

4
agent/src/com/cloud/agent/resource/DummyResource.java
View File

@ -40,8 +40,8 @@ import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.resource.ServerResource;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.StoragePoolType;
@Local(value = { ServerResource.class })
public class DummyResource implements ServerResource {

2
api/src/com/cloud/agent/api/AttachVolumeCommand.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
public class AttachVolumeCommand extends Command {

2
api/src/com/cloud/agent/api/BackupSnapshotCommand.java
View File

@ -19,7 +19,7 @@ package com.cloud.agent.api;
import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.SwiftTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
/**
* This currently assumes that both primary and secondary storage are mounted on the XenServer.

2
api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
public class CreateStoragePoolCommand extends ModifyStoragePoolCommand {

2
api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
View File

@ -20,7 +20,7 @@ import java.io.File;
import java.util.UUID;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
public class DeleteStoragePoolCommand extends Command {

2
api/src/com/cloud/agent/api/GetFileStatsAnswer.java
View File

@ -17,7 +17,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.storage.VolumeStats;
import com.cloud.storage.volume.VolumeStats;
@LogLevel(Log4jLevel.Trace)
public class GetFileStatsAnswer extends Answer implements VolumeStats {

2
api/src/com/cloud/agent/api/GetFileStatsCommand.java
View File

@ -17,7 +17,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
@LogLevel(Log4jLevel.Trace)
public class GetFileStatsCommand extends Command {

2
api/src/com/cloud/agent/api/GetStorageStatsAnswer.java
View File

@ -17,7 +17,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.storage.StorageStats;
import com.cloud.storage.pool.StorageStats;
@LogLevel(Log4jLevel.Trace)
public class GetStorageStatsAnswer extends Answer implements StorageStats {

2
api/src/com/cloud/agent/api/GetStorageStatsCommand.java
View File

@ -17,7 +17,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
@LogLevel(Log4jLevel.Trace)
public class GetStorageStatsCommand extends Command {

2
api/src/com/cloud/agent/api/ManageSnapshotCommand.java
View File

@ -17,7 +17,7 @@
package com.cloud.agent.api;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
public class ManageSnapshotCommand extends Command {

2
api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
View File

@ -20,7 +20,7 @@ import java.io.File;
import java.util.UUID;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
public class ModifyStoragePoolCommand extends Command {

4
api/src/com/cloud/agent/api/StartupStorageCommand.java
View File

@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import com.cloud.host.Host;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.template.TemplateInfo;

2
api/src/com/cloud/agent/api/StoragePoolInfo.java
View File

@ -18,7 +18,7 @@ package com.cloud.agent.api;
import java.util.Map;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
public class StoragePoolInfo {
String uuid;

2
api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api.storage;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
public abstract class AbstractDownloadCommand extends ssCommand {

2
api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api.storage;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
public class AbstractUploadCommand extends StorageCommand{

2
api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
View File

@ -18,7 +18,7 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
public class CopyVolumeCommand extends Command {

2
api/src/com/cloud/agent/api/storage/CreateCommand.java
View File

@ -18,7 +18,7 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.vm.DiskProfile;
public class CreateCommand extends Command {

2
api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
View File

@ -18,7 +18,7 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
public class CreatePrivateTemplateAnswer extends Answer {
private String _path;

4
api/src/com/cloud/agent/api/storage/DestroyCommand.java
View File

@ -17,9 +17,9 @@
package com.cloud.agent.api.storage;
import com.cloud.agent.api.to.VolumeTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.Volume;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.volume.Volume;
public class DestroyCommand extends StorageCommand {
// in VMware, things are designed around VM instead of volume, we need it the volume VM context if the volume is attached

4
api/src/com/cloud/agent/api/storage/DownloadCommand.java
View File

@ -18,8 +18,8 @@ package com.cloud.agent.api.storage;
import java.net.URI;
import com.cloud.storage.Volume;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.volume.Volume;
import com.cloud.template.VirtualMachineTemplate;

2
api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api.storage;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
/**

4
api/src/com/cloud/agent/api/to/StorageFilerTO.java
View File

@ -16,8 +16,8 @@
// under the License.
package com.cloud.agent.api.to;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.pool.Storage.StoragePoolType;
public class StorageFilerTO {
long id;

2
api/src/com/cloud/agent/api/to/TemplateTO.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.agent.api.to;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
public class TemplateTO {

6
api/src/com/cloud/agent/api/to/VolumeTO.java
View File

@ -16,9 +16,9 @@
// under the License.
package com.cloud.agent.api.to;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Volume;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.volume.Volume;
public class VolumeTO {
protected VolumeTO() {

6
api/src/com/cloud/api/BaseCmd.java
View File

@ -55,7 +55,7 @@ import com.cloud.projects.ProjectService;
import com.cloud.resource.ResourceService;
import com.cloud.server.ManagementService;
import com.cloud.server.TaggedResourceService;
import com.cloud.storage.StorageService;
import com.cloud.storage.pool.StoragePoolService;
import com.cloud.storage.snapshot.SnapshotService;
import com.cloud.template.TemplateService;
import com.cloud.user.Account;
@ -114,7 +114,7 @@ public abstract class BaseCmd {
public static AccountService _accountService;
public static UserVmService _userVmService;
public static ManagementService _mgr;
public static StorageService _storageService;
public static StoragePoolService _storageService;
public static ResourceService _resourceService;
public static NetworkService _networkService;
public static TemplateService _templateService;
@ -145,7 +145,7 @@ public abstract class BaseCmd {
_accountService = locator.getManager(AccountService.class);
_configService = locator.getManager(ConfigurationService.class);
_userVmService = locator.getManager(UserVmService.class);
_storageService = locator.getManager(StorageService.class);
_storageService = locator.getManager(StoragePoolService.class);
_resourceService = locator.getManager(ResourceService.class);
_networkService = locator.getManager(NetworkService.class);
_templateService = locator.getManager(TemplateService.class);

6
api/src/com/cloud/api/ResponseGenerator.java
View File

@ -131,11 +131,11 @@ import com.cloud.projects.Project;
import com.cloud.projects.ProjectAccount;
import com.cloud.projects.ProjectInvitation;
import com.cloud.server.ResourceTag;
import com.cloud.storage.Snapshot;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Swift;
import com.cloud.storage.Volume;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.storage.volume.Volume;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.User;

2
api/src/com/cloud/api/commands/AttachVolumeCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

4
api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java
View File

@ -29,7 +29,7 @@ import com.cloud.api.response.StoragePoolResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -102,7 +102,7 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException{
StoragePool result = _storageService.cancelPrimaryStorageForMaintenance(this);
StoragePool result = _storageService.cancelStorageForMaintenance(this);
if (result != null) {
StoragePoolResponse response = _responseGenerator.createStoragePoolResponse(result);
response.setResponseName(getCommandName());

4
api/src/com/cloud/api/commands/CreateSnapshotCmd.java
View File

@ -32,8 +32,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.projects.Project;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

2
api/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java
View File

@ -28,8 +28,8 @@ import com.cloud.api.response.SnapshotPolicyResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.projects.Project;
import com.cloud.storage.Volume;
import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
@Implementation(description="Creates a snapshot policy for the account.", responseObject=SnapshotPolicyResponse.class)

2
api/src/com/cloud/api/commands/CreateStoragePoolCmd.java
View File

@ -30,7 +30,7 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.user.Account;
@SuppressWarnings("rawtypes")

4
api/src/com/cloud/api/commands/CreateTemplateCmd.java
View File

@ -37,8 +37,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.projects.Project;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.storage.volume.Volume;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

2
api/src/com/cloud/api/commands/CreateVolumeCmd.java
View File

@ -29,7 +29,7 @@ import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.UserContext;
@Implementation(responseObject=VolumeResponse.class, description="Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.")

4
api/src/com/cloud/api/commands/DeletePoolCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.pool.StoragePoolStatus;
import com.cloud.user.Account;
@Implementation(description = "Deletes a storage pool.", responseObject = SuccessResponse.class)

2
api/src/com/cloud/api/commands/DeleteSnapshotCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

2
api/src/com/cloud/api/commands/DeleteVolumeCmd.java
View File

@ -26,7 +26,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

2
api/src/com/cloud/api/commands/DetachVolumeCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
import com.cloud.uservm.UserVm;

2
api/src/com/cloud/api/commands/ExtractVolumeCmd.java
View File

@ -32,7 +32,7 @@ import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.event.EventTypes;
import com.cloud.storage.Upload;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;

2
api/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.GuestOSCategoryResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.storage.GuestOsCategory;
import com.cloud.storage.volume.GuestOsCategory;
@Implementation(description="Lists all supported OS categories for this cloud.", responseObject=GuestOSCategoryResponse.class)
public class ListGuestOsCategoriesCmd extends BaseListCmd {

2
api/src/com/cloud/api/commands/ListGuestOsCmd.java
View File

@ -28,7 +28,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.GuestOSResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.storage.GuestOS;
import com.cloud.storage.volume.GuestOS;
@Implementation(description="Lists all supported OS types for this cloud.", responseObject=GuestOSResponse.class)
public class ListGuestOsCmd extends BaseListCmd {

2
api/src/com/cloud/api/commands/ListIsoPermissionsCmd.java
View File

@ -18,7 +18,7 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
public class ListIsoPermissionsCmd extends ListTemplateOrIsoPermissionsCmd {

2
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
View File

@ -29,7 +29,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SnapshotResponse;
import com.cloud.async.AsyncJob;
import com.cloud.storage.Snapshot;
import com.cloud.storage.snapshot.Snapshot;
@Implementation(description="Lists all available snapshots for the account.", responseObject=SnapshotResponse.class)

2
api/src/com/cloud/api/commands/ListStoragePoolsCmd.java
View File

@ -30,7 +30,7 @@ import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.async.AsyncJob;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
@Implementation(description="Lists storage pools.", responseObject=StoragePoolResponse.class)
public class ListStoragePoolsCmd extends BaseListCmd {

2
api/src/com/cloud/api/commands/ListTemplatePermissionsCmd.java
View File

@ -18,7 +18,7 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
public class ListTemplatePermissionsCmd extends ListTemplateOrIsoPermissionsCmd {

2
api/src/com/cloud/api/commands/ListVolumesCmd.java
View File

@ -29,7 +29,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJob;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
@Implementation(description="Lists all volumes.", responseObject=VolumeResponse.class)

2
api/src/com/cloud/api/commands/MigrateVMCmd.java
View File

@ -33,7 +33,7 @@ import com.cloud.exception.ManagementServerException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.host.Host;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
import com.cloud.uservm.UserVm;

2
api/src/com/cloud/api/commands/MigrateVolumeCmd.java
View File

@ -26,7 +26,7 @@ import com.cloud.api.ServerApiException;
import com.cloud.api.response.VolumeResponse;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.Account;

4
api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java
View File

@ -30,7 +30,7 @@ import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -100,7 +100,7 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
StoragePool result = _storageService.preparePrimaryStorageForMaintenance(getId());
StoragePool result = _storageService.prepareStorageForMaintenance(getId());
if (result != null){
StoragePoolResponse response = _responseGenerator.createStoragePoolResponse(result);
response.setResponseName("storagepool");

2
api/src/com/cloud/api/commands/UpdateStoragePoolCmd.java
View File

@ -27,7 +27,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.user.Account;
@Implementation(description="Updates a storage pool.", responseObject=StoragePoolResponse.class, since="3.0.0")

4
api/src/com/cloud/api/commands/UploadVolumeCmd.java
View File

@ -32,7 +32,7 @@ import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
import com.cloud.user.UserContext;
@Implementation(description="Uploads a data disk.", responseObject=VolumeResponse.class)
@ -109,7 +109,7 @@ public class UploadVolumeCmd extends BaseAsyncCmd {
ConcurrentOperationException, ResourceAllocationException,
NetworkRuleConflictException {
Volume volume = _storageService.uploadVolume(this);
Volume volume = _templateService.uploadVolume(this);
if (volume != null){
VolumeResponse response = _responseGenerator.createVolumeResponse(volume);
response.setResponseName(getCommandName());

2
api/src/com/cloud/api/response/SnapshotResponse.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param;
import com.cloud.storage.Snapshot;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.utils.IdentityProxy;
import com.google.gson.annotations.SerializedName;

2
api/src/com/cloud/api/response/StoragePoolResponse.java
View File

@ -21,7 +21,7 @@ import java.util.Date;
import com.cloud.api.ApiConstants;
import com.cloud.utils.IdentityProxy;
import com.cloud.serializer.Param;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.pool.StoragePoolStatus;
import com.google.gson.annotations.SerializedName;
public class StoragePoolResponse extends BaseResponse {

2
api/src/com/cloud/api/response/TemplateResponse.java
View File

@ -22,7 +22,7 @@ import java.util.Map;
import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.utils.IdentityProxy;
import com.google.gson.annotations.SerializedName;

4
api/src/com/cloud/deploy/DeployDestination.java
View File

@ -22,8 +22,8 @@ import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod;
import com.cloud.host.Host;
import com.cloud.org.Cluster;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Volume;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.volume.Volume;
import com.cloud.utils.NumbersUtil;
public class DeployDestination {

2
api/src/com/cloud/deploy/DeploymentPlanner.java
View File

@ -27,7 +27,7 @@ import com.cloud.exception.InsufficientServerCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;
import com.cloud.org.Cluster;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.utils.component.Adapter;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;

2
api/src/com/cloud/exception/InsufficientStorageCapacityException.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.exception;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.utils.SerialVersionUID;
/**

2
api/src/com/cloud/exception/StorageUnavailableException.java
View File

@ -16,7 +16,7 @@
// under the License.
package com.cloud.exception;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.utils.SerialVersionUID;
/**

6
api/src/com/cloud/server/ManagementService.java
View File

@ -82,9 +82,9 @@ import com.cloud.network.router.VirtualRouter;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.ServiceOffering;
import com.cloud.org.Cluster;
import com.cloud.storage.GuestOS;
import com.cloud.storage.GuestOsCategory;
import com.cloud.storage.StoragePool;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.volume.GuestOS;
import com.cloud.storage.volume.GuestOsCategory;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.SSHKeyPair;
import com.cloud.utils.Pair;

10
api/src/com/cloud/storage/orchestra/StorageOrchestraEngine.java Normal file
View File

@ -0,0 +1,10 @@
package com.cloud.storage.orchestra;
import com.cloud.storage.pool.StoragePoolService;
import com.cloud.storage.snapshot.SnapshotService;
import com.cloud.storage.volume.VolumeService;
import com.cloud.template.TemplateService;
public interface StorageOrchestraEngine extends StoragePoolService, VolumeService, SnapshotService, TemplateService {
}

2
api/src/com/cloud/storage/Storage.java → api/src/com/cloud/storage/pool/Storage.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.pool;
import java.util.ArrayList;
import java.util.List;

4
api/src/com/cloud/storage/StoragePool.java → api/src/com/cloud/storage/pool/StoragePool.java
View File

@ -14,11 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.pool;
import java.util.Date;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
public interface StoragePool {

61
api/src/com/cloud/storage/StorageService.java → api/src/com/cloud/storage/pool/StoragePoolService.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.pool;
import java.net.UnknownHostException;
import java.util.List;
@ -32,8 +32,9 @@ import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.volume.Volume;
public interface StorageService{
public interface StoragePoolService {
/**
* Create StoragePool based on uri
*
@ -45,34 +46,10 @@ public interface StorageService{
* @throws IllegalArgumentException
* @throws UnknownHostException
* @throws ResourceUnavailableException
* TODO
*/
StoragePool createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException,
UnknownHostException, ResourceUnavailableException;
/**
* Creates the database object for a volume based on the given criteria
*
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
* @return the volume object
* @throws PermissionDeniedException
*/
Volume allocVolume(CreateVolumeCmd cmd) throws ResourceAllocationException;
/**
* Creates the volume based on the given criteria
*
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
* @return the volume object
*/
Volume createVolume(CreateVolumeCmd cmd);
boolean deleteVolume(long volumeId) throws ConcurrentOperationException;
/**
* Delete the storage pool
*
@ -81,21 +58,19 @@ public interface StorageService{
* @return success or failure
*/
boolean deletePool(DeletePoolCmd cmd);
/**
* Enable maintenance for primary storage
* Enable maintenance for storage
*
* @param cmd
* - the command specifying primaryStorageId
* @return the primary storage pool
* @throws ResourceUnavailableException
* TODO
* @throws InsufficientCapacityException
* TODO
*/
public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException,
public StoragePool prepareStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException,
InsufficientCapacityException;
/**
* Complete maintenance for primary storage
*
@ -103,26 +78,14 @@ public interface StorageService{
* - the command specifying primaryStorageId
* @return the primary storage pool
* @throws ResourceUnavailableException
* TODO
*/
public StoragePool cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd)
public StoragePool cancelStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd)
throws ResourceUnavailableException;
//TODO: Need to move around for this following APIs
public StoragePool updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
public StoragePool getStoragePool(long id);
Volume migrateVolume(Long volumeId, Long storagePoolId) throws ConcurrentOperationException;
List<? extends Volume> searchForVolumes(ListVolumesCmd cmd);
/**
* Uploads the volume to secondary storage
*
* @param UploadVolumeCmd cmd
*
* @return Volume object
*/
Volume uploadVolume(UploadVolumeCmd cmd) throws ResourceAllocationException;
}

2
api/src/com/cloud/storage/StoragePoolStatus.java → api/src/com/cloud/storage/pool/StoragePoolStatus.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.pool;
public enum StoragePoolStatus {
Up,

2
api/src/com/cloud/storage/StorageStats.java → api/src/com/cloud/storage/pool/StorageStats.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.pool;
public interface StorageStats {
/**

2
api/src/com/cloud/storage/Snapshot.java → api/src/com/cloud/storage/snapshot/Snapshot.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.snapshot;
import java.util.Date;

1
api/src/com/cloud/storage/snapshot/SnapshotService.java
View File

@ -25,7 +25,6 @@ import com.cloud.api.commands.ListSnapshotPoliciesCmd;
import com.cloud.api.commands.ListSnapshotsCmd;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Snapshot;
import com.cloud.user.Account;
public interface SnapshotService {

2
api/src/com/cloud/storage/GuestOS.java → api/src/com/cloud/storage/volume/GuestOS.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.volume;
public interface GuestOS {

2
api/src/com/cloud/storage/GuestOsCategory.java → api/src/com/cloud/storage/volume/GuestOsCategory.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.volume;
public interface GuestOsCategory {
long getId();

2
api/src/com/cloud/storage/StorageGuru.java → api/src/com/cloud/storage/volume/StorageGuru.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.volume;
import com.cloud.utils.component.Adapter;

2
api/src/com/cloud/storage/Volume.java → api/src/com/cloud/storage/volume/Volume.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.volume;
import java.util.Date;

59
api/src/com/cloud/storage/volume/VolumeService.java Normal file
View File

@ -0,0 +1,59 @@
package com.cloud.storage.volume;
import java.util.List;
import com.cloud.api.commands.CreateVolumeCmd;
import com.cloud.api.commands.ListVolumesCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
public interface VolumeService {
/**
* Creates the database object for a volume based on the given criteria
*
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
* @return the volume object
* @throws PermissionDeniedException
*/
Volume allocVolume(CreateVolumeCmd cmd) throws ResourceAllocationException;
/**
* Creates the volume based on the given criteria
*
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
* @return the volume object
*/
Volume createVolume(CreateVolumeCmd cmd);
/**
* Delete volume
* @param volumeId
* @return
* @throws ConcurrentOperationException
*/
boolean deleteVolume(long volumeId) throws ConcurrentOperationException;
/**
* Migrate volume to another storage pool
* @param volumeId
* @param storagePoolId
* @return
* @throws ConcurrentOperationException
*/
Volume migrateVolume(Long volumeId, Long storagePoolId) throws ConcurrentOperationException;
/**
* Copy volume another storage pool, a new volume will be created on destination storage pool
* @param volumeId
* @param destStoragePoolId
* @return
*/
Volume copyVolume(Long volumeId, Long destStoragePoolId);
List<? extends Volume> searchForVolumes(ListVolumesCmd cmd);
}

2
api/src/com/cloud/storage/VolumeStats.java → api/src/com/cloud/storage/volume/VolumeStats.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.storage;
package com.cloud.storage.volume;
public interface VolumeStats {
/**

5
api/src/com/cloud/template/TemplateService.java
View File

@ -28,9 +28,11 @@ import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd;
import com.cloud.api.commands.RegisterIsoCmd;
import com.cloud.api.commands.RegisterTemplateCmd;
import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd;
import com.cloud.api.commands.UploadVolumeCmd;
import com.cloud.exception.InternalErrorException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.storage.volume.Volume;
public interface TemplateService {
@ -86,4 +88,7 @@ public interface TemplateService {
List<String> listTemplatePermissions(ListTemplateOrIsoPermissionsCmd cmd);
boolean updateTemplateOrIsoPermissions(UpdateTemplateOrIsoPermissionsCmd cmd);
Volume uploadVolume(UploadVolumeCmd cmd)
throws ResourceAllocationException;
}

4
api/src/com/cloud/template/VirtualMachineTemplate.java
View File

@ -21,8 +21,8 @@ import java.util.Map;
import com.cloud.acl.ControlledEntity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.TemplateType;
public interface VirtualMachineTemplate extends ControlledEntity {

2
api/src/com/cloud/vm/DiskProfile.java
View File

@ -18,7 +18,7 @@ package com.cloud.vm;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.offering.DiskOffering;
import com.cloud.storage.Volume;
import com.cloud.storage.volume.Volume;
/**
* DiskProfile describes a disk and what functionality is required from it.

4
api/src/com/cloud/vm/UserVmService.java
View File

@ -48,8 +48,8 @@ import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.host.Host;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.offering.ServiceOffering;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Volume;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.volume.Volume;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;

2
core/src/com/cloud/host/HostVO.java
View File

@ -40,7 +40,7 @@ import javax.persistence.Transient;
import com.cloud.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;

2
core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
View File

@ -104,8 +104,8 @@ import com.cloud.utils.ssh.SshHelper;
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
import com.cloud.serializer.GsonHelper;
import com.cloud.storage.Volume;
import com.cloud.storage.template.TemplateInfo;
import com.cloud.storage.volume.Volume;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.DiskProfile;

1
core/src/com/cloud/storage/GuestOSCategoryVO.java
View File

@ -26,6 +26,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.api.Identity;
import com.cloud.storage.volume.GuestOsCategory;
@Entity
@Table(name="guest_os_category")

1
core/src/com/cloud/storage/GuestOSVO.java
View File

@ -26,6 +26,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.api.Identity;
import com.cloud.storage.volume.GuestOS;
@Entity
@Table(name="guest_os")

2
core/src/com/cloud/storage/SecondaryStorageLayer.java
View File

@ -18,7 +18,7 @@ package com.cloud.storage;
import java.net.URI;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.utils.component.Adapter;
public interface SecondaryStorageLayer extends Adapter {

1
core/src/com/cloud/storage/SnapshotVO.java
View File

@ -30,6 +30,7 @@ import javax.persistence.Table;
import com.cloud.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.snapshot.Snapshot;
import com.cloud.utils.db.GenericDao;
import com.google.gson.annotations.Expose;

4
core/src/com/cloud/storage/StoragePoolVO.java
View File

@ -31,7 +31,9 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import com.cloud.api.Identity;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.StoragePool;
import com.cloud.storage.pool.StoragePoolStatus;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.utils.db.GenericDao;
@Entity

5
core/src/com/cloud/storage/VMTemplateVO.java
View File

@ -33,8 +33,9 @@ import javax.persistence.Transient;
import com.cloud.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.TemplateType;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.utils.db.GenericDao;

3
core/src/com/cloud/storage/VolumeHostVO.java
View File

@ -30,8 +30,9 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
//import com.cloud.storage.VMVolumeStorageResourceAssoc.Status;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.utils.db.GenericDaoBase;
/**

3
core/src/com/cloud/storage/VolumeVO.java
View File

@ -32,7 +32,8 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import com.cloud.api.Identity;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.volume.Volume;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;

4
core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
View File

@ -56,9 +56,9 @@ import com.cloud.host.Host;
import com.cloud.host.Host.Type;
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.template.DownloadManager;
import com.cloud.storage.template.DownloadManagerImpl;
import com.cloud.storage.template.TemplateInfo;

4
core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
View File

@ -44,9 +44,9 @@ import com.cloud.agent.api.storage.DownloadProgressCommand;
import com.cloud.host.Host;
import com.cloud.host.Host.Type;
import com.cloud.resource.ServerResourceBase;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.pool.Storage;
import com.cloud.storage.pool.Storage.StoragePoolType;
import com.cloud.storage.template.DownloadManager;
import com.cloud.storage.template.DownloadManagerImpl;
import com.cloud.storage.template.TemplateInfo;

2
core/src/com/cloud/storage/template/DownloadManager.java
View File

@ -24,7 +24,7 @@ import com.cloud.agent.api.storage.DownloadCommand;
import com.cloud.agent.api.storage.DownloadCommand.Proxy;
import com.cloud.agent.api.storage.DownloadCommand.ResourceType;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.resource.SecondaryStorageResource;
import com.cloud.utils.component.Manager;

2
core/src/com/cloud/storage/template/DownloadManagerImpl.java
View File

@ -51,10 +51,10 @@ import com.cloud.agent.api.storage.DownloadCommand.ResourceType;
import com.cloud.agent.api.storage.DownloadProgressCommand;
import com.cloud.agent.api.storage.DownloadProgressCommand.RequestType;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.resource.SecondaryStorageResource;
import com.cloud.storage.template.Processor.FormatInfo;
import com.cloud.storage.template.TemplateDownloader.DownloadCompleteCallback;

2
core/src/com/cloud/storage/template/IsoProcessor.java
View File

@ -25,7 +25,7 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
@Local(value=Processor.class)
public class IsoProcessor implements Processor {

2
core/src/com/cloud/storage/template/Processor.java
View File

@ -17,7 +17,7 @@
package com.cloud.storage.template;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.utils.component.Adapter;
/**

2
core/src/com/cloud/storage/template/QCOW2Processor.java
View File

@ -26,7 +26,7 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;

2
core/src/com/cloud/storage/template/RawImageProcessor.java
View File

@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.template.Processor.FormatInfo;
@Local(value=Processor.class)

2
core/src/com/cloud/storage/template/TemplateLocation.java
View File

@ -27,8 +27,8 @@ import java.util.Properties;
import org.apache.log4j.Logger;
import com.cloud.agent.api.storage.DownloadCommand.ResourceType;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.template.Processor.FormatInfo;
import com.cloud.utils.NumbersUtil;

2
core/src/com/cloud/storage/template/UploadManager.java
View File

@ -22,8 +22,8 @@ import com.cloud.agent.api.storage.DeleteEntityDownloadURLAnswer;
import com.cloud.agent.api.storage.DeleteEntityDownloadURLCommand;
import com.cloud.agent.api.storage.UploadAnswer;
import com.cloud.agent.api.storage.UploadCommand;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Upload.Status;
import com.cloud.storage.pool.Storage.ImageFormat;
import com.cloud.storage.resource.SecondaryStorageResource;
import com.cloud.utils.component.Manager;

Some files were not shown because too many files have changed in this diff Show More