Hello Moti Asayag,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/16852
to review the following change.
Change subject: webadmin: Utilize the agent configuration properties
......................................................................
webadmin: Utilize the agent configuration properties
The patch performs the following:
1. Persist the openstack network provider agent configuration
properties.
2. Pass the provider id and network mappings when adding new
host configured with a network provider.
Change-Id: I8710d391b1dbda4045a3ba8b0ce04ed1b8bb9fb3
Signed-off-by: Moti Asayag <[email protected]>
---
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/providers/ProviderModel.java
2 files changed, 41 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/16852/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 bf67001..b9f2377 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
@@ -23,6 +23,7 @@
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.action.VdsActionParameters;
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;
@@ -864,6 +865,12 @@
parameters.setOverrideFirewall((Boolean)
model.getOverrideIpTables().getEntity());
parameters.setRebootAfterInstallation(isVirt) ;
+ Provider<?> externalProvider = (Provider<?>)
model.getExternalProviders().getSelectedItem();
+ if (externalProvider != null) {
+ parameters.setProvider(externalProvider.getId());
+ parameters.setNetworkMappings((String)
model.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/providers/ProviderModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
index 846d2c5..0514e51 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
@@ -9,6 +9,8 @@
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
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.QpidConfiguration;
import org.ovirt.engine.core.common.businessentities.Provider;
import org.ovirt.engine.core.common.businessentities.ProviderType;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
@@ -199,6 +201,13 @@
getType().setItems(Arrays.asList(ProviderType.values()));
getType().setSelectedItem(provider.getType());
+ setInterfaceMappings(new EntityModel());
+ setHostIp(new EntityModel());
+ setQpidPort(new EntityModel());
+ setUserName(new EntityModel());
+ setAgentConfigPassword(new EntityModel());
+
+
List<String> pluginStrings = new ArrayList<String>();
for (OpenstackNetworkPluginType plugin :
OpenstackNetworkPluginType.values()) {
pluginStrings.add(EnumTranslator.createAndTranslate(plugin));
@@ -209,14 +218,20 @@
(OpenstackNetworkProviderProperties)
provider.getAdditionalProperties();
getTenantName().setEntity(properties.getTenantName());
getPluginType().setSelectedItem(properties.getPluginType());
+
+ AgentConfiguration agentConfiguration =
properties.getAgentConfiguration();
+ if (agentConfiguration != null) {
+
getInterfaceMappings().setEntity(agentConfiguration.getNetworkMappings());
+ QpidConfiguration qpidConfiguration =
agentConfiguration.getQpidConfiguration();
+
+ if (qpidConfiguration != null) {
+ getHostIp().setEntity(qpidConfiguration.getAddress());
+ getQpidPort().setEntity(qpidConfiguration.getPort());
+ getUserName().setEntity(qpidConfiguration.getUsername());
+
getAgentConfigPassword().setEntity(qpidConfiguration.getPassword());
+ }
+ }
}
-
- setHostIp(new EntityModel());
- setQpidPort(new EntityModel());
- setUserName(new EntityModel());
- setAgentConfigPassword(new EntityModel());
-
- setInterfaceMappings(new EntityModel());
UICommand tempVar = new UICommand(CMD_SAVE, this);
tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok());
@@ -257,6 +272,18 @@
if (isTypeOpenStackNetwork()) {
OpenstackNetworkProviderProperties properties = new
OpenstackNetworkProviderProperties();
properties.setPluginType((String)
getPluginType().getSelectedItem());
+ properties.setAgentConfiguration(new AgentConfiguration());
+ properties.getAgentConfiguration().setNetworkMappings((String)
getInterfaceMappings().getEntity());
+ properties.getAgentConfiguration().setQpidConfiguration(new
QpidConfiguration());
+
properties.getAgentConfiguration().getQpidConfiguration().setAddress((String)
getHostIp().getEntity());
+ String qpidPort = (String) getQpidPort().getEntity();
+ properties.getAgentConfiguration()
+ .getQpidConfiguration()
+ .setPort(qpidPort == null ? null :
Integer.valueOf(qpidPort));
+
properties.getAgentConfiguration().getQpidConfiguration().setUsername((String)
getUserName().getEntity());
+ properties.getAgentConfiguration()
+ .getQpidConfiguration()
+ .setPassword((String)
getAgentConfigPassword().getEntity());
provider.setAdditionalProperties(properties);
}
--
To view, visit http://gerrit.ovirt.org/16852
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8710d391b1dbda4045a3ba8b0ce04ed1b8bb9fb3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
