Lior Vernia has uploaded a new change for review. Change subject: webadmin: Plugged Neutron agent backend code to frontend ......................................................................
webadmin: Plugged Neutron agent backend code to frontend Flush NeutronAgentBehavior fields when adding or editing provider, init the fields from backend entity when editing existing provider. Change-Id: I4ae42d320a761567e49aade7f6e104366e7e19c9 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/EditProviderModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java 3 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/17021/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/EditProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/EditProviderModel.java index 38b7fdf..620463b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/EditProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/EditProviderModel.java @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -44,6 +45,11 @@ getUsername().setEntity(provider.getUsername()); getPassword().setEntity(provider.getPassword()); + if (isTypeOpenStackNetwork()) { + getNeutronAgentModel().init(((OpenstackNetworkProviderProperties) provider.getAdditionalProperties()). + getAgentConfiguration()); + } + oldUrl = provider.getUrl(); } 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 3db44cd..632069e 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,6 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.providers; import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; +import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.AgentConfiguration; +import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.QpidConfiguration; import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -132,4 +134,34 @@ return true; } + public void init(AgentConfiguration agentConfiguration) { + if (agentConfiguration != null) { + getInterfaceMappings().setEntity(agentConfiguration.getNetworkMappings()); + + QpidConfiguration qpidConfiguration = agentConfiguration.getQpidConfiguration(); + 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()); + } + } + } + + public AgentConfiguration flush() { + AgentConfiguration agentConfiguration = new AgentConfiguration(); + agentConfiguration.setNetworkMappings((String) getInterfaceMappings().getEntity()); + + QpidConfiguration qpidConfiguration = new QpidConfiguration(); + agentConfiguration.setQpidConfiguration(qpidConfiguration); + qpidConfiguration.setAddress((String) getQpidHost().getEntity()); + String port = (String) getQpidPort().getEntity(); + qpidConfiguration.setPort(port == null ? null : Integer.valueOf(port)); + qpidConfiguration.setUsername((String) getQpidUsername().getEntity()); + qpidConfiguration.setPassword((String) getQpidPassword().getEntity()); + + return agentConfiguration; + } + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 7f9f159..c62a15e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -120,7 +120,7 @@ return neutronAgentModel; } - public boolean isTypeOpenStackNetwork() { + protected boolean isTypeOpenStackNetwork() { return (ProviderType) getType().getSelectedItem() == ProviderType.OPENSTACK_NETWORK; } @@ -231,6 +231,7 @@ OpenstackNetworkProviderProperties properties = new OpenstackNetworkProviderProperties(); properties.setPluginType(NeutronPluginTranslator. getPluginNameForDisplayString((String) getPluginType().getSelectedItem())); + properties.setAgentConfiguration(getNeutronAgentModel().flush()); provider.setAdditionalProperties(properties); } -- To view, visit http://gerrit.ovirt.org/17021 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ae42d320a761567e49aade7f6e104366e7e19c9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
