[Engine-patches] Change in ovirt-engine[master]: core: cleanup in EventVmStatsRefresher

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: cleanup in EventVmStatsRefresher
......................................................................

core: cleanup in EventVmStatsRefresher

1. The VM that is being created in createVmInternalData is based on the
VM from the DB, so no need to set its id.

2. The status field was set twice, removed one.

3. No need to keep backward compatibility with previous versions of VDSM
when using events, thus not set 'unknown' reason state as default.

Change-Id: I8d829cda50428e2f6f2d74ae3aaa7ec83978476d
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/EventVMStatsRefresher.java
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/42465/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 d82c24a..9041d8c 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
@@ -99,8 +99,6 @@
 
             private VmInternalData createVmInternalData(VM dbVm, Map<String, 
Object> xmlRpcStruct, Double notifyTime) {
                 VmDynamic vmDynamic = new VmDynamic(dbVm.getDynamicData());
-                vmDynamic.setId(dbVm.getId());
-                vmDynamic.setStatus(convertToVmStatus((String) 
xmlRpcStruct.get(VdsProperties.status)));
 
                 if (xmlRpcStruct.containsKey(VdsProperties.status)) {
                     vmDynamic.setStatus(convertToVmStatus((String) 
xmlRpcStruct.get(VdsProperties.status)));
@@ -114,15 +112,15 @@
                     String exitCodeStr = 
xmlRpcStruct.get(VdsProperties.exit_code).toString();
                     
vmDynamic.setExitStatus(VmExitStatus.forValue(Integer.parseInt(exitCodeStr)));
                 }
+
                 if (xmlRpcStruct.containsKey(VdsProperties.exit_message)) {
                     String exitMsg = (String) 
xmlRpcStruct.get(VdsProperties.exit_message);
                     vmDynamic.setExitMessage(exitMsg);
                 }
+
                 if (xmlRpcStruct.containsKey(VdsProperties.exit_reason)) {
                     String exitReasonStr = 
xmlRpcStruct.get(VdsProperties.exit_reason).toString();
                     
vmDynamic.setExitReason(VmExitReason.forValue(Integer.parseInt(exitReasonStr)));
-                } else {
-                    vmDynamic.setExitReason(VmExitReason.Unknown);
                 }
 
                 return new VmInternalData(vmDynamic, dbVm.getStatisticsData(), 
notifyTime);


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

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