Muli Salem has uploaded a new change for review. Change subject: core: Send Bonded Network with bonding ......................................................................
core: Send Bonded Network with bonding This patch locates the underlying interface that the changed network is defined on and sends bonding type instead of nic, if the interface is a bond. In case we changed from a vlan network over a bond to a non-vlan network over a bond, we need to look up the interface using the interface name after stripping the vlan off of it. This may be the case even if the target network is not a vlan, since the source network was a vlan network. Change-Id: Ifa48513b89ba7a972826d31d7fc65ee5898d5741 Bug-Url: https://bugzilla.redhat.com/909678 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/12060/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 c9ec21a..5740332 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 @@ -40,11 +40,10 @@ opts = new HashMap<String, String>(); iface = findNetworkInterface(network.getName(), getParameters().getInterfaces(), getParameters().getBonds()); ifaceNameWithoutVlan = NetworkUtils.StripVlan(iface.getName()); - bonded = isVlan(network) - ? findInterfaceByName(ifaceNameWithoutVlan).getBonded() - : iface.getBonded(); + bonded = findInterfaceByName(ifaceNameWithoutVlan).getBonded(); String type = (bonded != null && bonded) ? "bonding" : "nic"; opts.put(type, ifaceNameWithoutVlan); + if (isVlan(network)) { opts.put("vlan", network.getVlanId().toString()); } -- To view, visit http://gerrit.ovirt.org/12060 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa48513b89ba7a972826d31d7fc65ee5898d5741 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
