mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	Incremental checkin
This commit is contained in:
		
							parent
							
								
									2bdaaa48a6
								
							
						
					
					
						commit
						604e7016a3
					
				| @ -34,12 +34,6 @@ import com.cloud.utils.Pair; | |||||||
| public class DeleteVolumeCmd extends BaseCmd { | public class DeleteVolumeCmd extends BaseCmd { | ||||||
| 	public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName()); | 	public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName()); | ||||||
|     private static final String s_name = "deletevolumeresponse"; |     private static final String s_name = "deletevolumeresponse"; | ||||||
|     private static final List<Pair<Enum, Boolean>> s_properties = new ArrayList<Pair<Enum, Boolean>>(); |  | ||||||
| 
 |  | ||||||
|     static { |  | ||||||
|     	s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); |  | ||||||
|         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ID, Boolean.TRUE)); |  | ||||||
|     } |  | ||||||
| 
 | 
 | ||||||
|     ///////////////////////////////////////////////////// |     ///////////////////////////////////////////////////// | ||||||
|     //////////////// API parameters ///////////////////// |     //////////////// API parameters ///////////////////// | ||||||
| @ -65,10 +59,6 @@ public class DeleteVolumeCmd extends BaseCmd { | |||||||
|     public String getName() { |     public String getName() { | ||||||
|         return s_name; |         return s_name; | ||||||
|     } |     } | ||||||
|      |  | ||||||
|     public List<Pair<Enum, Boolean>> getProperties() { |  | ||||||
|         return s_properties; |  | ||||||
|     } |  | ||||||
| 
 | 
 | ||||||
|     public static String getResultObjectName() { |     public static String getResultObjectName() { | ||||||
|     	return "volume"; |     	return "volume"; | ||||||
| @ -113,4 +103,11 @@ public class DeleteVolumeCmd extends BaseCmd { | |||||||
|     		throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume: " + ex.getMessage()); |     		throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume: " + ex.getMessage()); | ||||||
|     	} |     	} | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 	@Override | ||||||
|  | 	public String getResponse() { | ||||||
|  | 		// TODO Auto-generated method stub | ||||||
|  | 		return null; | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -24,6 +24,7 @@ import com.cloud.agent.api.Answer; | |||||||
| import com.cloud.agent.api.Command; | import com.cloud.agent.api.Command; | ||||||
| import com.cloud.api.commands.CreateStoragePoolCmd; | import com.cloud.api.commands.CreateStoragePoolCmd; | ||||||
| import com.cloud.api.commands.DeletePoolCmd; | import com.cloud.api.commands.DeletePoolCmd; | ||||||
|  | import com.cloud.api.commands.DeleteVolumeCmd; | ||||||
| import com.cloud.api.commands.UpdateStoragePoolCmd; | import com.cloud.api.commands.UpdateStoragePoolCmd; | ||||||
| import com.cloud.dc.DataCenterVO; | import com.cloud.dc.DataCenterVO; | ||||||
| import com.cloud.dc.HostPodVO; | import com.cloud.dc.HostPodVO; | ||||||
| @ -206,6 +207,7 @@ public interface StorageManager extends Manager { | |||||||
| 	 * @param volume | 	 * @param volume | ||||||
| 	 */ | 	 */ | ||||||
| 	void destroyVolume(VolumeVO volume); | 	void destroyVolume(VolumeVO volume); | ||||||
|  | 	boolean deleteVolume(DeleteVolumeCmd cmd); | ||||||
| 	 | 	 | ||||||
| 	/** Create capacity entries in the op capacity table | 	/** Create capacity entries in the op capacity table | ||||||
| 	 * @param storagePool | 	 * @param storagePool | ||||||
|  | |||||||
| @ -65,6 +65,7 @@ import com.cloud.api.BaseCmd; | |||||||
| import com.cloud.api.ServerApiException; | import com.cloud.api.ServerApiException; | ||||||
| import com.cloud.api.commands.CreateStoragePoolCmd; | import com.cloud.api.commands.CreateStoragePoolCmd; | ||||||
| import com.cloud.api.commands.DeletePoolCmd; | import com.cloud.api.commands.DeletePoolCmd; | ||||||
|  | import com.cloud.api.commands.DeleteVolumeCmd; | ||||||
| import com.cloud.api.commands.UpdateStoragePoolCmd; | import com.cloud.api.commands.UpdateStoragePoolCmd; | ||||||
| import com.cloud.async.AsyncInstanceCreateStatus; | import com.cloud.async.AsyncInstanceCreateStatus; | ||||||
| import com.cloud.async.AsyncJobExecutor; | import com.cloud.async.AsyncJobExecutor; | ||||||
| @ -2251,4 +2252,10 @@ public class StorageManagerImpl implements StorageManager { | |||||||
|     		return false; |     		return false; | ||||||
|     	} |     	} | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  | 	@Override | ||||||
|  | 	public boolean deleteVolume(DeleteVolumeCmd cmd) { | ||||||
|  | 		 | ||||||
|  | 		return false; | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user