Moti Asayag has uploaded a new change for review. Change subject: webadmin: Generalize messaging server broker type ......................................................................
webadmin: Generalize messaging server broker type Since we intend to support additional messaging broker types (i.e. RabbitMQ), there is a need to update all references to the messaging configuration. Change-Id: I0a18937e5174b5cf95e99b4959f622f368a333c0 Signed-off-by: Moti Asayag <[email protected]> --- 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/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 5 files changed, 66 insertions(+), 66 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/27560/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 d2fca99..29cb193 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,10 +4,10 @@ public HostNeutronAgentModel() { getPluginType().setIsChangable(false); - getQpidHost().setIsChangable(false); - getQpidPort().setIsChangable(false); - getQpidUsername().setIsChangable(false); - getQpidPassword().setIsChangable(false); + getMessagingServer().setIsChangable(false); + getMessagingServerPort().setIsChangable(false); + getMessagingServerUsername().setIsChangable(false); + getMessagingServerPassword().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 e5a6f18..a5b6c5e 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 @@ -27,10 +27,10 @@ private EntityModel<String> interfaceMappingsLabel = new EntityModel<String>(); private EntityModel<String> interfaceMappingsExplanation = new EntityModel<String>(); private EntityModel<String> interfaceMappings = new EntityModel<String>(); - private EntityModel<String> qpidHost = new EntityModel<String>(); - private EntityModel<String> qpidPort = new EntityModel<String>(); - private EntityModel<String> qpidUsername = new EntityModel<String>(); - private EntityModel<String> qpidPassword = new EntityModel<String>(); + private EntityModel<String> messagingServer = new EntityModel<String>(); + private EntityModel<String> messagingServerPort = new EntityModel<String>(); + private EntityModel<String> messagingServerUsername = new EntityModel<String>(); + private EntityModel<String> messagingServerPassword = new EntityModel<String>(); public ListModel<String> getPluginType() { return pluginType; @@ -52,20 +52,20 @@ return interfaceMappings; } - public EntityModel<String> getQpidHost() { - return qpidHost; + public EntityModel<String> getMessagingServer() { + return messagingServer; } - public EntityModel<String> getQpidPort() { - return qpidPort; + public EntityModel<String> getMessagingServerPort() { + return messagingServerPort; } - public EntityModel<String> getQpidUsername() { - return qpidUsername; + public EntityModel<String> getMessagingServerUsername() { + return messagingServerUsername; } - public EntityModel<String> getQpidPassword() { - return qpidPassword; + public EntityModel<String> getMessagingServerPassword() { + return messagingServerPassword; } public NeutronAgentModel() { @@ -121,12 +121,12 @@ if (getIsAvailable()) { getPluginType().validateSelectedItem(new IValidation[] { new NotEmptyValidation() }); getInterfaceMappings().validateEntity(new IValidation[] { new InterfaceMappingsValidation() }); - getQpidHost().validateEntity(new IValidation[] { new HostAddressValidation(true) }); - getQpidPort().validateEntity(new IValidation[] { new IntegerValidation(BusinessEntitiesDefinitions.NETWORK_MIN_LEGAL_PORT, + 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() - && getQpidHost().getIsValid() && getQpidPort().getIsValid()); + && getMessagingServer().getIsValid() && getMessagingServerPort().getIsValid()); } return getIsValid(); } @@ -141,13 +141,13 @@ if (agentConfiguration != null) { getInterfaceMappings().setEntity(agentConfiguration.getNetworkMappings()); - MessagingConfiguration qpidConfiguration = agentConfiguration.getMessagingConfiguration(); - if (qpidConfiguration != null) { - getQpidHost().setEntity(qpidConfiguration.getAddress()); - Integer port = qpidConfiguration.getPort(); - getQpidPort().setEntity(port == null ? null : Integer.toString(port)); - getQpidUsername().setEntity(qpidConfiguration.getUsername()); - getQpidPassword().setEntity(qpidConfiguration.getPassword()); + MessagingConfiguration messagingConfiguration = agentConfiguration.getMessagingConfiguration(); + if (messagingConfiguration != null) { + getMessagingServer().setEntity(messagingConfiguration.getAddress()); + Integer port = messagingConfiguration.getPort(); + getMessagingServerPort().setEntity(port == null ? null : Integer.toString(port)); + getMessagingServerUsername().setEntity(messagingConfiguration.getUsername()); + getMessagingServerPassword().setEntity(messagingConfiguration.getPassword()); } } } @@ -172,17 +172,17 @@ } agentConfiguration.setNetworkMappings(getInterfaceMappings().getEntity()); - MessagingConfiguration qpidConfiguration = agentConfiguration.getMessagingConfiguration(); - if (qpidConfiguration == null) { - qpidConfiguration = new MessagingConfiguration(); - agentConfiguration.setMessagingConfiguration(qpidConfiguration); + MessagingConfiguration messagingConfiguration = agentConfiguration.getMessagingConfiguration(); + if (messagingConfiguration == null) { + messagingConfiguration = new MessagingConfiguration(); + agentConfiguration.setMessagingConfiguration(messagingConfiguration); } - qpidConfiguration.setAddress(getQpidHost().getEntity()); - String port = getQpidPort().getEntity(); - qpidConfiguration.setPort(port == null ? null : Integer.valueOf(port)); - qpidConfiguration.setUsername(getQpidUsername().getEntity()); - qpidConfiguration.setPassword(getQpidPassword().getEntity()); - qpidConfiguration.setBrokerType(BrokerType.QPID); + messagingConfiguration.setAddress(getMessagingServer().getEntity()); + String port = getMessagingServerPort().getEntity(); + messagingConfiguration.setPort(port == null ? null : Integer.valueOf(port)); + messagingConfiguration.setUsername(getMessagingServerUsername().getEntity()); + messagingConfiguration.setPassword(getMessagingServerPassword().getEntity()); + messagingConfiguration.setBrokerType(BrokerType.QPID); } } 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 c7f6223..20d4090 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 @@ -3181,20 +3181,20 @@ @DefaultStringValue("Networks") String providerNetworksSubTabLabel(); - @DefaultStringValue("QPID") - String qpid(); + @DefaultStringValue("Messaging Configuration") + String messagingConfiguration(); @DefaultStringValue("Host") - String hostQpid(); + String messagingServer(); @DefaultStringValue("Port") - String portQpid(); + String messagingServerPort(); @DefaultStringValue("Username") - String usernameQpid(); + String messagingServerUsername(); @DefaultStringValue("Password") - String passwordQpid(); + String messagingServerPassword(); // Provider Network @DefaultStringValue("External ID") 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 8e02ce6..f3199e6 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 @@ -52,24 +52,24 @@ StringEntityModelTextBoxOnlyEditor interfaceMappings; @UiField - @Path(value = "qpidHost.entity") - @WithElementId("qpidHost") - StringEntityModelTextBoxEditor qpidHost; + @Path(value = "messagingServer.entity") + @WithElementId("messagingServer") + StringEntityModelTextBoxEditor messagingServer; @UiField - @Path(value = "qpidPort.entity") - @WithElementId("qpidPort") - StringEntityModelTextBoxEditor qpidPort; + @Path(value = "messagingServerPort.entity") + @WithElementId("messagingServerPort") + StringEntityModelTextBoxEditor messagingServerPort; @UiField - @Path(value = "qpidUsername.entity") - @WithElementId("qpidUsername") - StringEntityModelTextBoxEditor qpidUsername; + @Path(value = "messagingServerUsername.entity") + @WithElementId("messagingServerUsername") + StringEntityModelTextBoxEditor messagingServerUsername; @UiField - @Path(value = "qpidPassword.entity") - @WithElementId("qpidPassword") - StringEntityModelPasswordBoxEditor qpidPassword; + @Path(value = "messagingServerPassword.entity") + @WithElementId("messagingServerPassword") + StringEntityModelPasswordBoxEditor messagingServerPassword; @Inject public NeutronAgentWidget() { @@ -80,10 +80,10 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); - qpidHost.setLabel(constants.hostQpid()); - qpidPort.setLabel(constants.portQpid()); - qpidUsername.setLabel(constants.usernameQpid()); - qpidPassword.setLabel(constants.passwordQpid()); + messagingServer.setLabel(constants.messagingServer()); + messagingServerPort.setLabel(constants.messagingServerPort()); + messagingServerUsername.setLabel(constants.messagingServerUsername()); + messagingServerPassword.setLabel(constants.messagingServerPassword()); driver.initialize(this); } 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 6310de9..44cae1d 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 @@ -10,11 +10,11 @@ margin-top: 20px; } - .qpidInnerPanel { + .messagingServerInnerPanel { padding-left: 20px; } - .qpidHeader { + .messagingServerHeader { font-weight: bold; margin-top: 10px; margin-bottom: 10px; @@ -25,12 +25,12 @@ <g:FlowPanel> <w:EntityModelWidgetWithInfo ui:field="mappings" /> <g:FlowPanel addStyleNames="{style.sectionStyle}"> - <g:Label text="{constants.qpid}" addStyleNames="{style.qpidHeader}"/> - <g:FlowPanel addStyleNames="{style.qpidInnerPanel}"> - <ge:StringEntityModelTextBoxEditor ui:field="qpidHost"/> - <ge:StringEntityModelTextBoxEditor ui:field="qpidPort"/> - <ge:StringEntityModelTextBoxEditor ui:field="qpidUsername"/> - <ge:StringEntityModelPasswordBoxEditor ui:field="qpidPassword"/> + <g:Label text="{constants.messagingConfiguration}" addStyleNames="{style.messagingServerHeader}"/> + <g:FlowPanel addStyleNames="{style.messagingServerInnerPanel}"> + <ge:StringEntityModelTextBoxEditor ui:field="messagingServer"/> + <ge:StringEntityModelTextBoxEditor ui:field="messagingServerPort"/> + <ge:StringEntityModelTextBoxEditor ui:field="messagingServerUsername"/> + <ge:StringEntityModelPasswordBoxEditor ui:field="messagingServerPassword"/> </g:FlowPanel> </g:FlowPanel> </g:FlowPanel> -- To view, visit http://gerrit.ovirt.org/27560 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a18937e5174b5cf95e99b4959f622f368a333c0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
