Lior Vernia has uploaded a new change for review. Change subject: webadmin: Add warning when modifying management network ......................................................................
webadmin: Add warning when modifying management network Added warning that certain changes in the management network's properties could lead to loss of connectivity to hosts in the DC. Change-Id: Icf768a00fc78335227e77f23ed6b9ffe1aac39ec Bug-Url: https://bugzilla.redhat.com/906359 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/23893/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index b3d361f..c8e8067 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -24,6 +24,7 @@ import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.Model; @@ -46,6 +47,8 @@ public abstract class NetworkModel extends Model { + private static final String CMD_APPROVE = "OnApprove"; //$NON-NLS-1$ + private static final String CMD_ABORT = "OnAbort"; //$NON-NLS-1$ protected static final String ENGINE_NETWORK = (String) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.ManagementNetwork); @@ -645,11 +648,33 @@ return; } + if (isManagemet()) { + ConfirmationModel confirmationModel = new ConfirmationModel(); + confirmationModel.setMessage(ConstantsManager.getInstance().getConstants().updateManagementNetworkWarning()); + UICommand cmdOk = new UICommand(CMD_APPROVE, this); + cmdOk.setTitle(ConstantsManager.getInstance().getConstants().ok()); + cmdOk.setIsDefault(true); + confirmationModel.getCommands().add(cmdOk); + UICommand cmdCancel = new UICommand(CMD_ABORT, this); + cmdCancel.setTitle(ConstantsManager.getInstance().getConstants().cancel()); + cmdCancel.setIsCancel(true); + confirmationModel.getCommands().add(cmdCancel); + sourceListModel.setConfirmWindow(confirmationModel); + } else { + onApprove(); + } + } + + private void onApprove() { // Save changes. flush(); // Execute all the required commands (detach, attach, update) to save the updates executeSave(); + } + + private void onAbort() { + sourceListModel.setConfirmWindow(null); } @Override @@ -663,6 +688,11 @@ cancel(); } else if (command == getAddQosCommand()) { addQos(); + } else if (StringHelper.stringsEqual(command.getName(), CMD_APPROVE)) { + onAbort(); + onApprove(); + } else if (StringHelper.stringsEqual(command.getName(), CMD_ABORT)) { + onAbort(); } } 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 66e6e58..2865f30 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 @@ -198,6 +198,9 @@ @DefaultStringValue("New") String newNetworkQosButton(); + @DefaultStringValue("Changing certain properties (e.g. VLAN, MTU) of the management network could lead to loss of connectivity to hosts in the data center, if switches aren't configured to accommodate the changes. Are you sure you want to proceed?") + String updateManagementNetworkWarning(); + @DefaultStringValue("Attach/Detach Network to/from Clusters") String attachDetachNetworkToFromClustersTitle(); -- To view, visit http://gerrit.ovirt.org/23893 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf768a00fc78335227e77f23ed6b9ffe1aac39ec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
