Daniel Erez has posted comments on this change.
Change subject: frontend: override SPICE proxy on cluster and pool level
......................................................................
Patch Set 6:
(11 comments)
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
Line 55: return tabContainer;
Line 56: }
Line 57:
Line 58: @Override
Line 59: public void markAsValid() {
formatter
Line 60: tabContainer.getElement().addClassName(isActive ?
style.obrand_active() : style.inactive());
Line 61: }
Line 62:
Line 63: @Override
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
Line 699:
Line 700: driver.initialize(this);
Line 701: }
Line 702:
Line 703: protected void initSpiceProxy() {
formatter
Line 704: EntityModelLabel label = new EntityModelLabel();
Line 705: label.setText(constants.defineSpiceProxyEnable());
Line 706: spiceProxyOverrideEnabledEditor = new
EntityModelCheckBoxOnlyEditor();
Line 707: spiceProxyEnabledCheckboxWithInfoIcon = new
EntityModelWidgetWithInfo(label, spiceProxyOverrideEnabledEditor);
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java
Line 80: incraseNumOfVmsEditor.setEnabled(true);
Line 81: editMaxAssignedVmsPerUserEditor.setEnabled(true);
Line 82:
Line 83: if (model.getSpiceProxyEnabled().getEntity()) {
Line 84: spiceProxyEditor.setEnabled(true);
Could be nicer to set explicitly, i.e.
setEnabled(model.getSpiceProxyEnabled().getEntity()). Do you prefer to avoid
this to not raise an unneeded event?
Line 85: }
Line 86: }
Line 87:
Line 88: @Override
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
Line 951: }
Line 952: }));
Line 953: }
Line 954:
Line 955: private void initSpiceProxy() {
Just a matter of taste, but consider a mild refactor for readability, something
along these lines:
* Object proxy = getEntity().getSpiceProxy();
* boolean isProxyAvailable = !StringHelper.isNullOrEmpty(proxy);
* getSpiceProxyEnabled().setEntity(isProxyAvailable);
* getSpiceProxy().setIsChangable(isProxyAvailable);
* getSpiceProxy().setEntity(proxy);
Line 956: if (StringHelper.isNullOrEmpty(getEntity().getSpiceProxy())) {
Line 957: getSpiceProxyEnabled().setEntity(false);
Line 958: getSpiceProxy().setIsChangable(false);
Line 959: } else {
Line 1103: EntityModel senderEntityModel = (EntityModel) sender;
Line 1104:
Line 1105: if (senderEntityModel == getSpiceProxyEnabled()) {
Line 1106:
getSpiceProxy().setIsChangable(getSpiceProxyEnabled().getEntity());
Line 1107: } else if ((Boolean) senderEntityModel.getEntity())
formatter
Line 1108: {
Line 1109: if (senderEntityModel ==
getOptimizationNone_IsSelected())
Line 1110: {
Line 1111:
getOptimizationForServer_IsSelected().setEntity(false);
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
Line 449:
Line 450: EntityModel<VmPoolType> poolTypeSelectedItem
= model.getPoolType().getSelectedItem();
Line 451:
pool.setVmPoolType(poolTypeSelectedItem.getEntity());
Line 452:
Line 453: if(model.getSpiceProxyEnabled().getEntity()) {
formatter
Line 454:
pool.setSpiceProxy(model.getSpiceProxy().getEntity());
Line 455: }
Line 456:
Line 457: Guid default_host;
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java
Line 59:
Line 60: @Override
Line 61: public boolean validate() {
Line 62: boolean parentValidation = super.validate();
Line 63:
no change?
Line 64: if (getModel().getName().getIsValid()) {
Line 65: getModel().getName().validateEntity(new IValidation[] {
new NewPoolNameLengthValidation(
Line 66: getModel().getName().getEntity(),
Line 67: getModel().getNumOfDesktops().getEntity(),
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidation.java
Line 1: package org.ovirt.engine.ui.uicommonweb.validation;
Line 2:
Line 3: import org.ovirt.engine.ui.uicompat.ConstantsManager;
Line 4:
Line 5: public class HostWithProtocolAndPortAddressValidation extends
HostAddressValidation {
Nice! Maybe worth extracting the validation+test to another patch.
Line 6: @Override
Line 7: protected String composeRegex() {
Line 8: return start() + protocol() + hostnameOrIp() + port() + end();
Line 9: }
....................................................
File
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
Line 715:
Line 716: @DefaultStringValue("Do Not Migrate Virtual Machines")
Line 717: String clusterPopupMigrateOnError_NoLabel();
Line 718:
Line 719: @DefaultStringValue("Override default SPICE proxy will override
the default from vdc_options")
Not sure we want to mention the name of the DB table, maybe just: "Override the
default SPICE proxy value".
Line 720: String clusterSpiceProxyInfo();
Line 721:
Line 722: @DefaultStringValue("Define SPICE proxy for Cluster")
Line 723: String clusterSpiceProxyEnable();
....................................................
File
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/cluster/ClusterPopupPresenterWidget.java
Line 45: }
Line 46: }
Line 47: });
Line 48:
Line 49: String spiceProxyInConfig = (String)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SpiceProxyDefault);
iinm, needs formater
Line 50: String spiceProxyMessage =
StringHelper.isNullOrEmpty(spiceProxyInConfig) ? messages.noSpiceProxyDefined()
: spiceProxyInConfig;
Line 51:
getView().setSpiceProxyOverrideExplanation(messages.consoleOverrideSpiceProxyMessage(messages.consoleOverrideDefinedInGlobalConfig(),
spiceProxyMessage));
Line 52:
Line 53: }
....................................................
File
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/pool/BasePoolPopupPresenterWidget.java
Line 37: });
Line 38: }
Line 39:
Line 40: private void setSpiceProxyOverrideExplanation(VDSGroup
selectedCluster) {
Line 41: String spiceProxyInConfig = (String)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SpiceProxyDefault);
same
Line 42: String spiceProxyOnCluster = selectedCluster.getSpiceProxy();
Line 43:
Line 44: if (!StringHelper.isNullOrEmpty(spiceProxyOnCluster)) {
Line 45:
getView().setSpiceProxyOverrideExplanation(messages.consoleOverrideSpiceProxyMessage(messages.consoleOverrideDefinedOnCluster(),
spiceProxyOnCluster));
--
To view, visit http://gerrit.ovirt.org/21519
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4d547a12b88e1acc8806fcab1f626b419a979742
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: Daniel Erez <[email protected]>
Gerrit-Reviewer: Gilad Chaplik <[email protected]>
Gerrit-Reviewer: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
