Merge pull request #2002 from sudhansu7/CLOUDSTACK-9831

CLOUDSTACK-9831: Previous pod_id still remains in the vm_instance table

Author: karuturi

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2298,8 +2298,10 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
         work.setResourceId(destHostId);
         work = _workDao.persist(work);
 
+
         // Put the vm in migrating state.
         vm.setLastHostId(srcHostId);
+        vm.setPodIdToDeployIn(destHost.getPodId());
         moveVmToMigratingState(vm, destHostId, work);
 
         boolean migrated = false;
@@ -2376,6 +2378,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
                         "Migrate Command failed.  Please check logs.");
                 try {
                     _agentMgr.send(destHostId, new Commands(cleanup(vm.getInstanceName())), null);
+                    vm.setPodIdToDeployIn(srcHost.getPodId());
                     stateTransitTo(vm, Event.OperationFailed, srcHostId);
                 } catch (final AgentUnavailableException e) {
                     s_logger.warn("Looks like the destination Host is unavailable for cleanup.", e);