Alona Kaplan has uploaded a new change for review. Change subject: engine: Changing mtu to default keeps old MTU value on the host ......................................................................
engine: Changing mtu to default keeps old MTU value on the host Changing mtu of the network to default should override the current mtu of the network on the host (or at least mark it as unsync). Change-Id: I327bafad911c207c45e0250b43c297a05114dc1a Bug-Url: https://bugzilla.redhat.com/1084961 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 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 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/28100/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index 8cb3e9b..90aadb5 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -23,6 +23,10 @@ return Config.<String> getValue(ConfigValues.ManagementNetwork); } + public static Integer getDefaultMTU() { + return Config.<Integer> getValue(ConfigValues.DefaultMTU); + } + /** * Returns the underlying interface name of a given nic * @@ -131,7 +135,7 @@ } public static boolean isNetworkInSync(VdsNetworkInterface iface, Network network, NetworkQoS qos) { - return (network.getMtu() == 0 || iface.getMtu() == network.getMtu()) + return ((network.getMtu() == 0 && iface.getMtu() == getDefaultMTU()) || iface.getMtu() == network.getMtu()) && Objects.equals(iface.getVlanId(), network.getVlanId()) && iface.isBridged() == network.isVmNetwork() && (isQosInSync(iface, qos) || iface.isQosOverridden()); 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 a2c4999..16c8dc0 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,10 +5,9 @@ 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.NetworkUtils; import org.ovirt.engine.core.utils.transaction.RollbackHandler; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -63,7 +62,7 @@ Network network = getParameters().getNetwork(); if (network != null) { if (network.getMtu() == 0) { - options.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + options.put("mtu", NetworkUtils.getDefaultMTU().toString()); } else { options.put("mtu", String.valueOf(network.getMtu())); } 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 bc50958..110bf4c 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,9 +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; +import org.ovirt.engine.core.utils.NetworkUtils; public class EditNetworkVDSCommand<P extends NetworkVdsmVDSCommandParameters> extends VdsBrokerCommand<P> { public EditNetworkVDSCommand(P parameters) { @@ -55,7 +54,7 @@ Network network = getParameters().getNetwork(); if (network != null) { if (network.getMtu() == 0) { - options.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + options.put("mtu", NetworkUtils.getDefaultMTU().toString()); } else { options.put("mtu", String.valueOf(network.getMtu())); } 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 b024719..390e37e 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,8 +13,6 @@ 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; @@ -61,7 +59,7 @@ } if (network.getMtu() == 0) { - opts.put("mtu", Config.<Integer> getValue(ConfigValues.DefaultMTU).toString()); + opts.put("mtu", NetworkUtils.getDefaultMTU().toString()); } else { opts.put("mtu", String.valueOf(network.getMtu())); } -- To view, visit http://gerrit.ovirt.org/28100 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I327bafad911c207c45e0250b43c297a05114dc1a 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
