Eliraz Levi has uploaded a new change for review. Change subject: webadmin: set default plugin for provider ......................................................................
webadmin: set default plugin for provider set default value of external network provider to 'Open vSwitch' set 'RabbitMQ' as default broker type of Agent config Bug-Url: https://bugzilla.redhat.com/1118253 Change-Id: I52abd0ea1a6a923374e6ab094ff2a81f145f443a Signed-off-by: Eliraz Levi <el...@redhat.com> (cherry picked from commit fbd4c02c8ace7efd85e4a4b6cc26aa701c4c2655) --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/31873/1 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 63242f0..58e5155 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 @@ -1,8 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.providers; import java.util.Arrays; - import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; +import org.ovirt.engine.core.common.businessentities.OpenstackNetworkPluginType; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.AgentConfiguration; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.BrokerType; @@ -16,6 +16,7 @@ import org.ovirt.engine.ui.uicommonweb.validation.InterfaceMappingsValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.EnumTranslator; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; @@ -117,12 +118,13 @@ }); getPluginType().setItems(NeutronPluginTranslator.getPresetDisplayStrings()); - getPluginType().setSelectedItem(""); //$NON-NLS-1$ + getPluginType().setSelectedItem(getDefaultPluginTypeString()); getInterfaceMappingsLabel().setEntity(ConstantsManager.getInstance().getConstants().interfaceMappings()); getInterfaceMappingsExplanation().setEntity(ConstantsManager.getInstance() .getConstants() .interfaceMappingsExplanation()); getBrokerType().setItems(Arrays.asList(BrokerType.values())); + getBrokerType().setSelectedItem(BrokerType.RABBIT_MQ); } public boolean validate() { @@ -143,7 +145,7 @@ public void init(Provider<OpenstackNetworkProviderProperties> provider) { OpenstackNetworkProviderProperties properties = provider.getAdditionalProperties(); - String pluginName = (properties == null) ? "" : properties.getPluginType(); //$NON-NLS-1$ + String pluginName = (properties == null) ? getDefaultPluginTypeString() : properties.getPluginType(); getPluginType().setSelectedItem(NeutronPluginTranslator.getDisplayStringForPluginName(pluginName)); if (properties != null) { @@ -197,4 +199,8 @@ } } + private String getDefaultPluginTypeString() { + return EnumTranslator.getInstance().get(OpenstackNetworkPluginType.OPEN_VSWITCH); + } + } -- To view, visit http://gerrit.ovirt.org/31873 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52abd0ea1a6a923374e6ab094ff2a81f145f443a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Eliraz Levi <el...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
