Lior Vernia has uploaded a new change for review. Change subject: webadmin: Disable static IP if equal to hostname ......................................................................
webadmin: Disable static IP if equal to hostname This to prevent a user from performing a move that would necessarily cause the engine to lost connectivity to a host. Change-Id: I46836fac331f3d510fc3be8d435bb71fb546d37c Bug-Url: https://bugzilla.redhat.com/989360 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/20241/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java index 2bfba7f..3d47532 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java @@ -16,7 +16,6 @@ import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; -@SuppressWarnings("unused") public class HostInterfaceModel extends EntityModel { @@ -234,6 +233,12 @@ gateway = value; } + private boolean staticIpChangeAllowed = true; + + public void setStaticIpChangeAllowed(boolean staticIpChangeAllowed) { + this.staticIpChangeAllowed = staticIpChangeAllowed; + } + public HostInterfaceModel() { this(false); } @@ -334,7 +339,7 @@ private void updateCanSpecify() { boolean isChangable = bootProtocolsAvailable && getIsStaticAddress(); - getAddress().setIsChangable(isChangable); + getAddress().setIsChangable(isChangable && staticIpChangeAllowed); getSubnet().setIsChangable(isChangable); getGateway().setIsChangable(isChangable); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java index 0a87322..ff63d17 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostManagementNetworkModel.java @@ -10,7 +10,6 @@ import org.ovirt.engine.ui.uicommonweb.validation.SubnetMaskValidation; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; -@SuppressWarnings("unused") public class HostManagementNetworkModel extends EntityModel { @@ -215,6 +214,12 @@ this.originalNetParams = originalNetParams; } + private boolean staticIpChangeAllowed = true; + + public void setStaticIpChangeAllowed(boolean staticIpChangeAllowed) { + this.staticIpChangeAllowed = staticIpChangeAllowed; + } + public HostManagementNetworkModel() { this(false); } @@ -287,7 +292,7 @@ private void updateCanSpecify() { boolean isChangable = bootProtocolsAvailable && getIsStaticAddress(); - getAddress().setIsChangable(isChangable); + getAddress().setIsChangable(isChangable && staticIpChangeAllowed); getSubnet().setIsChangable(isChangable); getGateway().setIsChangable(isChangable); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 71b2f2b..eab30c2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -276,6 +276,7 @@ mgmntDialogModel.getAddress().setEntity(entity.getAddress()); mgmntDialogModel.getSubnet().setEntity(entity.getSubnet()); mgmntDialogModel.getGateway().setEntity(entity.getGateway()); + mgmntDialogModel.setStaticIpChangeAllowed(!getEntity().getHostName().equals(entity.getAddress())); mgmntDialogModel.setNoneBootProtocolAvailable(false); mgmntDialogModel.getBondingOptions().setIsAvailable(false); mgmntDialogModel.getInterface().setIsAvailable(false); @@ -322,6 +323,7 @@ networkDialogModel.getAddress().setEntity(entity.getAddress()); networkDialogModel.getSubnet().setEntity(entity.getSubnet()); networkDialogModel.getGateway().setEntity(entity.getGateway()); + networkDialogModel.setStaticIpChangeAllowed(!getEntity().getHostName().equals(entity.getAddress())); networkDialogModel.getGateway() .setIsAvailable((Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MultipleGatewaysSupported, getEntity().getVdsGroupCompatibilityVersion().getValue())); -- To view, visit http://gerrit.ovirt.org/20241 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46836fac331f3d510fc3be8d435bb71fb546d37c 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
