Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added check to prevent no-op case ......................................................................
webadmin: Added check to prevent no-op case Adding a NIC to the bond already containing it wasn't marked as a no-op so it was displayed as a legitimate operation. Change-Id: Iebff9f9e3b5cd9973cfbebe307ae75a2e5d96a67 Bug-Url: https://bugzilla.redhat.com/1045656 Bug-Url: https://bugzilla.redhat.com/1045658 Signed-off-by: Lior Vernia <[email protected]> (cherry picked from commit f1508e460cc3f238b52b3bc21a2c3cfdd68338b1) --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/25419/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java index 78b5ae2..9d50f6b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java @@ -91,10 +91,10 @@ Set<LogicalNetworkModel> networks = new HashSet<LogicalNetworkModel>(); networks.addAll(dst.getItems()); - // op1 is a NIC, verify that it isn't dragged unto itself + // op1 is a NIC, verify that it isn't already part of a bond or dragged unto itself if (op1 instanceof NetworkInterfaceModel) { NetworkInterfaceModel src = (NetworkInterfaceModel) op1; - if (src.equals(dst)) { + if (src.isBonded() || src.equals(dst)) { return NetworkOperation.NULL_OPERATION; } networks.addAll(((NetworkInterfaceModel) op1).getItems()); -- To view, visit http://gerrit.ovirt.org/25419 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebff9f9e3b5cd9973cfbebe307ae75a2e5d96a67 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
