Lior Vernia has uploaded a new change for review. Change subject: webadmin: Fixed a small mess in host network popup ......................................................................
webadmin: Fixed a small mess in host network popup Probably due to a lapse in concentration at the time, the changeability of network custom properties depended upon the ability to change boot protocol, where it should have depended solely on whether the network was marked to by synchronized (it should still work when the boot protocol is set to "None", which disables the boot protocol fields). Also, while fixing this I noticed that host QoS wasn't disabled for the same cases, when it actually should be. Change-Id: I486cc099cf7698f0d685c398c00215b0bab2f3fa Signed-off-by: Lior Vernia <[email protected]> --- 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/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java 5 files changed, 36 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/29229/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 7c26ff6..c3e60c3 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 @@ -306,6 +306,9 @@ revertChanges(); } setBootProtocolsAvailable(value); + getQosOverridden().setIsChangable(value); + getQosModel().setIsChangable(value); + getCustomPropertiesModel().setIsChangable(value); } } @@ -334,6 +337,8 @@ getAddress().setEntity(originalNetParams.getAddress()); getSubnet().setEntity(originalNetParams.getSubnet()); getGateway().setEntity(originalNetParams.getGateway()); + getQosOverridden().setEntity(originalNetParams.getQosOverridden()); + getQosModel().init(originalNetParams.getQos()); getCustomPropertiesModel().deserialize(KeyValueModel.convertProperties(originalNetParams.getCustomProperties())); } } @@ -393,7 +398,6 @@ getAddress().setIsChangable(isChangable && staticIpChangeAllowed); getSubnet().setIsChangable(isChangable); getGateway().setIsChangable(isChangable); - getCustomPropertiesModel().setIsChangable(bootProtocolsAvailable); } public boolean validate() 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 69e60b8..8a32b67 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 @@ -402,6 +402,13 @@ networkDialogModel.setStaticIpChangeAllowed(!getEntity().getHostName().equals(entity.getAddress())); networkDialogModel.getBondingOptions().setIsAvailable(false); networkDialogModel.setBootProtocol(entity.getBootProtocol()); + if ((Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.HostNetworkQosSupported, + version)) { + networkDialogModel.getQosOverridden().setIsAvailable(true); + networkDialogModel.getQosModel().setIsAvailable(true); + networkDialogModel.getQosOverridden().setEntity(entity.isQosOverridden()); + networkDialogModel.getQosModel().init(entity.getQos()); + } if ((Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.NetworkCustomPropertiesSupported, version)) { KeyValueModel customPropertiesModel = networkDialogModel.getCustomPropertiesModel(); @@ -422,13 +429,6 @@ networkDialogModel.getIsToSync().setIsChangable(!logicalNetwork.isInSync()); networkDialogModel.getIsToSync() .setEntity(networksToSync.contains(logicalNetwork.getName())); - if ((Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.HostNetworkQosSupported, - version)) { - networkDialogModel.getQosOverridden().setIsAvailable(true); - networkDialogModel.getQosModel().setIsAvailable(true); - networkDialogModel.getQosOverridden().setEntity(entity.isQosOverridden()); - networkDialogModel.getQosModel().init(entity.getQos()); - } editPopup = networkDialogModel; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java index be576e7..114d844 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java @@ -3,6 +3,7 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; +import org.ovirt.engine.core.common.businessentities.network.NetworkQoS; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; public class NetworkParameters { @@ -11,6 +12,8 @@ private String address; private String subnet; private String gateway; + private boolean qosOverridden; + private NetworkQoS qos; private Map<String, String> customProperties; @@ -22,6 +25,8 @@ setAddress(nic.getAddress()); setSubnet(nic.getSubnet()); setGateway(nic.getGateway()); + setQosOverridden(nic.isQosOverridden()); + setQos(nic.getQos()); setCustomProperties(nic.getCustomProperties()); } @@ -50,6 +55,22 @@ this.gateway = gateway; } + public boolean getQosOverridden() { + return qosOverridden; + } + + private void setQosOverridden(boolean qosOverridden) { + this.qosOverridden = qosOverridden; + } + + public NetworkQoS getQos() { + return qos; + } + + private void setQos(NetworkQoS qos) { + this.qos = qos; + } + public Map<String, String> getCustomProperties() { return customProperties; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java index 0a3f260..ee4a85b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java @@ -243,7 +243,7 @@ HostInterfaceModel model = (HostInterfaceModel) sender; String propertyName = ((PropertyChangedEventArgs) args).propertyName; if ("BootProtocolsAvailable".equals(propertyName)) { //$NON-NLS-1$ - enableDisableBySync(model); + enableDisableByBootProtocol(model); checkConnectivity.setEnabled(model.getBootProtocolsAvailable()); } if ("NoneBootProtocolAvailable".equals(propertyName)) { //$NON-NLS-1$ @@ -291,7 +291,7 @@ displayNetworkChangeWarning.setVisible(false); } - protected void enableDisableBySync(HostInterfaceModel model) { + protected void enableDisableByBootProtocol(HostInterfaceModel model) { boolean bootProtocolsAvailable = model.getBootProtocolsAvailable(); bootProtocolLabel.setEnabled(bootProtocolsAvailable); bootProtocol.setEnabled(bootProtocolsAvailable); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java index 0c19b35..74ea65d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java @@ -41,7 +41,7 @@ layoutPanel.setWidgetSize(mainPanel, 510); asPopupPanel().setPixelSize(400, 590); - enableDisableBySync(object); + enableDisableByBootProtocol(object); customPropertiesPanel.setVisible(object.getCustomPropertiesModel().getIsAvailable()); customPropertiesWidget.edit(object.getCustomPropertiesModel()); -- To view, visit http://gerrit.ovirt.org/29229 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I486cc099cf7698f0d685c398c00215b0bab2f3fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
