From deadcd54afd1c336f8df613629d03847426c2304 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 8 Feb 2011 10:04:20 -0500 Subject: [PATCH] bug 8474: fix attaching ISO to xenserver vm status 8474: resolved fixed --- server/src/com/cloud/template/TemplateManagerImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 4dea6b7426c..b511e9f960b 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1170,11 +1170,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe String errMsg = "Unable to attach ISO" + isoId + "to virtual machine " + vmId; userId = accountAndUserValidation(account, userId, vmInstanceCheck, iso, errMsg); - - VMInstanceVO vm = ApiDBUtils.findVMInstanceById(vmId); - VMTemplateVO vmTemplate = ApiDBUtils.findTemplateById(vm.getTemplateId()); - if ("xen-pv-drv-iso".equals(iso.getDisplayText()) && vmTemplate.getHypervisorType() != Hypervisor.HypervisorType.XenServer){ - throw new InvalidParameterValueException("Cannot attach Xenserver PV drivers to incompatible hypervisor " +vmTemplate.getHypervisorType()); + + if ("xen-pv-drv-iso".equals(iso.getDisplayText()) && vmInstanceCheck.getHypervisorType() != Hypervisor.HypervisorType.XenServer){ + throw new InvalidParameterValueException("Cannot attach Xenserver PV drivers to incompatible hypervisor " + vmInstanceCheck.getHypervisorType()); } return attachISOToVM(vmId, userId, isoId, true);