Alona Kaplan has uploaded a new change for review. Change subject: engine: Sending to the host oVirt-level default MTU ......................................................................
engine: Sending to the host oVirt-level default MTU The concept of "MTU: Host's default" is eliminated. In case there is no MTU value on the Network, oVirt-level default MTU will be sent to the host. Change-Id: Ice358e3f4c10b08b9ddaed3b965d26e62cdb558a Bug-Url: https://bugzilla.redhat.com/1043808 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java 4 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/28098/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java index 2bae96c..a2c4999 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java @@ -5,6 +5,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.network.Network; +import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.utils.transaction.RollbackHandler; @@ -59,8 +61,12 @@ options.put("bridged", Boolean.toString(getParameters().isVmNetwork())); Network network = getParameters().getNetwork(); - if (network != null && network.getMtu() != 0) { - options.put("mtu", String.valueOf(network.getMtu())); + if (network != null) { + if (network.getMtu() == 0) { + options.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + } else { + options.put("mtu", String.valueOf(network.getMtu())); + } } status = getBroker().addNetwork(networkName, vlanId, bond, nics, options); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java index 01c732d..bc50958 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java @@ -5,6 +5,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.network.Network; +import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; public class EditNetworkVDSCommand<P extends NetworkVdsmVDSCommandParameters> extends VdsBrokerCommand<P> { @@ -51,8 +53,12 @@ options.put("bridged", Boolean.toString(getParameters().isVmNetwork())); Network network = getParameters().getNetwork(); - if (network != null && network.getMtu() != 0) { - options.put("mtu", String.valueOf(network.getMtu())); + if (network != null) { + if (network.getMtu() == 0) { + options.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + } else { + options.put("mtu", String.valueOf(network.getMtu())); + } } // options[VdsProperties.force] = "true"; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index 1010b02..b024719 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -13,6 +13,8 @@ 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.VdsNetworkInterface; +import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.vdscommands.SetupNetworksVdsCommandParameters; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dao.network.NetworkQoSDao; @@ -58,7 +60,9 @@ addBootProtocol(opts, iface); } - if (network.getMtu() != 0) { + if (network.getMtu() == 0) { + opts.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + } else { opts.put("mtu", String.valueOf(network.getMtu())); } diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java index 077f321..8e4f4f9 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java @@ -72,6 +72,7 @@ when(host.getSupportedClusterVersionsSet()).thenReturn(supportedClusters); when(host.getVdsGroupCompatibilityVersion()).thenReturn(version); configRule.mockConfigValue(ConfigValues.DefaultRouteSupported, version, Boolean.FALSE); + configRule.mockConfigValue(ConfigValues.DefaultMTU, 1500); } @Test -- To view, visit http://gerrit.ovirt.org/28098 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice358e3f4c10b08b9ddaed3b965d26e62cdb558a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
