Sahina Bose has uploaded a new change for review. Change subject: engine: Change to geo-replication entities ......................................................................
engine: Change to geo-replication entities Added a collection of GeoRepSessionDetail objects to GeoRepSession and introduced volumeName as a property GeoRepSessionDetail is not a business entity on its own. So changed the interface implemented Change-Id: I5367f24dd677b8628d90459b4ba8115c665bfde7 Bug-Url: https://bugzilla.redhat.com/1125845 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepSessionStatus.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java 4 files changed, 80 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/39340/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java index 35a6c83..12a39fa 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java @@ -4,5 +4,29 @@ CHANGELOG_CRAWL, UNKNOWN, + NOT_APPLICABLE("N/A"), HYBRID_CRAWL; + + private String statusMsg; + + private GeoRepCrawlStatus(String status) { + statusMsg = status; + } + + private GeoRepCrawlStatus() { + statusMsg = this.name(); + } + + public String value() { + return statusMsg; + } + + public static GeoRepCrawlStatus from(String status) { + for (GeoRepCrawlStatus crawlStatus : values()) { + if (crawlStatus.value().equalsIgnoreCase(status)) { + return crawlStatus; + } + } + return GeoRepCrawlStatus.UNKNOWN; + } } 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 335b35c..d8676e0 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,12 +1,30 @@ package org.ovirt.engine.core.common.businessentities.gluster; public enum GeoRepSessionStatus { - INITIALIZING, - NOTSTARTED, - ACTIVE, - PASSIVE, - STOPPED, - PARTIAL_FAULTY, - UNKNOWN, - FAULTY; + INITIALIZING("INITIALIZING"), + NOTSTARTED("NOT STARTED"), + ACTIVE("ACTIVE"), + PASSIVE("PASSIVE"), + STOPPED("STOPPED"), + PARTIAL_FAULTY("PARTIAL FAULTY"), + UNKNOWN("UNKNOWN"), + FAULTY("FAULTY"); + + private String statusMsg; + + private GeoRepSessionStatus(String status) { + statusMsg = status; + } + public String value() { + return statusMsg; + } + + public static GeoRepSessionStatus from(String status) { + for (GeoRepSessionStatus sessionStatus : values()) { + if (sessionStatus.value().equalsIgnoreCase(status)) { + return sessionStatus; + } + } + return GeoRepSessionStatus.UNKNOWN; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java index 266d764..acdb6d4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.common.businessentities.gluster; +import java.util.ArrayList; + import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; import org.ovirt.engine.core.common.utils.ObjectUtils; @@ -10,6 +12,7 @@ private static final long serialVersionUID = 1L; private Guid masterVolumeId; + private String masterVolumeName; private String sessionKey; private String slaveHostName; private Guid slaveNodeUuid; @@ -17,6 +20,7 @@ private Guid sessionId; private Guid slaveVolumeId; private GeoRepSessionStatus status; + private ArrayList<GlusterGeoRepSessionDetails> sessionDetails; public Guid getMasterVolumeId() { return masterVolumeId; @@ -24,6 +28,14 @@ public void setMasterVolumeId(Guid masterVolumeId) { this.masterVolumeId = masterVolumeId; + } + + public String getMasterVolumeName() { + return masterVolumeName; + } + + public void setMasterVolumeName(String masterVolumeName) { + this.masterVolumeName = masterVolumeName; } public String getSessionKey() { @@ -86,6 +98,19 @@ this.sessionId = id; } + public ArrayList<GlusterGeoRepSessionDetails> getSessionDetails() { + return sessionDetails; + } + + public void setSessionDetails(ArrayList<GlusterGeoRepSessionDetails> sessionDetails) { + this.sessionDetails = sessionDetails; + } + + @Override + public Object getQueryableId() { + return sessionId; + } + @Override public int hashCode() { final int prime = 31; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java index f43da07..d714388 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java @@ -1,12 +1,12 @@ package org.ovirt.engine.core.common.businessentities.gluster; +import java.io.Serializable; import java.util.Date; -import org.ovirt.engine.core.common.businessentities.BusinessEntity; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.compat.Guid; -public class GlusterGeoRepSessionDetails implements BusinessEntity<Guid>{ +public class GlusterGeoRepSessionDetails implements Serializable{ private static final long serialVersionUID = -8084667500866439692L; @@ -120,13 +120,11 @@ this.filesSkipped = filesSkipped; } - @Override - public Guid getId() { + public Guid getSessionId() { return sessionId; } - @Override - public void setId(Guid id) { + public void setSessionId(Guid id) { this.sessionId = id; } @@ -134,7 +132,7 @@ public boolean equals(Object obj) { return (obj != null) && (obj instanceof GlusterGeoRepSessionDetails) && - ObjectUtils.objectsEqual(getId(), ((GlusterGeoRepSessionDetails) obj).getId()) && + ObjectUtils.objectsEqual(getSessionId(), ((GlusterGeoRepSessionDetails) obj).getSessionId()) && ObjectUtils.objectsEqual(getMasterBrickId(), ((GlusterGeoRepSessionDetails) obj).getMasterBrickId()) && ObjectUtils.objectsEqual(getSlaveNodeUuid(), ((GlusterGeoRepSessionDetails) obj).getSlaveNodeUuid()) && ObjectUtils.objectsEqual(getSlaveHostName(), ((GlusterGeoRepSessionDetails) obj).getSlaveHostName()) && -- To view, visit https://gerrit.ovirt.org/39340 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5367f24dd677b8628d90459b4ba8115c665bfde7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
