[Engine-patches] Change in ovirt-engine[master]: engine: Avoid static access to DbFacade from HostMonitoring

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Avoid static access to DbFacade from HostMonitoring
......................................................................

engine: Avoid static access to DbFacade from HostMonitoring

Change-Id: I6c412c0a2d8ffa7a5aa63bf4faee8d8eef81c8e4
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, 9 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/40940/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 7136282..9512348b 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
@@ -59,17 +59,20 @@
     private boolean vdsMaintenanceTimeoutOccurred;
     private Map<String, InterfaceStatus> oldInterfaceStatus = new 
HashMap<String, InterfaceStatus>();
     private final ResourceManager resourceManager;
+    private final DbFacade dbFacade;
     private static final Logger log = 
LoggerFactory.getLogger(HostMonitoring.class);
 
     public HostMonitoring(VdsManager vdsManager,
             VDS vds,
             MonitoringStrategy monitoringStrategy,
-            ResourceManager resourceManager) {
+            ResourceManager resourceManager,
+            DbFacade dbFacade) {
         this.vdsManager = vdsManager;
         this.vds = vds;
         firstStatus = vds.getStatus();
         this.monitoringStrategy = monitoringStrategy;
         this.resourceManager = resourceManager;
+        this.dbFacade = dbFacade;
     }
 
     public void refresh() {
@@ -766,7 +769,7 @@
         new AuditLogDirector().log(auditLogable, logType);
     }
 
-    public DbFacade getDbFacade() {
-        return DbFacade.getInstance();
+    private DbFacade getDbFacade() {
+        return dbFacade;
     }
 }
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 462e2ed..fdc1198 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
@@ -206,7 +206,8 @@
                         }
                         if (isMonitoringNeeded()) {
                             setStartTime();
-                            hostMonitoring = new HostMonitoring(this, 
cachedVds, monitoringStrategy, resourceManager);
+                            hostMonitoring =
+                                    new HostMonitoring(this, cachedVds, 
monitoringStrategy, resourceManager, dbFacade);
                             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 d0396b7..d878c26 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,12 +81,7 @@
         initConditions();
         when(vdsManager.getRefreshStatistics()).thenReturn(false);
         updater = Mockito.spy(
-                new HostMonitoring(vdsManager, vds, 
mock(MonitoringStrategy.class), resourceManager) {
-
-            @Override
-            public DbFacade getDbFacade() {
-                return dbFacade;
-            }
+                new HostMonitoring(vdsManager, vds, 
mock(MonitoringStrategy.class), resourceManager, dbFacade) {
 
             @Override
             protected void auditLog(AuditLogableBase auditLogable, 
AuditLogType logType) {


-- 
To view, visit https://gerrit.ovirt.org/40940
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c412c0a2d8ffa7a5aa63bf4faee8d8eef81c8e4
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