Lior Vernia has uploaded a new change for review. Change subject: webadmin: Flush Neutron agent configuration when adding host ......................................................................
webadmin: Flush Neutron agent configuration when adding host Plugged-in the backend code for the Network Provider section in Add Host dialog. Also found out that QPID parameters aren't sent to the backend on host installation, so disabled the UI fields. Change-Id: I1b8d480a0913a0349298509f1a7770ddb0f03bc7 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java 3 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/17068/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 531d265..0a15f39 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -26,6 +26,7 @@ import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; import org.ovirt.engine.core.common.businessentities.FenceActionType; +import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.RoleType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDS; @@ -888,6 +889,12 @@ parameters.setRebootAfterInstallation(isVirt) ; parameters.setAuthMethod(model.getAuthenticationMethod()); + Provider externalProvider = (Provider) model.getExternalProviders().getSelectedItem(); + if (externalProvider != null) { + parameters.setProvider(externalProvider.getId()); + parameters.setNetworkMappings((String) model.getNeutronAgentModel().getInterfaceMappings().getEntity()); + } + Frontend.RunAction(VdcActionType.AddVds, parameters, new IFrontendActionAsyncCallback() { @Override 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 d7b2a48..8029cee 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 @@ -997,6 +997,7 @@ getProviderPluginType().setIsChangable(false); getProviderPluginType().setIsAvailable(false); neutronAgentModel = new NeutronAgentModel(getProviderType(), getProviderPluginType()); + neutronAgentModel.setIsChangable(false); neutronAgentModel.setIsAvailable(false); onExternalProviderChanged(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java index 8235d03..1e1d640 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java @@ -14,6 +14,7 @@ import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; +import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; public class NeutronAgentModel extends EntityModel { @@ -103,6 +104,21 @@ } } }); + getPropertyChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + if ("IsChangable".equals(((PropertyChangedEventArgs) args).PropertyName)) { //$NON-NLS-1$ + boolean changeable = getIsChangable(); + getInterfaceMappingsLabel().setIsChangable(changeable); + getInterfaceMappingsExplanation().setIsChangable(changeable); + getInterfaceMappings().setIsChangable(changeable); + getQpidHost().setIsChangable(changeable); + getQpidPort().setIsChangable(changeable); + getQpidUsername().setIsChangable(changeable); + getQpidPassword().setIsChangable(changeable); + } + } + }); getInterfaceMappingsLabel().setEntity(ConstantsManager.getInstance().getConstants().interfaceMappings()); getInterfaceMappingsExplanation().setEntity(ConstantsManager.getInstance() -- To view, visit http://gerrit.ovirt.org/17068 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b8d480a0913a0349298509f1a7770ddb0f03bc7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches