Moti Asayag has uploaded a new change for review.
Change subject: engine: Avoid static access to ResourceManager from
HostMonitoring
......................................................................
engine: Avoid static access to ResourceManager from HostMonitoring
This allow to mock the ResourceManager easily in tests
and avoids the use of deprecated functionality.
Change-Id: I38e3e08c5d502ce4139df2a2f7c46ff0d0503378
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/HostMonitoringTest.java
3 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/40937/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
index a150ea1..7136282 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java
@@ -46,7 +46,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@SuppressWarnings({ "synthetic-access", "unchecked", "rawtypes" })
public class HostMonitoring {
private final VDS vds;
private final VdsManager vdsManager;
@@ -59,14 +58,18 @@
private static Map<Guid, Long> hostDownTimes = new HashMap<>();
private boolean vdsMaintenanceTimeoutOccurred;
private Map<String, InterfaceStatus> oldInterfaceStatus = new
HashMap<String, InterfaceStatus>();
-
+ private final ResourceManager resourceManager;
private static final Logger log =
LoggerFactory.getLogger(HostMonitoring.class);
- public HostMonitoring(VdsManager vdsManager, VDS vds, MonitoringStrategy
monitoringStrategy) {
+ public HostMonitoring(VdsManager vdsManager,
+ VDS vds,
+ MonitoringStrategy monitoringStrategy,
+ ResourceManager resourceManager) {
this.vdsManager = vdsManager;
this.vds = vds;
firstStatus = vds.getStatus();
this.monitoringStrategy = monitoringStrategy;
+ this.resourceManager = resourceManager;
}
public void refresh() {
@@ -130,7 +133,7 @@
vds.getVdsGroupName(), cce.getMessage());
log.debug("Exception", cce);
if (vds.getStatus() != VDSStatus.PreparingForMaintenance &&
vds.getStatus() != VDSStatus.Maintenance) {
-
ResourceManager.getInstance().runVdsCommand(VDSCommandType.SetVdsStatus,
+ resourceManager.runVdsCommand(VDSCommandType.SetVdsStatus,
new SetVdsStatusVDSCommandParameters(vds.getId(),
VDSStatus.Error));
}
} catch (Throwable t) {
@@ -388,7 +391,7 @@
}
protected IVdsEventListener getVdsEventListener() {
- return getResourceManager().getEventListener();
+ return resourceManager.getEventListener();
}
public void afterRefreshTreatment() {
@@ -457,7 +460,7 @@
}
// get statistics data, images checks and vm_count data (dynamic)
fetchHostInterfaces();
- VDSReturnValue statsReturnValue =
getResourceManager().runVdsCommand(VDSCommandType.GetStats,
+ VDSReturnValue statsReturnValue =
resourceManager.runVdsCommand(VDSCommandType.GetStats,
new VdsIdAndVdsVDSCommandParametersBase(vds));
getVdsEventListener().updateSchedulingStats(vds);
if (!statsReturnValue.getSucceeded()
@@ -765,9 +768,5 @@
public DbFacade getDbFacade() {
return DbFacade.getInstance();
- }
-
- public ResourceManager getResourceManager() {
- return ResourceManager.getInstance();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 75c1940..6328b2a 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -204,7 +204,7 @@
}
if (isMonitoringNeeded()) {
setStartTime();
- hostMonitoring = new HostMonitoring(this,
cachedVds, monitoringStrategy);
+ hostMonitoring = new HostMonitoring(this,
cachedVds, monitoringStrategy, resourceManager);
hostMonitoring.refresh();
mUnrespondedAttempts.set(0);
setLastUpdate();
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/HostMonitoringTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/HostMonitoringTest.java
index 99c313b..d0396b7 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/HostMonitoringTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/HostMonitoringTest.java
@@ -81,7 +81,7 @@
initConditions();
when(vdsManager.getRefreshStatistics()).thenReturn(false);
updater = Mockito.spy(
- new HostMonitoring(vdsManager, vds,
mock(MonitoringStrategy.class)) {
+ new HostMonitoring(vdsManager, vds,
mock(MonitoringStrategy.class), resourceManager) {
@Override
public DbFacade getDbFacade() {
@@ -120,7 +120,6 @@
VDSReturnValue value = new VDSReturnValue();
value.setSucceeded(false);
value.setExceptionObject(new VDSNetworkException("unknown host"));
- when(updater.getResourceManager()).thenReturn(resourceManager);
when(updater.getVdsEventListener()).thenReturn(vdsEventlistener);
when(resourceManager.runVdsCommand(any(VDSCommandType.class),
any(VDSParametersBase.class))).thenReturn(value);
--
To view, visit https://gerrit.ovirt.org/40937
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38e3e08c5d502ce4139df2a2f7c46ff0d0503378
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
