[Engine-patches] Change in ovirt-engine[master]: gluster: Override CommandBase.getJobMessageProperties

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: gluster: Override CommandBase.getJobMessageProperties
......................................................................

gluster: Override CommandBase.getJobMessageProperties

The patch overrides the basic implementation of getJobMessageProperties
with a concrete one relevant to Gluster commands:
1. Commands inherited from GlusterCommandBase define the Cluster name.
2. Commands inherited from GlusterVolumeCommandBase define Volume name
as well as Cluster name.

Change-Id: I393621e3f52b343b8dc5916f20497a0da3aa3bf1
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
2 files changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/10988/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
index ca705dc..22869c5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
@@ -1,6 +1,7 @@
 package org.ovirt.engine.core.bll.gluster;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -16,6 +17,7 @@
 import org.ovirt.engine.core.common.action.VdcActionType;
 import org.ovirt.engine.core.common.action.VdcReturnValueBase;
 import org.ovirt.engine.core.common.businessentities.VDS;
+import org.ovirt.engine.core.common.businessentities.VDSGroup;
 import org.ovirt.engine.core.common.businessentities.VdsStatic;
 import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
 import org.ovirt.engine.core.common.locks.LockingGroup;
@@ -56,6 +58,18 @@
                 getActionType().getActionGroup()));
     }
 
+    @Override
+    public Map<String, String> getJobMessageProperties() {
+        if (jobProperties == null) {
+            jobProperties = new HashMap<String, String>();
+            VDSGroup vdsGroup = getVdsGroup();
+            jobProperties.put(VdcObjectType.VdsGroups.name().toLowerCase(),
+                    vdsGroup == null ? null : vdsGroup.getname());
+        }
+
+        return jobProperties;
+    }
+
     /**
      * This server is chosen randomly from all the Up servers.
      *
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
index b6016bf..ddbd66c 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.common.VdcObjectType;
@@ -67,6 +68,16 @@
                         getActionType().getActionGroup()));
     }
 
+    @Override
+    public Map<String, String> getJobMessageProperties() {
+        if (jobProperties == null) {
+            jobProperties = super.getJobMessageProperties();
+            
jobProperties.put(VdcObjectType.GlusterVolume.name().toLowerCase(), 
getGlusterVolumeName());
+        }
+
+        return jobProperties;
+    }
+
     protected void updateBrickStatus(GlusterStatus status) {
         for(GlusterBrickEntity brick : getGlusterVolume().getBricks()) {
             getGlusterBrickDao().updateBrickStatus(brick.getId(), status);


--
To view, visit http://gerrit.ovirt.org/10988
To unsubscribe, visit http://gerrit.ovirt.org/settings

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