diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index f57fcf78203..ad9b87c54fd 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -34,12 +34,6 @@ import com.cloud.utils.Pair; public class DeleteVolumeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName()); private static final String s_name = "deletevolumeresponse"; - private static final List> s_properties = new ArrayList>(); - - static { - s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); - s_properties.add(new Pair(BaseCmd.Properties.ID, Boolean.TRUE)); - } ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,10 +59,6 @@ public class DeleteVolumeCmd extends BaseCmd { public String getName() { return s_name; } - - public List> getProperties() { - return s_properties; - } public static String getResultObjectName() { return "volume"; @@ -113,4 +103,11 @@ public class DeleteVolumeCmd extends BaseCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume: " + ex.getMessage()); } } + + + @Override + public String getResponse() { + // TODO Auto-generated method stub + return null; + } } diff --git a/server/src/com/cloud/storage/StorageManager.java b/server/src/com/cloud/storage/StorageManager.java index 6eb55b1c5b3..56ea892b0ba 100644 --- a/server/src/com/cloud/storage/StorageManager.java +++ b/server/src/com/cloud/storage/StorageManager.java @@ -24,6 +24,7 @@ import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.api.commands.CreateStoragePoolCmd; import com.cloud.api.commands.DeletePoolCmd; +import com.cloud.api.commands.DeleteVolumeCmd; import com.cloud.api.commands.UpdateStoragePoolCmd; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; @@ -206,6 +207,7 @@ public interface StorageManager extends Manager { * @param volume */ void destroyVolume(VolumeVO volume); + boolean deleteVolume(DeleteVolumeCmd cmd); /** Create capacity entries in the op capacity table * @param storagePool diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 9bed7b90ca6..2544c967f7d 100644 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -65,6 +65,7 @@ import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; import com.cloud.api.commands.CreateStoragePoolCmd; import com.cloud.api.commands.DeletePoolCmd; +import com.cloud.api.commands.DeleteVolumeCmd; import com.cloud.api.commands.UpdateStoragePoolCmd; import com.cloud.async.AsyncInstanceCreateStatus; import com.cloud.async.AsyncJobExecutor; @@ -2251,4 +2252,10 @@ public class StorageManagerImpl implements StorageManager { return false; } } + + @Override + public boolean deleteVolume(DeleteVolumeCmd cmd) { + + return false; + } }