[Engine-patches] Change in ovirt-engine[master]: engine: Fix unknown session status

[anbabu]

anmolbabu has uploaded a new change for review.

Change subject: engine: Fix unknown session status
......................................................................

engine: Fix unknown session status

The session details parsed in GlusterVolumeGeoRepStatusDetailForXmlRpc
was not stored in sessionDetails instance but stored only in session
of its base class. Hence, this fix now returns the base class
session's session details.

Change-Id: I299ecbf2d66dc990acff8db1def250f615cc6279
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/39869/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
index e9a0e2d..74df2fc 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java
@@ -1,7 +1,7 @@
 package org.ovirt.engine.core.common.businessentities.gluster;
 
 public enum GeoRepSessionStatus {
-    INITIALIZING("INITIALIZING"),
+    INITIALIZING("INITIALIZING..."),
     NOTSTARTED("NOT STARTED"),
     ACTIVE("ACTIVE"),
     PASSIVE("PASSIVE"),
@@ -21,6 +21,9 @@
     }
 
     public static GeoRepSessionStatus from(String status) {
+        if (status.contains(GeoRepSessionStatus.PAUSED.value())) {
+            return GeoRepSessionStatus.PAUSED;
+        }
         for (GeoRepSessionStatus sessionStatus : values()) {
             if (sessionStatus.value().equalsIgnoreCase(status)) {
                 return sessionStatus;
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java
index c041ca9..88a7eae 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java
@@ -51,7 +51,7 @@
     }
 
     public List<GlusterGeoRepSessionDetails> getGeoRepDetails() {
-        return geoRepDetails;
+        return super.getGeoRepSessions().get(0).getSessionDetails();
     }
 
     @Override


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

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