Piotr Kliczewski has uploaded a new change for review. Change subject: ui: Host settings not populated with prtocol info on Guide Me panels ......................................................................
ui: Host settings not populated with prtocol info on Guide Me panels DataCenter and Cluster Guide me panels did not set protocol type so it was always set to xmlrpc unless user changed the value. Bug-Url: https://bugzilla.redhat.com/1142706 Change-Id: I2308aa387b584388ecb5f44cfb0973380688eff1 Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/33136/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index e34ffd5..5279469 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -12,7 +12,9 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; +import org.ovirt.engine.core.common.businessentities.VdsProtocol; import org.ovirt.engine.core.common.mode.ApplicationMode; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -24,6 +26,7 @@ import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.GuideModel; +import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.MoveHost; import org.ovirt.engine.ui.uicommonweb.models.hosts.NewHostModel; @@ -416,6 +419,19 @@ model.getCommands().add(tempVar2); } })); + + ListModel<VDSGroup> clusterModel = model.getCluster(); + if (clusterModel.getSelectedItem() != null) { + VDSGroup cluster = clusterModel.getSelectedItem(); + Boolean jsonSupported = + (Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.JsonProtocolSupported, + cluster.getcompatibility_version().toString()); + if (jsonSupported) { + model.getProtocol().setEntity(true); + } else { + model.getProtocol().setEntity(false); + } + } } public void onConfirmPMHost() @@ -473,6 +489,7 @@ host.setVdsName(model.getName().getEntity()); host.setHostName(model.getHost().getEntity()); host.setPort(model.getPort().getEntity()); + host.setProtocol(VdsProtocol.fromValue(model.getProtocol().getEntity() ? VdsProtocol.STOMP.toString() : VdsProtocol.XML.toString())); host.setSshPort(model.getAuthSshPort().getEntity()); host.setSshUsername(model.getUserName().getEntity()); host.setSshKeyFingerprint(model.getFetchSshFingerprint().getEntity()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 7b3bbde..76c2aee 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -27,7 +27,9 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; +import org.ovirt.engine.core.common.businessentities.VdsProtocol; import org.ovirt.engine.core.common.interfaces.SearchType; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -62,8 +64,11 @@ import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; import org.ovirt.engine.ui.uicommonweb.validation.RegexValidation; import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.Event; +import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; +import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; import org.ovirt.engine.ui.uicompat.ITaskTarget; @@ -1513,7 +1518,7 @@ public void addHost() { - HostModel model = new NewHostModel(); + final HostModel model = new NewHostModel(); setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().newHostTitle()); model.setHelpTag(HelpTag.new_host_guide_me); @@ -1526,6 +1531,25 @@ .setItems(new ArrayList<StoragePool>(Arrays.asList(new StoragePool[] { getEntity() }))); model.getDataCenter().setSelectedItem(getEntity()); model.getDataCenter().setIsChangable(false); + + model.getCluster().getSelectedItemChangedEvent().addListener(new IEventListener() { + + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + ListModel<VDSGroup> clusterModel = model.getCluster(); + if (clusterModel.getSelectedItem() != null) { + VDSGroup cluster = clusterModel.getSelectedItem(); + Boolean jsonSupported = + (Boolean) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.JsonProtocolSupported, + cluster.getcompatibility_version().toString()); + if (jsonSupported) { + model.getProtocol().setEntity(true); + } else { + model.getProtocol().setEntity(false); + } + } + } + }); UICommand tempVar = new UICommand("OnConfirmPMHost", this); //$NON-NLS-1$ tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); @@ -1586,6 +1610,7 @@ host.setVdsName(model.getName().getEntity()); host.setHostName(model.getHost().getEntity()); host.setPort(model.getPort().getEntity()); + host.setProtocol(VdsProtocol.fromValue(model.getProtocol().getEntity() ? VdsProtocol.STOMP.toString() : VdsProtocol.XML.toString())); host.setSshPort(model.getAuthSshPort().getEntity()); host.setSshUsername(model.getUserName().getEntity()); host.setSshKeyFingerprint(model.getFetchSshFingerprint().getEntity()); -- To view, visit http://gerrit.ovirt.org/33136 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2308aa387b584388ecb5f44cfb0973380688eff1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
