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

bvbharat · rohityadavcloud · commit 57c69a8ba02a · 2014-09-10T13:24:06.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
@@ -1786,7 +1786,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
`@@ -1786,7 +1786,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)`
`1786`	`1786`	`vmSrc.addNic(nic);`
`1787`	`1787`	`}`
`1788`	`1788`
`1789`		`- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);`
	`1789`	`+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);`
`1790`	`1790`	`_networkMgr.prepareNicForMigration(profile, dest);`
`1791`	`1791`	`volumeMgr.prepareForMigration(profile, dest);`
`1792`	`1792`