Federico Simoncelli has uploaded a new change for review. Change subject: Don't add the cdrom device if iso_path is empty ......................................................................
Don't add the cdrom device if iso_path is empty Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=857690 Signed-off-by: Federico Simoncelli <fsimo...@redhat.com> Change-Id: I8cb5631a16a322bda1e371efce5c318f666b1d0e --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/8092/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java index 7848b28..e59e43d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java @@ -97,6 +97,7 @@ @Override protected void buildVmCD() { XmlRpcStruct struct; + // check if we have payload CD if (vm.getVmPayload() != null && vm.getVmPayload().getType() == VmDeviceType.CDROM) { VmDevice vmDevice = @@ -114,8 +115,13 @@ addCdDetails(vmDevice, struct); addDevice(struct, vmDevice, ""); } + + if (StringUtils.isEmpty(vm.getCdPath())) { + return; + } + // check first if CD was given as a parameter - else if (vm.isRunOnce() && !StringUtils.isEmpty(vm.getCdPath())) { + if (vm.isRunOnce()) { VmDevice vmDevice = new VmDevice(new VmDeviceId(Guid.NewGuid(), vm.getId()), VmDeviceType.DISK.getName(), @@ -149,10 +155,9 @@ continue; } struct = new XmlRpcStruct(); - String file = vm.getCdPath(); addCdDetails(vmDevice, struct); addAddress(vmDevice, struct); - addDevice(struct, vmDevice, file); + addDevice(struct, vmDevice, vm.getCdPath()); break; // currently only one is supported, may change in future releases } } -- To view, visit http://gerrit.ovirt.org/8092 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cb5631a16a322bda1e371efce5c318f666b1d0e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
