Moti Asayag has uploaded a new change for review. Change subject: engine: Replace deprecated access to ResourceManager ......................................................................
engine: Replace deprecated access to ResourceManager Change-Id: Ie78fff7c5be5998bd9c769cbefa99317ac590b89 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/transport/ProtocolDetector.java 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/38524/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java index 9f14e52..9bc8e14 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java @@ -15,13 +15,13 @@ import org.ovirt.engine.core.common.action.InstallVdsParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; -import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VdsProtocol; +import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.utils.Pair; @@ -176,7 +176,7 @@ case Complete: if (checkProtocolTofallback(getVds())) { // we need to check whether we are connecting to vdsm which supports xmlrpc only - ProtocolDetector detector = new ProtocolDetector(getVds()); + ProtocolDetector detector = new ProtocolDetector(getVds(), resourceManager); if (!detector.attemptConnection()) { detector.stopConnection(); if (detector.attemptFallbackProtocol()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/transport/ProtocolDetector.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/transport/ProtocolDetector.java index 1882af4..5e4fd41 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/transport/ProtocolDetector.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/transport/ProtocolDetector.java @@ -28,13 +28,15 @@ private Integer connectionTimeout = null; private Integer retryAttempts = null; + private final ResourceManager resourceManager; private VDS vds; - public ProtocolDetector(VDS vds) { + public ProtocolDetector(VDS vds, ResourceManager resourceManager) { this.vds = vds; this.retryAttempts = Config.<Integer> getValue(ConfigValues.ProtocolFallbackRetries); this.connectionTimeout = Config.<Integer> getValue(ConfigValues.ProtocolFallbackTimeoutInMilliSeconds); + this.resourceManager = resourceManager; } /** @@ -68,7 +70,7 @@ * Stops {@code VdsManager} for a host. */ public void stopConnection() { - ResourceManager.getInstance().RemoveVds(this.vds.getId()); + resourceManager.RemoveVds(this.vds.getId()); } /** @@ -78,7 +80,7 @@ */ public boolean attemptFallbackProtocol() { vds.setProtocol(VdsProtocol.XML); - ResourceManager.getInstance().AddVds(vds, false); + resourceManager.AddVds(vds, false); return attemptConnection(); } -- To view, visit https://gerrit.ovirt.org/38524 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie78fff7c5be5998bd9c769cbefa99317ac590b89 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
