Lior Vernia has uploaded a new change for review. Change subject: webadmin: Show non-overridden QoS values for host interface ......................................................................
webadmin: Show non-overridden QoS values for host interface Previously only overridden values would be shown - this fetches the QoS values even if they're configured on the network instead of the interface (and there's no overriding on the interface). Change-Id: I74331880697e86dd4764cbdf7cbecaa5210612d8 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/34134/1 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 8513793..a651270 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 @@ -27,6 +27,7 @@ import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -390,13 +391,33 @@ networkDialogModel.setStaticIpChangeAllowed(!getEntity().getHostName().equals(entity.getAddress())); networkDialogModel.getBondingOptions().setIsAvailable(false); networkDialogModel.setBootProtocol(entity.getBootProtocol()); + if ((Boolean) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.HostNetworkQosSupported, version)) { networkDialogModel.getQosOverridden().setIsAvailable(true); networkDialogModel.getQosModel().setIsAvailable(true); networkDialogModel.getQosOverridden().setEntity(entity.isQosOverridden()); - networkDialogModel.getQosModel().init(entity.getQos()); + if (entity.isQosOverridden()) { + networkDialogModel.getQosModel().init(entity.getQos()); + } else { + Guid qosId = logicalNetwork.getEntity().getQosId(); + if (qosId != null) { + networkDialogModel.startProgress(null); + Frontend.getInstance().runQuery(VdcQueryType.GetQosById, + new IdQueryParameters(qosId), + new AsyncQuery(new INewAsyncCallback() { + + @Override + public void onSuccess(Object model, Object returnValue) { + networkDialogModel.getQosModel() + .init((HostNetworkQos) ((VdcQueryReturnValue) returnValue).getReturnValue()); + networkDialogModel.stopProgress(); + } + })); + } + } } + if ((Boolean) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.NetworkCustomPropertiesSupported, version)) { KeyValueModel customPropertiesModel = networkDialogModel.getCustomPropertiesModel(); @@ -414,6 +435,7 @@ customPropertiesModel.setKeyValueMap(validProperties); customPropertiesModel.deserialize(KeyValueModel.convertProperties(entity.getCustomProperties())); } + networkDialogModel.getIsToSync().setIsChangable(!logicalNetwork.isInSync()); networkDialogModel.getIsToSync() .setEntity(networksToSync.contains(logicalNetwork.getName())); -- To view, visit http://gerrit.ovirt.org/34134 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74331880697e86dd4764cbdf7cbecaa5210612d8 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
