Martin Peřina has uploaded a new change for review. Change subject: core: FenceProxyLocator* code clean up ......................................................................
core: FenceProxyLocator* code clean up 1. Moves FenceProxyLocator and FenceProxyLocatorTest to bll.pm package 2. Makes both classes more compatible with Java Coding Convetions 3. Reformats code Change-Id: I9424a1afefde58b6e687eb4a0325a59ce9573950 Bug-Url: https://bugzilla.redhat.com/1182510 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutor.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceProxyLocator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/FenceValidatorTest.java 7 files changed, 35 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/39763/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index 9f19a22..3cab44d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -9,6 +9,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.attestationbroker.AttestThread; import org.ovirt.engine.core.bll.job.ExecutionHandler; +import org.ovirt.engine.core.bll.pm.FenceProxyLocator; import org.ovirt.engine.core.bll.pm.HostFenceActionExecutor; import org.ovirt.engine.core.bll.storage.StorageHandlingCommandBase; import org.ovirt.engine.core.bll.storage.StoragePoolStatusHandler; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutor.java index 2ba4123..339f7f3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutor.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; -import org.ovirt.engine.core.bll.FenceProxyLocator; import org.ovirt.engine.core.bll.VdsArchitectureHelper; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.ArchitectureType; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceProxyLocator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceProxyLocator.java similarity index 68% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceProxyLocator.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceProxyLocator.java index e37cde9..2c9f6af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceProxyLocator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceProxyLocator.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.pm; import java.util.Iterator; import java.util.List; @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.businessentities.NonOperationalReason; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VdsDynamic; import org.ovirt.engine.core.common.businessentities.pm.FenceProxySourceType; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -22,19 +21,17 @@ import org.slf4j.LoggerFactory; public class FenceProxyLocator { - private static final Logger log = LoggerFactory.getLogger(FenceProxyLocator.class); - private final VDS _vds; + private final VDS fencedHost; private FencingPolicy fencingPolicy; - public FenceProxyLocator(VDS _vds) { - super(); - this._vds = _vds; + public FenceProxyLocator(VDS fencedHost) { + this(fencedHost, null); } - public FenceProxyLocator(VDS vds, FencingPolicy fencingPolicy) { - this(vds); + public FenceProxyLocator(VDS fencedHost, FencingPolicy fencingPolicy) { + this.fencedHost = fencedHost; this.fencingPolicy = fencingPolicy; } @@ -75,18 +72,18 @@ } } if (proxyHost == null) { - log.error("Can not run Power Management command on Host {}, no suitable proxy Host was found.", - _vds.getName()); + log.error("Can not run fence action on host '{}', no suitable proxy host was found.", + fencedHost.getName()); return null; } return proxyHost; } private List<FenceProxySourceType> getFenceProxySources() { - List<FenceProxySourceType> fenceProxySources = _vds.getFenceProxySources(); + List<FenceProxySourceType> fenceProxySources = fencedHost.getFenceProxySources(); if (fenceProxySources == null || fenceProxySources.isEmpty()) { fenceProxySources = FenceProxySourceTypeHelper.parseFromString( - Config.<String> getValue(ConfigValues.FenceProxyDefaultPreferences)); + Config.<String>getValue(ConfigValues.FenceProxyDefaultPreferences)); } return fenceProxySources; } @@ -100,12 +97,12 @@ Iterator<VDS> iterator = hosts.iterator(); while (iterator.hasNext()) { VDS host = iterator.next(); - if (host.getId().equals(_vds.getId()) + if (host.getId().equals(fencedHost.getId()) || host.getId().equals(excludedHostId) || !matchesOption(host, fenceProxySource) || !areAgentsVersionCompatible(host) || (fencingPolicy != null && !isFencingPolicySupported(host, minSupportedVersion)) - || isHostNetworkUnreacable(host)) { + || isHostNetworkUnreachable(host)) { iterator.remove(); } } @@ -117,45 +114,45 @@ return hosts.size() == 0 ? null : hosts.get(0); } - private boolean matchesOption(VDS host, FenceProxySourceType fenceProxySource) { + private boolean matchesOption(VDS proxyCandidate, FenceProxySourceType fenceProxySource) { boolean matches = false; switch (fenceProxySource) { case CLUSTER: - matches = host.getVdsGroupId().equals(_vds.getVdsGroupId()); + matches = proxyCandidate.getVdsGroupId().equals(fencedHost.getVdsGroupId()); break; case DC: - matches = host.getStoragePoolId().equals(_vds.getStoragePoolId()); + matches = proxyCandidate.getStoragePoolId().equals(fencedHost.getStoragePoolId()); break; case OTHER_DC: - matches = !host.getStoragePoolId().equals(_vds.getStoragePoolId()); + matches = !proxyCandidate.getStoragePoolId().equals(fencedHost.getStoragePoolId()); + break; } return matches; } - private boolean areAgentsVersionCompatible(VDS vds) { - VdsFenceOptions options = new VdsFenceOptions(vds.getVdsGroupCompatibilityVersion().getValue()); + private boolean areAgentsVersionCompatible(VDS proxyCandidate) { + VdsFenceOptions options = new VdsFenceOptions(proxyCandidate.getVdsGroupCompatibilityVersion().getValue()); boolean supported = true; - for (FenceAgent agent : vds.getFenceAgents()) { + for (FenceAgent agent : proxyCandidate.getFenceAgents()) { supported = supported && options.isAgentSupported(agent.getType()); } return supported; } - private boolean isFencingPolicySupported(VDS vds, Version minimalSupportedVersion) { - return vds.getSupportedClusterVersionsSet().contains(minimalSupportedVersion); + private boolean isFencingPolicySupported(VDS proxyCandidate, Version minimalSupportedVersion) { + return proxyCandidate.getSupportedClusterVersionsSet().contains(minimalSupportedVersion); } - private boolean isHostNetworkUnreacable(VDS vds) { - VdsDynamic vdsDynamic = vds.getDynamicData(); - return (vdsDynamic.getStatus() == VDSStatus.Down - || vdsDynamic.getStatus() == VDSStatus.Reboot - || vdsDynamic.getStatus() == VDSStatus.Kdumping - || vdsDynamic.getStatus() == VDSStatus.NonResponsive - || vdsDynamic.getStatus() == VDSStatus.PendingApproval - || (vdsDynamic.getStatus() == VDSStatus.NonOperational - && vdsDynamic.getNonOperationalReason() == NonOperationalReason.NETWORK_UNREACHABLE)); + private boolean isHostNetworkUnreachable(VDS proxyCandidate) { + return proxyCandidate.getStatus() == VDSStatus.Down + || proxyCandidate.getStatus() == VDSStatus.Reboot + || proxyCandidate.getStatus() == VDSStatus.Kdumping + || proxyCandidate.getStatus() == VDSStatus.NonResponsive + || proxyCandidate.getStatus() == VDSStatus.PendingApproval + || (proxyCandidate.getStatus() == VDSStatus.NonOperational + && proxyCandidate.getNonOperationalReason() == NonOperationalReason.NETWORK_UNREACHABLE); } public FencingPolicy getFencingPolicy() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java index e2858d3..bed654b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java @@ -4,7 +4,7 @@ import java.util.List; import org.ovirt.engine.core.bll.Backend; -import org.ovirt.engine.core.bll.FenceProxyLocator; +import org.ovirt.engine.core.bll.pm.FenceProxyLocator; import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.common.businessentities.FenceAgent; import org.ovirt.engine.core.common.businessentities.VDS; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java index 4a47c9c..5fb7257 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java @@ -15,7 +15,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.bll.FenceProxyLocator; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.FenceAgent; import org.ovirt.engine.core.common.businessentities.FencingPolicy; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/FenceProxyLocatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java similarity index 99% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/FenceProxyLocatorTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java index ceb3f48..ca08b46 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/FenceProxyLocatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.pm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -14,6 +14,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.ovirt.engine.core.bll.DbDependentTestBase; import org.ovirt.engine.core.common.businessentities.FencingPolicy; import org.ovirt.engine.core.common.businessentities.NonOperationalReason; import org.ovirt.engine.core.common.businessentities.VDS; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/FenceValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/FenceValidatorTest.java index b26d7ca..a9277c0 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/FenceValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/FenceValidatorTest.java @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.bll.FenceProxyLocator; +import org.ovirt.engine.core.bll.pm.FenceProxyLocator; import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.common.businessentities.FenceAgent; import org.ovirt.engine.core.common.businessentities.VDS; -- To view, visit https://gerrit.ovirt.org/39763 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9424a1afefde58b6e687eb4a0325a59ce9573950 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
