CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE

bvbharat · yadvr · commit 2b7b837b28f8 · 2014-09-10T13:26:24.000+02:00
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1843,7 +1843,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)
             vmSrc.addNic(nic);
         }
 
-        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
         _networkMgr.prepareNicForMigration(profile, dest);
         volumeMgr.prepareForMigration(profile, dest);
 

Original file line number	Diff line number	Diff line change
`@@ -1843,7 +1843,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)`
`1843`	`1843`	`vmSrc.addNic(nic);`
`1844`	`1844`	`}`
`1845`	`1845`
`1846`		`- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);`
	`1846`	`+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);`
`1847`	`1847`	`_networkMgr.prepareNicForMigration(profile, dest);`
`1848`	`1848`	`volumeMgr.prepareForMigration(profile, dest);`
`1849`	`1849`