Moti Asayag has uploaded a new change for review. Change subject: engine: Persist reported host data ......................................................................
engine: Persist reported host data When host is being added into the system, its capabilities should be persisted, so it can be referenced for the sake of host management network configuration. Change-Id: I94ceba389afce2cd2e39cfbb45ed0ad06a17273c Bug-Url: https://bugzilla.redhat.com/1096757 Bug-Url: https://bugzilla.redhat.com/1096715 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 3 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/27590/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java index aa3bd8f..dddfbb0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; import org.ovirt.engine.core.common.vdscommands.CollectHostNetworkDataVdsCommandParameters; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class CollectVdsNetworkDataAfterInstallationVDSCommand extends CollectVdsNetworkDataVDSCommand { @@ -15,4 +16,10 @@ protected boolean skipManagementNetwork() { return true; } + + @Override + protected void persistCollectedData() { + super.persistCollectedData(); + DbFacade.getInstance().getVdsDynamicDao().update(getVds().getDynamicData()); + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java index 22009fb..8a6a8cb 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java @@ -38,14 +38,16 @@ protected void executeVdsBrokerCommand() { // call getVdsCapabilities verb super.executeVdsBrokerCommand(); - updateNetConfigDirtyFlag(); + persistCollectedData(); - // update to db + proceedProxyReturnValue(); + } + + protected void persistCollectedData() { + updateNetConfigDirtyFlag(); persistAndEnforceNetworkCompliance(getVds(), skipManagementNetwork(), Entities.entitiesByName(getParameters().getInterfaces())); - - proceedProxyReturnValue(); } /** diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index 9675d44..50ed23d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.FeatureSupported; @@ -16,6 +17,8 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dao.network.NetworkQoSDao; import org.ovirt.engine.core.utils.NetworkUtils; +import org.ovirt.engine.core.utils.log.Log; +import org.ovirt.engine.core.utils.log.LogFactory; public class SetupNetworksVDSCommand<T extends SetupNetworksVdsCommandParameters> extends FutureVDSCommand<T> { @@ -25,6 +28,7 @@ protected static final String SLAVES = "nics"; private static final String DEFAULT_ROUTE = "defaultRoute"; private static final Map<String, String> REMOVE_OBJ = Collections.singletonMap("remove", Boolean.TRUE.toString()); + private static final Log log = LogFactory.getLog(SetupNetworksVDSCommand.class); public SetupNetworksVDSCommand(T parameters) { super(parameters); @@ -72,7 +76,11 @@ qosMapper.serialize(iface.isQosOverridden() ? iface.getQos() : qosDao.get(network.getQosId())); } - if (FeatureSupported.defaultRoute(Collections.max(host.getSupportedClusterVersionsSet())) + Set<Version> supportedClusterVersionsSet = host.getSupportedClusterVersionsSet(); + if (supportedClusterVersionsSet == null || supportedClusterVersionsSet.isEmpty()) { + log.warnFormat("Host {0} ({1}) doesn't contain Supported Cluster Versions, therefore 'defaultRoute'" + + " will not be sent via the SetupNetworks", host.getName(), host.getId()); + } else if (FeatureSupported.defaultRoute(Collections.max(supportedClusterVersionsSet)) && NetworkUtils.isManagementNetwork(network) && (iface.getBootProtocol() == NetworkBootProtocol.DHCP || (iface.getBootProtocol() == NetworkBootProtocol.STATIC_IP -- To view, visit http://gerrit.ovirt.org/27590 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94ceba389afce2cd2e39cfbb45ed0ad06a17273c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
