Eliraz Levi has uploaded a new change for review. Change subject: backend: allowing mask as prefix ......................................................................
backend: allowing mask as prefix Longer description using lines' length under 72 chars. With multiple paragraphs if necessary. Change-Id: I6a33148aa297a9ba592466a827a987d256a83017 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Eliraz Levi <el...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/36529/1 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 29fe48f..3cc6223 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 @@ -1,24 +1,25 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.businessentities.VDS; 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.utils.ValidationUtils; import org.ovirt.engine.core.common.vdscommands.SetupNetworksVdsCommandParameters; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dao.network.HostNetworkQosDao; import org.ovirt.engine.core.utils.NetworkUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class SetupNetworksVDSCommand<T extends SetupNetworksVdsCommandParameters> extends FutureVDSCommand<T> { @@ -119,7 +120,13 @@ break; case STATIC_IP: putIfNotEmpty(opts, "ipaddr", iface.getAddress()); - putIfNotEmpty(opts, "netmask", iface.getSubnet()); + if (iface.getSubnet().matches("^/?" + ValidationUtils.SUBNET_PREFIX_PATTERN + "$")) { + putIfNotEmpty(opts, "prefix", iface.getSubnet().replace("/", "")); + } + else { + putIfNotEmpty(opts, "netmask", iface.getSubnet()); + } + putIfNotEmpty(opts, "gateway", iface.getGateway()); break; default: -- To view, visit http://gerrit.ovirt.org/36529 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a33148aa297a9ba592466a827a987d256a83017 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <el...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
