Shahar Havivi has uploaded a new change for review. Change subject: engine: set default boot-protocol for VmInitNetwork ......................................................................
engine: set default boot-protocol for VmInitNetwork Bug-Url: https://bugzilla.redhat.com/1144005 Change-Id: I21f8a9cf509dd4d3d6e73a83ce9f66b183605161 Signed-off-by: Shahar Havivi <shah...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/33199/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index ebe9b30..b6178ae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; @@ -42,11 +41,13 @@ import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType; import org.ovirt.engine.core.common.businessentities.VmDeviceId; +import org.ovirt.engine.core.common.businessentities.VmInitNetwork; import org.ovirt.engine.core.common.businessentities.VmPayload; import org.ovirt.engine.core.common.businessentities.VmRngDevice; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.businessentities.network.Network; +import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; @@ -562,6 +563,15 @@ return failCanDoAction(VdcBllMessages.BALLOON_REQUESTED_ON_NOT_SUPPORTED_ARCH); } + // Set default boot protocol for VmInit to None if not set + if (vmFromParams.getVmInit() != null && vmFromParams.getVmInit().getNetworks() != null) { + for (VmInitNetwork net: vmFromParams.getVmInit().getNetworks()) { + if (net.getBootProtocol() == null) { + net.setBootProtocol(NetworkBootProtocol.NONE); + } + } + } + return true; } -- To view, visit http://gerrit.ovirt.org/33199 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21f8a9cf509dd4d3d6e73a83ce9f66b183605161 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
