Add ability to bypass failure on missing snapshot

Author: elordahl

src/main/java/org/jenkinsci/plugins/vsphere/builders/DeleteSnapshot.java

@@ -40,12 +40,14 @@ public class DeleteSnapshot extends VSphereBuildStep {
 	private final String vm;    
 	private final String snapshotName;
 	private final boolean consolidate;
+	private final boolean failOnNoExist;
 
 	@DataBoundConstructor
-	public DeleteSnapshot(final String vm, final String snapshotName, final boolean consolidate) throws VSphereException {
+	public DeleteSnapshot(final String vm, final String snapshotName, final boolean consolidate, final boolean failOnNoExist) throws VSphereException {
 		this.vm = vm;
 		this.snapshotName = snapshotName;
 		this.consolidate = consolidate;
+		this.failOnNoExist = failOnNoExist;
 	}
 
 	public String getVm() {
@@ -60,6 +62,10 @@ public boolean isConsolidate() {
 		return consolidate;
 	}
 
+	public boolean isFailOnNoExist() {
+		return failOnNoExist;
+	}
+
 	public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
 		return deleteSnapshot(build, launcher, listener);
 		//TODO throw AbortException instead of returning value
@@ -79,7 +85,7 @@ private boolean deleteSnapshot(final AbstractBuild<?, ?> build, Launcher launche
 		String expandedVm = env.expand(vm);
 
 		VSphereLogger.vsLogger(jLogger, "Deleting snapshot \""+expandedSnap+"\" of VM "+expandedVm+"...");
-		vsphere.deleteSnapshot(expandedVm, expandedSnap, consolidate);
+		vsphere.deleteSnapshot(expandedVm, expandedSnap, consolidate, failOnNoExist);
 		VSphereLogger.vsLogger(jLogger, "Complete.");
 
 		return true;

src/main/java/org/jenkinsci/plugins/vsphere/tools/VSphere.java

@@ -234,26 +234,30 @@ public void revertToSnapshot(String vmName, String snapName) throws VSphereExcep
 			throw new VSphereException(e);
 		}
 	}
-	
-	public void deleteSnapshot(String vmName, String snapName, boolean consolidate) throws VSphereException{
+
+	public void deleteSnapshot(String vmName, String snapName, boolean consolidate, boolean failOnNoExist) throws VSphereException{
 
 		VirtualMachine vm = getVmByName(vmName);
 		VirtualMachineSnapshot snap = getSnapshotInTree(vm, snapName);
-		
-		if (snap == null) {
+
+		if (snap == null && failOnNoExist) {
 			throw new VSphereException("Virtual Machine snapshot cannot be found");
 		}
 
 		try{
-			//Does not delete subtree; Implicitly consolidates disk
-			Task task = snap.removeSnapshot_Task(false);
-			if (!task.waitForTask().equals(Task.SUCCESS)) {
-				throw new VSphereException("Could not delete snapshot");
+
+			Task task;
+			if (snap!=null){
+				//Does not delete subtree; Implicitly consolidates disk
+				task = snap.removeSnapshot_Task(false);
+				if (!task.waitForTask().equals(Task.SUCCESS)) {
+					throw new VSphereException("Could not delete snapshot");
+				}
 			}
-			
+
 			if(!consolidate)
 				return;
-			
+
 			//This might be redundant, but I think it consolidates all disks,
 			//where as the removeSnapshot only consolidates the individual disk
 			task = vm.consolidateVMDisks_Task();

src/main/resources/org/jenkinsci/plugins/vsphere/builders/DeleteSnapshot/config.jelly

@@ -27,5 +27,9 @@ limitations under the License.
 	  <f:checkbox />
 	</f:entry>
 
+	<f:entry title="${%Fail on null?}" field="failOnNoExist">
+  	  <f:checkbox  />
+  	</f:entry>
+	
 	<f:validateButton title="${%Check Data}" progress="${%Testing...}" method="testData" with="serverName,vm,snapshotName"/>
 </j:jelly>

src/main/resources/org/jenkinsci/plugins/vsphere/builders/DeleteSnapshot/help-failOnNoExist.html

@@ -0,0 +1,3 @@
+<div>
+  If the snapshot you are trying to delete doesnt exist, fail this build step.  Sometimes, the job doesnt care if deletion was successful and only wants it gone---if this is the case, leave unchecked.
+</div>