Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: VM dialog Host tab for Local SD ......................................................................
webadmin: VM dialog Host tab for Local SD In vm/template/pool dialog Host tab will be visible for local SD data center (to show other host fields, used to be hidden). In local DC Migration fields will be disabled and set to non-migratable and pinned. Change-Id: I490f19a9a66c78d9f0d81bf5fb009d2a8eec38a4 Bug-Url: https://bugzilla.redhat.com/1018201 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 4 files changed, 16 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/21845/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 2238d59..9d90cb8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -1059,10 +1059,6 @@ }); } - protected void setupHostTabAvailability(UnitVmModel model) { - changeApplicationLevelVisibility(hostTab, model.getIsHostAvailable()); - } - protected void setupCustomPropertiesAvailability(UnitVmModel model) { changeApplicationLevelVisibility(customPropertiesTab, model.getIsCustomPropertiesTabAvailable()); } @@ -1073,9 +1069,7 @@ @Override public void eventRaised(Event ev, Object sender, EventArgs args) { String propName = ((PropertyChangedEventArgs) args).PropertyName; - if ("IsHostAvailable".equals(propName)) { //$NON-NLS-1$ - setupHostTabAvailability(object); - } else if ("IsHostTabValid".equals(propName)) { //$NON-NLS-1$ + if ("IsHostTabValid".equals(propName)) { //$NON-NLS-1$ if (object.getIsHostTabValid()) { hostTab.markAsValid(); } else { @@ -1099,9 +1093,6 @@ specificHost.setValue(!isAutoAssign); } }); - - // only for non local storage available - setupHostTabAvailability(object); object.getProvisioning().getPropertyChangedEvent().addListener(new IEventListener() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index 8c9b8b8..f2cfcbd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -114,6 +114,7 @@ updateMemoryBalloon(); updateCpuSharesAvailability(); updateVirtioScsiAvailability(); + updateMigrationForLocalSD(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 59dbe66..27d67ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -1017,22 +1017,6 @@ onPropertyChanged(new PropertyChangedEventArgs("IsDisksAvailable")); //$NON-NLS-1$ } - private boolean isHostAvailable; - - public boolean getIsHostAvailable() - { - return isHostAvailable; - } - - public void setIsHostAvailable(boolean value) - { - if (isHostAvailable != value) - { - isHostAvailable = value; - onPropertyChanged(new PropertyChangedEventArgs("IsHostAvailable")); //$NON-NLS-1$ - } - } - private boolean isCustomPropertiesTabAvailable; public boolean getIsCustomPropertiesTabAvailable() @@ -1740,6 +1724,7 @@ private void template_SelectedItemChanged(Object sender, EventArgs args) { behavior.template_SelectedItemChanged(); + behavior.updateMigrationForLocalSD(); } private void timeZone_SelectedItemChanged(Object sender, EventArgs args) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 4ce2e72..8271186 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -88,8 +88,6 @@ return; } - getModel().setIsHostAvailable(dataCenter.getStorageType() != StorageType.LOCALFS); - if (dataCenter.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED) { getModel().getQuota().setIsAvailable(true); } else { @@ -99,6 +97,19 @@ postDataCenterWithClusterSelectedItemChanged(); } + protected void updateMigrationForLocalSD() { + boolean isLocalSD = + getModel().getSelectedDataCenter() != null + && StorageType.LOCALFS.equals(getModel().getSelectedDataCenter().getStorageType()); + if(isLocalSD) { + getModel().getIsAutoAssign().setEntity(false); + getModel().getMigrationMode().setSelectedItem(MigrationSupport.PINNED_TO_HOST); + } + getModel().getIsAutoAssign().setIsChangable(!isLocalSD); + getModel().getMigrationMode().setIsChangable(!isLocalSD); + getModel().getDefaultHost().setIsChangable(!isLocalSD); + } + public abstract void template_SelectedItemChanged(); public abstract void postDataCenterWithClusterSelectedItemChanged(); -- To view, visit http://gerrit.ovirt.org/21845 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I490f19a9a66c78d9f0d81bf5fb009d2a8eec38a4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
