huamichaelchen
diff --git a/‎api/src/org/apache/cloudstack/jobs/JobInfo.java‎
Lines changed: 14 additions & 4 deletions b/‎api/src/org/apache/cloudstack/jobs/JobInfo.java‎
Lines changed: 14 additions & 4 deletions
diff --git a/‎core/src/com/cloud/agent/api/StopCommand.java‎
Lines changed: 10 additions & 4 deletions b/‎core/src/com/cloud/agent/api/StopCommand.java‎
Lines changed: 10 additions & 4 deletions
diff --git a/‎engine/components-api/src/com/cloud/vm/VirtualMachineManager.java‎
Lines changed: 1 addition & 2 deletions b/‎engine/components-api/src/com/cloud/vm/VirtualMachineManager.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎engine/components-api/src/com/cloud/vm/VmWork.java‎
Lines changed: 4 additions & 12 deletions b/‎engine/components-api/src/com/cloud/vm/VmWork.java‎
Lines changed: 4 additions & 12 deletions
@@ -23,10 +23,20 @@
 
 public interface JobInfo extends Identity, InternalIdentity {
     public enum Status {
-        IN_PROGRESS,
-        SUCCEEDED,
-        FAILED,
-        CANCELLED;
+        IN_PROGRESS(false),
+        SUCCEEDED(true),
+        FAILED(true),
+        CANCELLED(true);
+        
+        private final boolean done;
+
+        private Status(boolean done) {
+            this.done = done;
+        }
+        
+        public boolean done() {
+            return done;
+        }
     }
 
     String getType();
 
@@ -23,22 +23,28 @@ public class StopCommand extends RebootCommand {
     private boolean isProxy=false;
     private String urlPort=null;
     private String publicConsoleProxyIpAddress=null;
+    private boolean cleanupOnly;
 
     protected StopCommand() {
     }
 
-    public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress) {
+    public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress, boolean cleanupOnly) {
     	super(vm);
     	this.isProxy = isProxy;
     	this.urlPort = urlPort;
     	this.publicConsoleProxyIpAddress = publicConsoleProxyIpAddress;
+        this.cleanupOnly = cleanupOnly;
     }
 
     public StopCommand(VirtualMachine vm, String vnet) {
         super(vm);
         this.vnet = vnet;
     }
 
+    public boolean isCleanupOnly() {
+        return cleanupOnly;
+    }
+
     public StopCommand(VirtualMachine vm) {
         super(vm);
     }
@@ -57,15 +63,15 @@ public boolean executeInSequence() {
     }
 
 	public boolean isProxy() {
-		return this.isProxy;
+		return isProxy;
 	}
 
 	public String getURLPort() {
-		return this.urlPort;
+		return urlPort;
 	}
 
 	public String getPublicConsoleProxyIpAddress() {
-		return this.publicConsoleProxyIpAddress;
+		return publicConsoleProxyIpAddress;
 	}
 
 }
@@ -137,8 +137,7 @@ boolean destroy(String vmUuid) throws ResourceUnavailableException, OperationTim
 
     boolean migrateAway(VirtualMachine.Type type, long vmid, long hostId) throws InsufficientServerCapacityException, VirtualMachineMigrationException;
 
-    VirtualMachine migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
-            VirtualMachineMigrationException;
+    Outcome<VirtualMachine> migrate(String vmUuid, long srcHostId, DeployDestination dest);
 
     VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException,
             ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
 
@@ -21,30 +21,22 @@ public class VmWork {
 	long accountId;
 	long vmId;
 
-	public VmWork() {
+    public VmWork(long userId, long accountId, long vmId) {
+        this.userId = userId;
+        this.accountId = accountId;
+        this.vmId = vmId;
 	}
 
 	public long getUserId() {
 		return userId;
 	}
 
-	public void setUserId(long userId) {
-		this.userId = userId;
-	}
-
 	public long getAccountId() {
 		return accountId;
 	}
 
-	public void setAccountId(long accountId) {
-		this.accountId = accountId;
-	}
-
 	public long getVmId() {
 		return vmId;
 	}
 
-	public void setVmId(long vmId) {
-		this.vmId = vmId;
-	}
 }
Original file line number	Diff line number	Diff line change
`@@ -23,22 +23,28 @@ public class StopCommand extends RebootCommand {`
`23`	`23`	`private boolean isProxy=false;`
`24`	`24`	`private String urlPort=null;`
`25`	`25`	`private String publicConsoleProxyIpAddress=null;`
	`26`	`+ private boolean cleanupOnly;`
`26`	`27`
`27`	`28`	`protected StopCommand() {`
`28`	`29`	`}`
`29`	`30`
`30`		`- public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress) {`
	`31`	`+ public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress, boolean cleanupOnly) {`
`31`	`32`	`super(vm);`
`32`	`33`	`this.isProxy = isProxy;`
`33`	`34`	`this.urlPort = urlPort;`
`34`	`35`	`this.publicConsoleProxyIpAddress = publicConsoleProxyIpAddress;`
	`36`	`+ this.cleanupOnly = cleanupOnly;`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public StopCommand(VirtualMachine vm, String vnet) {`
`38`	`40`	`super(vm);`
`39`	`41`	`this.vnet = vnet;`
`40`	`42`	`}`
`41`	`43`
	`44`	`+ public boolean isCleanupOnly() {`
	`45`	`+ return cleanupOnly;`
	`46`	`+ }`
	`47`	`+`
`42`	`48`	`public StopCommand(VirtualMachine vm) {`
`43`	`49`	`super(vm);`
`44`	`50`	`}`
`@@ -57,15 +63,15 @@ public boolean executeInSequence() {`
`57`	`63`	`}`
`58`	`64`
`59`	`65`	`public boolean isProxy() {`
`60`		`- return this.isProxy;`
	`66`	`+ return isProxy;`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`public String getURLPort() {`
`64`		`- return this.urlPort;`
	`70`	`+ return urlPort;`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`public String getPublicConsoleProxyIpAddress() {`
`68`		`- return this.publicConsoleProxyIpAddress;`
	`74`	`+ return publicConsoleProxyIpAddress;`
`69`	`75`	`}`
`70`	`76`
`71`	`77`	`}`