Moti Asayag has uploaded a new change for review.
Change subject: webadmin: Add broker type to neutron agent configuration
......................................................................
webadmin: Add broker type to neutron agent configuration
The broker type was added to neutron agent configuration
so additional broker types could be supported.
Change-Id: I04966edaebd4c9d260bbb42cae16ef3a42467ce3
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/HostNeutronAgentModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
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/widget/provider/NeutronAgentWidget.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.ui.xml
7 files changed, 35 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/27566/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/HostNeutronAgentModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/HostNeutronAgentModel.java
index 29cb193..86320b9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/HostNeutronAgentModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/HostNeutronAgentModel.java
@@ -4,6 +4,7 @@
public HostNeutronAgentModel() {
getPluginType().setIsChangable(false);
+ getBrokerType().setIsChangable(false);
getMessagingServer().setIsChangable(false);
getMessagingServerPort().setIsChangable(false);
getMessagingServerUsername().setIsChangable(false);
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 a5b6c5e..63242f0 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,5 +1,7 @@
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.OpenstackNetworkProviderProperties;
import
org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.AgentConfiguration;
@@ -27,6 +29,7 @@
private EntityModel<String> interfaceMappingsLabel = new
EntityModel<String>();
private EntityModel<String> interfaceMappingsExplanation = new
EntityModel<String>();
private EntityModel<String> interfaceMappings = new EntityModel<String>();
+ private ListModel<BrokerType> brokerType = new ListModel<BrokerType>();
private EntityModel<String> messagingServer = new EntityModel<String>();
private EntityModel<String> messagingServerPort = new
EntityModel<String>();
private EntityModel<String> messagingServerUsername = new
EntityModel<String>();
@@ -50,6 +53,10 @@
public EntityModel<String> getInterfaceMappings() {
return interfaceMappings;
+ }
+
+ public ListModel<BrokerType> getBrokerType() {
+ return brokerType;
}
public EntityModel<String> getMessagingServer() {
@@ -115,18 +122,21 @@
getInterfaceMappingsExplanation().setEntity(ConstantsManager.getInstance()
.getConstants()
.interfaceMappingsExplanation());
+ getBrokerType().setItems(Arrays.asList(BrokerType.values()));
}
public boolean validate() {
if (getIsAvailable()) {
getPluginType().validateSelectedItem(new IValidation[] { new
NotEmptyValidation() });
+ getBrokerType().validateSelectedItem(new IValidation[] { new
NotEmptyValidation() });
getInterfaceMappings().validateEntity(new IValidation[] { new
InterfaceMappingsValidation() });
getMessagingServer().validateEntity(new IValidation[] { new
HostAddressValidation(true) });
getMessagingServerPort().validateEntity(new IValidation[] { new
IntegerValidation(BusinessEntitiesDefinitions.NETWORK_MIN_LEGAL_PORT,
BusinessEntitiesDefinitions.NETWORK_MAX_LEGAL_PORT) });
setIsValid(getPluginType().getIsValid() &&
getInterfaceMappings().getIsValid()
- && getMessagingServer().getIsValid() &&
getMessagingServerPort().getIsValid());
+ && getMessagingServer().getIsValid() &&
getMessagingServerPort().getIsValid()
+ && getBrokerType().getIsValid());
}
return getIsValid();
}
@@ -143,6 +153,7 @@
MessagingConfiguration messagingConfiguration =
agentConfiguration.getMessagingConfiguration();
if (messagingConfiguration != null) {
+
getBrokerType().setSelectedItem(messagingConfiguration.getBrokerType());
getMessagingServer().setEntity(messagingConfiguration.getAddress());
Integer port = messagingConfiguration.getPort();
getMessagingServerPort().setEntity(port == null ? null :
Integer.toString(port));
@@ -182,7 +193,7 @@
messagingConfiguration.setPort(port == null ? null :
Integer.valueOf(port));
messagingConfiguration.setUsername(getMessagingServerUsername().getEntity());
messagingConfiguration.setPassword(getMessagingServerPassword().getEntity());
- messagingConfiguration.setBrokerType(BrokerType.QPID);
+
messagingConfiguration.setBrokerType(getBrokerType().getSelectedItem());
}
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
index 353fbf7..f02b168 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
@@ -322,4 +322,6 @@
String SerialNumberPolicy___VM_ID();
String SerialNumberPolicy___CUSTOM();
+
+ String OpenstackNetworkProviderProperties$BrokerType___QPID();
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
index 2f28358..eb19d51 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
@@ -180,3 +180,4 @@
SerialNumberPolicy___HOST_ID=Host ID
SerialNumberPolicy___VM_ID=Vm ID
SerialNumberPolicy___CUSTOM=Custom serial number
+OpenstackNetworkProviderProperties$BrokerType___QPID=Qpid
\ No newline at end of file
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 ea8703c..9371bb4 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
@@ -3187,6 +3187,9 @@
@DefaultStringValue("Messaging Configuration")
String messagingConfiguration();
+ @DefaultStringValue("Broker Type")
+ String messagingBrokerType();
+
@DefaultStringValue("Host")
String messagingServer();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.java
index f3199e6..c971e00 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.java
@@ -1,12 +1,15 @@
package org.ovirt.engine.ui.webadmin.widget.provider;
+import
org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.BrokerType;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.widget.EntityModelWidgetWithInfo;
+import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelLabel;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelPasswordBoxEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxOnlyEditor;
+import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
import
org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractModelBoundPopupWidget;
import org.ovirt.engine.ui.uicommonweb.models.providers.NeutronAgentModel;
import org.ovirt.engine.ui.uicompat.Event;
@@ -71,15 +74,21 @@
@WithElementId("messagingServerPassword")
StringEntityModelPasswordBoxEditor messagingServerPassword;
+ @UiField(provided = true)
+ @Path("brokerType.selectedItem")
+ @WithElementId("brokerType")
+ ListModelListBoxEditor<BrokerType> brokerTypeEditor;
+
@Inject
public NeutronAgentWidget() {
-
+ brokerTypeEditor = new ListModelListBoxEditor<BrokerType>(new
EnumRenderer<BrokerType>());
mappingsLabel = new StringEntityModelLabel();
interfaceMappings = new StringEntityModelTextBoxOnlyEditor();
mappings = new EntityModelWidgetWithInfo<String>(mappingsLabel,
interfaceMappings);
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
ViewIdHandler.idHandler.generateAndSetIds(this);
+ brokerTypeEditor.setLabel(constants.messagingBrokerType());
messagingServer.setLabel(constants.messagingServer());
messagingServerPort.setLabel(constants.messagingServerPort());
messagingServerUsername.setLabel(constants.messagingServerUsername());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.ui.xml
index 44cae1d..fcc0d5b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/provider/NeutronAgentWidget.ui.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
- xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic"
- xmlns:w="urn:import:org.ovirt.engine.ui.common.widget">
+ xmlns:g="urn:import:com.google.gwt.user.client.ui"
+ xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
+ xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic"
+ xmlns:w="urn:import:org.ovirt.engine.ui.common.widget">
<ui:with field='constants'
type='org.ovirt.engine.ui.webadmin.ApplicationConstants'/>
<ui:style>
@@ -27,6 +29,7 @@
<g:FlowPanel addStyleNames="{style.sectionStyle}">
<g:Label text="{constants.messagingConfiguration}"
addStyleNames="{style.messagingServerHeader}"/>
<g:FlowPanel
addStyleNames="{style.messagingServerInnerPanel}">
+ <e:ListModelListBoxEditor
ui:field="brokerTypeEditor"/>
<ge:StringEntityModelTextBoxEditor
ui:field="messagingServer"/>
<ge:StringEntityModelTextBoxEditor
ui:field="messagingServerPort"/>
<ge:StringEntityModelTextBoxEditor
ui:field="messagingServerUsername"/>
--
To view, visit http://gerrit.ovirt.org/27566
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04966edaebd4c9d260bbb42cae16ef3a42467ce3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
