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

bvbharat · rohityadavcloud · commit 56c7fc800ad1 · 2014-09-10T13:27:21.000+02:00
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1863,7 +1863,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
`@@ -1863,7 +1863,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)`
`1863`	`1863`	`vmSrc.addNic(nic);`
`1864`	`1864`	`}`
`1865`	`1865`
`1866`		`- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);`
	`1866`	`+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);`
`1867`	`1867`	`_networkMgr.prepareNicForMigration(profile, dest);`
`1868`	`1868`	`volumeMgr.prepareForMigration(profile, dest);`
`1869`	`1869`