Tomas Jelinek has uploaded a new change for review. Change subject: engine: fix failing RunVmCommandTest ......................................................................
engine: fix failing RunVmCommandTest Fixed failing tests. The patch 53d8f8a731aef88de1cb6c7c5011cf2de243ae71 caused test failures. The RunVmCommandTest expected that if the params are not null, they will be set. Change-Id: Icf07dad1b910af31a8c1f79a06a3fc06586f7de6 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/8330/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 88646b3..1f90be0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -138,7 +138,23 @@ return; } - getVm().setboot_sequence(getVm().getdefault_boot_sequence()); + if (!StringUtils.isEmpty(runVmParameters.getinitrd_url())) { + getVm().setinitrd_url(runVmParameters.getinitrd_url()); + } + + if (!StringUtils.isEmpty(runVmParameters.getkernel_url())) { + getVm().setkernel_url(runVmParameters.getkernel_url()); + } + + if (!StringUtils.isEmpty(runVmParameters.getkernel_params())) { + getVm().setkernel_params(runVmParameters.getkernel_params()); + } + + if (!StringUtils.isEmpty(runVmParameters.getCustomProperties())) { + getVm().setCustomProperties(runVmParameters.getCustomProperties()); + } + + getVm().setboot_sequence(((runVmParameters.getBootSequence()) != null) ? runVmParameters.getBootSequence() : getVm().getdefault_boot_sequence()); } /** -- To view, visit http://gerrit.ovirt.org/8330 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf07dad1b910af31a8c1f79a06a3fc06586f7de6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
