Moti Asayag has uploaded a new change for review.
Change subject: engine: Avoid instantiating AuditLogDirector
......................................................................
engine: Avoid instantiating AuditLogDirector
The AuditLogDirector instance can be passed as argument to the
c'tor which simplifies the instantiation and so the testing.
Change-Id: I47a08f849300eb9bae8acbe32798ca539b078d24
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, 22 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/40941/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 9512348b..f81755f 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
@@ -60,19 +60,22 @@
private Map<String, InterfaceStatus> oldInterfaceStatus = new
HashMap<String, InterfaceStatus>();
private final ResourceManager resourceManager;
private final DbFacade dbFacade;
+ private final AuditLogDirector auditLogDirector;
private static final Logger log =
LoggerFactory.getLogger(HostMonitoring.class);
public HostMonitoring(VdsManager vdsManager,
VDS vds,
MonitoringStrategy monitoringStrategy,
ResourceManager resourceManager,
- DbFacade dbFacade) {
+ DbFacade dbFacade,
+ AuditLogDirector auditLogDirector) {
this.vdsManager = vdsManager;
this.vds = vds;
firstStatus = vds.getStatus();
this.monitoringStrategy = monitoringStrategy;
this.resourceManager = resourceManager;
this.dbFacade = dbFacade;
+ this.auditLogDirector = auditLogDirector;
}
public void refresh() {
@@ -765,8 +768,8 @@
}
}
- protected void auditLog(AuditLogableBase auditLogable, AuditLogType
logType) {
- new AuditLogDirector().log(auditLogable, logType);
+ private void auditLog(AuditLogableBase auditLogable, AuditLogType logType)
{
+ auditLogDirector.log(auditLogable, logType);
}
private DbFacade getDbFacade() {
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 fdc1198..71b365a 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
@@ -207,7 +207,12 @@
if (isMonitoringNeeded()) {
setStartTime();
hostMonitoring =
- new HostMonitoring(this, cachedVds,
monitoringStrategy, resourceManager, dbFacade);
+ new HostMonitoring(this,
+ cachedVds,
+ monitoringStrategy,
+ resourceManager,
+ dbFacade,
+ auditLogDirector);
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 d878c26..4181a04 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
@@ -13,8 +13,6 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.businessentities.AuditLog;
import org.ovirt.engine.core.common.businessentities.IVdsEventListener;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
@@ -26,8 +24,7 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
-import org.ovirt.engine.core.dao.AuditLogDAO;
+import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dao.VdsGroupDAO;
import org.ovirt.engine.core.dao.network.InterfaceDao;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -67,35 +64,31 @@
DbFacade dbFacade;
@Mock
VDSGroup cluster;
- AuditLogDAO mockAuditLogDao = new AuditLogDaoMocker();
@Mock
ResourceManager resourceManager;
@Mock
private VdsManager vdsManager;
@Mock
private IVdsEventListener vdsEventlistener;
+ @Mock
+ private AuditLogDirector auditLogDirector;
@Before
public void setup() {
initVds();
initConditions();
when(vdsManager.getRefreshStatistics()).thenReturn(false);
- updater = Mockito.spy(
- new HostMonitoring(vdsManager, vds,
mock(MonitoringStrategy.class), resourceManager, dbFacade) {
-
- @Override
- protected void auditLog(AuditLogableBase auditLogable,
AuditLogType logType) {
- AuditLog al = new AuditLog();
- al.setLogType(logType);
- mockAuditLogDao.save(al);
- }
-
- });
+ updater =
+ Mockito.spy(new HostMonitoring(vdsManager,
+ vds,
+ mock(MonitoringStrategy.class),
+ resourceManager,
+ dbFacade,
+ auditLogDirector));
}
private void initConditions() {
when(dbFacade.getVdsGroupDao()).thenReturn(groupDAO);
- when(dbFacade.getAuditLogDao()).thenReturn(mockAuditLogDao);
when(groupDAO.get((Guid) any())).thenReturn(cluster);
when(dbFacade.getInterfaceDao()).thenReturn(interfaceDao);
when(interfaceDao.getAllInterfacesForVds(((Guid)
any()))).thenReturn(Collections.<VdsNetworkInterface>emptyList());
--
To view, visit https://gerrit.ovirt.org/40941
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47a08f849300eb9bae8acbe32798ca539b078d24
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
