[Engine-patches] Change in ovirt-engine[master]: core: add ctor to VmInternalData (2)

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: add ctor to VmInternalData (2)
......................................................................

core: add ctor to VmInternalData (2)

Add constructor that gets VmDynamic and VmStatistics

Change-Id: I8233a7de380c3831eda232f0a55c3373dc03b0bb
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/entities/VmInternalData.java
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/42463/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
index 32fb95b..de3dcbb 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
@@ -4,7 +4,6 @@
 import static 
org.ovirt.engine.core.vdsbroker.vdsbroker.VdsBrokerObjectsBuilder.convertToVmStatus;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -13,7 +12,6 @@
 import org.ovirt.engine.core.common.businessentities.VmDynamic;
 import org.ovirt.engine.core.common.businessentities.VmExitReason;
 import org.ovirt.engine.core.common.businessentities.VmExitStatus;
-import org.ovirt.engine.core.common.businessentities.storage.LUNs;
 import org.ovirt.engine.core.common.utils.Pair;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -129,7 +127,7 @@
                     vmDynamic.setExitReason(VmExitReason.Unknown);
                 }
 
-                return new VmInternalData(vmDynamic, dbVm.getStatisticsData(), 
null, new HashMap<String, LUNs>());
+                return new VmInternalData(vmDynamic, dbVm.getStatisticsData());
             }
 
             private Double parseDouble(Object value) {
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/entities/VmInternalData.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/entities/VmInternalData.java
index f4b16ab..95b8f1e 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/entities/VmInternalData.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/entities/VmInternalData.java
@@ -1,5 +1,6 @@
 package org.ovirt.engine.core.vdsbroker.vdsbroker.entities;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,10 @@
         this(vmDynamic, null, null, null);
     }
 
+    public VmInternalData(VmDynamic vmDynamic, VmStatistics vmStatistics) {
+        this(vmDynamic, vmStatistics, null, Collections.<String, 
LUNs>emptyMap());
+    }
+
     public VmInternalData(VmDynamic vmDynamic,
             VmStatistics vmStatistics,
             List<VmGuestAgentInterface> vmGuestAgentInterfaces,


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8233a7de380c3831eda232f0a55c3373dc03b0bb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches