Eli Mesika has uploaded a new change for review. Change subject: core: [RFE] Change the Slot field to... ......................................................................
core: [RFE] Change the Slot field to... [RFE] Change the Slot field to "Service Profile" when cisco_ucs is selected as the fencing type Change-Id: Ic572e678decad8d032a6400796cf29baf9417093 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=804530 Signed-off-by: Eli Mesika <emes...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/host/HostPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java 4 files changed, 74 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/25969/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index 8213935..9dc1f4f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -622,6 +622,32 @@ } } + private boolean ciscoUcsPrimaryPmTypeSelected; + + public boolean isCiscoUcsPrimaryPmTypeSelected() { + return ciscoUcsPrimaryPmTypeSelected; + } + + public void setCiscoUcsPrimaryPmTypeSelected(boolean value) { + if (ciscoUcsPrimaryPmTypeSelected != value) { + ciscoUcsPrimaryPmTypeSelected = value; + onPropertyChanged(new PropertyChangedEventArgs("IsCiscoUcsPrimaryPmTypeSelected")); //$NON-NLS-1$ + } + } + + private boolean ciscoUcsSecondaryPmTypeSelected; + + public boolean isCiscoUcsSecondaryPmTypeSelected() { + return ciscoUcsSecondaryPmTypeSelected; + } + + public void setCiscoUcsSecondaryPmTypeSelected(boolean value) { + if (ciscoUcsSecondaryPmTypeSelected != value) { + ciscoUcsSecondaryPmTypeSelected = value; + onPropertyChanged(new PropertyChangedEventArgs("IsCiscoUcsSecondaryPmTypeSelected")); //$NON-NLS-1$ + } + } + public HashMap<String, String> getPmOptionsMap() { return getPmOptionsMapInternal(getPmPort(), getPmSlot(), getPmSecure(), getPmOptions()); } @@ -981,7 +1007,7 @@ return; } - List list = new ArrayList((List) getPmProxyPreferencesList().getItems()); + List list = new ArrayList(getPmProxyPreferencesList().getItems()); Object selectedItem = getPmProxyPreferencesList().getSelectedItem(); int selectedItemIndex = list.indexOf(selectedItem); @@ -1000,7 +1026,7 @@ return; } - List list = new ArrayList((List) getPmProxyPreferencesList().getItems()); + List list = new ArrayList(getPmProxyPreferencesList().getItems()); Object selectedItem = getPmProxyPreferencesList().getSelectedItem(); int selectedItemIndex = list.indexOf(selectedItem); @@ -1046,13 +1072,11 @@ if (fingerprint != null && fingerprint.length() > 0) { getFetchSshFingerprint().setEntity(result); - getFetchResult().setEntity((String) - ConstantsManager.getInstance().getConstants().successLoadingFingerprint()); + getFetchResult().setEntity(ConstantsManager.getInstance().getConstants().successLoadingFingerprint()); } else { - getFetchResult().setEntity((String) - ConstantsManager.getInstance().getConstants().errorLoadingFingerprint()); + getFetchResult().setEntity(ConstantsManager.getInstance().getConstants().errorLoadingFingerprint()); } } }; @@ -1066,7 +1090,7 @@ + getHost().getInvalidityReasons().get(0)); } else { - getFetchResult().setEntity((String) ConstantsManager.getInstance().getConstants().loadingFingerprint()); + getFetchResult().setEntity(ConstantsManager.getInstance().getConstants().loadingFingerprint()); AsyncDataProvider.getHostFingerprint(aQuery, getHost().getEntity().toString()); } } @@ -1365,6 +1389,7 @@ private void updatePmModels() { boolean isPm = (Boolean) getIsPm().getEntity(); + final String ciscoUcsValue = "cisco_ucs"; //$NON-NLS-1$ // Update primary PM fields. getManagementIp().setIsChangable(isPm); @@ -1405,12 +1430,12 @@ } } }), pmType, version); + setCiscoUcsPrimaryPmTypeSelected(pmType.equals(ciscoUcsValue)); } else { getPmPort().setIsAvailable(false); getPmSlot().setIsAvailable(false); getPmSecure().setIsAvailable(false); } - // Update secondary PM fields. getPmSecondaryIp().setIsChangable(isPm); @@ -1445,12 +1470,12 @@ } } }), pmSecondaryType, version); + setCiscoUcsSecondaryPmTypeSelected(pmSecondaryType.equals(ciscoUcsValue)); } else { getPmSecondaryPort().setIsAvailable(false); getPmSecondarySlot().setIsAvailable(false); getPmSecondarySecure().setIsAvailable(false); } - // Update other PM fields. getPmVariants().setIsChangable(isPm); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index e37097c..ba45170 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -524,6 +524,9 @@ @DefaultStringValue("Slot") String hostPopupPmSlotLabel(); + @DefaultStringValue("Service Profile") + String hostPopupPmCiscoUcsSlotLabel(); + @DefaultStringValue("Options") String hostPopupPmOptionsLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/host/HostPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/host/HostPopupPresenterWidget.java index 23e458b..beadc52 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/host/HostPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/host/HostPopupPresenterWidget.java @@ -26,6 +26,10 @@ */ void showPowerManagement(); void setHostProviderVisibility(boolean visible); + + void updatePrimaryPmSlotLabelText(boolean ciscoUcsSelected); + void updateSecondaryPmSlotLabelText(boolean ciscoUcsSelected); + } @Inject @@ -36,16 +40,15 @@ @Override public void init(final HostModel model) { super.init(model); - addTestButtonListener(); addUpdateHostsListener(model); addPowerManagementListener(model); addHostProviderListener(model); + addCiscoUcsPmTypeListener(model); } private void addPowerManagementListener(final HostModel model) { model.getPropertyChangedEvent().addListener(new IEventListener() { - @Override public void eventRaised(Event ev, Object sender, EventArgs args) { String propName = ((PropertyChangedEventArgs) args).propertyName; @@ -54,6 +57,20 @@ } if (model.getIsPowerManagementTabSelected()) { getView().showPowerManagement(); + } + } + }); + } + + private void addCiscoUcsPmTypeListener(final HostModel model) { + model.getPropertyChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + String propName = ((PropertyChangedEventArgs) args).propertyName; + if ("IsCiscoUcsPrimaryPmTypeSelected".equals(propName)) { //$NON-NLS-1$ + getView().updatePrimaryPmSlotLabelText(model.isCiscoUcsPrimaryPmTypeSelected()); + } else if ("IsCiscoUcsSecondaryPmTypeSelected".equals(propName)) { //$NON-NLS-1$ + getView().updateSecondaryPmSlotLabelText(model.isCiscoUcsSecondaryPmTypeSelected()); } } }); @@ -79,7 +96,6 @@ } private void addHostProviderListener(final HostModel model) { model.getProviderSearchFilter().getPropertyChangedEvent().addListener(new IEventListener() { - @Override public void eventRaised(Event ev, Object sender, EventArgs args) { if ("IsAvailable".equals(((PropertyChangedEventArgs) args).propertyName)) { //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index 06677f4..f63112f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -2,8 +2,6 @@ import java.util.List; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.FocusHandler; import org.ovirt.engine.core.common.action.VdsOperationActionParameters.AuthenticationMethod; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -15,6 +13,7 @@ import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.Align; +import org.ovirt.engine.ui.common.widget.HasLabel; import org.ovirt.engine.ui.common.widget.HasUiCommandClickHandlers; import org.ovirt.engine.ui.common.widget.UiCommandButton; import org.ovirt.engine.ui.common.widget.dialog.AdvancedParametersExpander; @@ -51,6 +50,8 @@ import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.FocusEvent; +import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; @@ -957,4 +958,19 @@ public void setHostProviderVisibility(boolean visible) { searchProviderPanel.setVisible(visible); } + + @Override + public void updatePrimaryPmSlotLabelText(boolean ciscoUcsSelected) { + updatePmSlotLabelText(pmSlotEditor, ciscoUcsSelected); + } + + @Override + public void updateSecondaryPmSlotLabelText(boolean ciscoUcsSelected) { + updatePmSlotLabelText(pmSecondarySlotEditor, ciscoUcsSelected); + } + + void updatePmSlotLabelText(HasLabel widget, boolean ciscoUcsSelected) { + widget.setLabel(ciscoUcsSelected ? constants.hostPopupPmCiscoUcsSlotLabel() : constants.hostPopupPmSlotLabel()); + } + } -- To view, visit http://gerrit.ovirt.org/25969 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic572e678decad8d032a6400796cf29baf9417093 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
