Lior Vernia has uploaded a new change for review. Change subject: webadmin: Changed semantics of NULL_OPERATION in Setup Networks ......................................................................
webadmin: Changed semantics of NULL_OPERATION in Setup Networks Changed the semantics of a generic NULL_OPERATION to actually represent a NO-OP. When a generic NULL_OPERATION is performed no message appears in the header of the dialog, thus promoting a feel that no operation is performed (rather than an operation is attempted and failed). Also removed a check whether an interface being dragged is already bonded; when dragging an interface that's part of a bond it is the bond the dragged anyway, so this check can't return true. Change-Id: Ie5188b3c6ca5838f6e0d6bb184e554970b6f0c0f Bug-Url: https://bugzilla.redhat.com/906313 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java 5 files changed, 10 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/22031/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java index 96d33e7..9ac60eb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java @@ -334,7 +334,12 @@ @Override public String getVerb(NetworkItemModel<?> op1) { - return ConstantsManager.getInstance().getMessages().noValidOperation(op1.getName()); + return ""; //$NON-NLS-1$ + } + + @Override + public boolean isUnary() { + return true; } @Override @@ -558,9 +563,7 @@ */ public String getNoun(NetworkItemModel<?> op2) { assert !isUnary() : "The Unary Operation " + name() + " has no Noun"; //$NON-NLS-1$ //$NON-NLS-2$ - if (op2 == null){ - return ConstantsManager.getInstance().getConstants().unassignedLogicalNetworksPanel(); - } + assert op2 != null : "Can't perform binary operation " + name() + "without a second operand"; //$NON-NLS-1$ $NON-NLS-2$ return op2.getName(); } 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 00f019f..a52fe45 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 @@ -86,10 +86,10 @@ Set<LogicalNetworkModel> networks = new HashSet<LogicalNetworkModel>(); networks.addAll(dst.getItems()); - // op1 is a NIC, verify that it isn't already part of a bond or dragged unto itself + // op1 is a NIC, verify that it isn't dragged unto itself if (op1 instanceof NetworkInterfaceModel) { NetworkInterfaceModel src = (NetworkInterfaceModel) op1; - if (src.isBonded() || src.equals(dst)) { + if (src.equals(dst)) { return NetworkOperation.NULL_OPERATION; } networks.addAll(((NetworkInterfaceModel) op1).getItems()); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 24c55d1..c5d5ef0 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1747,9 +1747,6 @@ @DefaultStringValue("Cannot have a non-VLAN VM network and VLAN-tagged networks on one interface.") String nullOperationVmWithVlans(); - @DefaultStringValue("Unassigned Logical Networks panel") - String unassignedLogicalNetworksPanel(); - @DefaultStringValue("disk_type=") String diskTypeSearchPrefix(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index ca4c173..30cf8ff 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -198,9 +198,6 @@ @DefaultMessage("Remove {0} from Bond") String removeFromBond(String name); - @DefaultMessage("No valid Operation for {0} and ") - String noValidOperation(String name); - @DefaultMessage("You could detach {0} first.") String suggestDetachNetwork(String networkName); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java index 8722dc6..651abc6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java @@ -160,7 +160,7 @@ if (!drop) { status.setFadeText(candidate != null ? candidate.getMessage(op1, op2) : constants.noValidActionSetupNetwork()); } - setStatusStyle(!drop || !candidate.isNullOperation()); + setStatusStyle(!drop || !candidate.isNullOperation() || candidate == NetworkOperation.NULL_OPERATION); } }); -- To view, visit http://gerrit.ovirt.org/22031 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5188b3c6ca5838f6e0d6bb184e554970b6f0c0f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
