[Engine-patches] Change in ovirt-engine[master]: gluster: populate service name in ServerServiceDAO

[sanjal]

Shireesh Anjal has uploaded a new change for review.

Change subject: gluster: populate service name in ServerServiceDAO
......................................................................

gluster: populate service name in ServerServiceDAO

Modified GlusterServerServiceRowMapper in the DAO to populate service
name as well by fetching it from gluster_services table. Also updated
the test case to verify this.

Change-Id: I6a4706aae779e73b4aae7ca5810fe998559f62a4
Signed-off-by: Shireesh Anjal <anjalshire...@gmail.com>
---
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/14608/1

diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
index ee54af1..b75e9a4 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java
@@ -5,9 +5,11 @@
 import java.util.List;
 
 import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterServerService;
+import org.ovirt.engine.core.common.businessentities.gluster.GlusterService;
 import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterServiceStatus;
 import org.ovirt.engine.core.common.utils.EnumUtils;
 import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
@@ -72,10 +74,16 @@
             entity.setId(Guid.createGuidFromString(rs.getString("id")));
             
entity.setServerId(Guid.createGuidFromString(rs.getString("server_id")));
             
entity.setServiceId(Guid.createGuidFromString(rs.getString("service_id")));
+            entity.setServiceName(getServiceName(entity.getServiceId()));
             entity.setMessage(rs.getString("message"));
             entity.setPid(rs.getInt("pid"));
             
entity.setStatus(GlusterServiceStatus.valueOf(rs.getString("status")));
             return entity;
         }
+
+        private String getServiceName(Guid serviceId) {
+            GlusterService service = 
DbFacade.getInstance().getGlusterServiceDao().get(serviceId);
+            return service != null ? service.getServiceName() : null;
+        }
     }
 }
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
index 4d0db5f..95d6343 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoTest.java
@@ -24,7 +24,9 @@
     private static final String SERVER2_ID = 
"2001751e-549b-4e7a-aff6-32d36856c125";
     private static final String CLUSTER_ID = 
"ae956031-6be2-43d6-bb8f-5191c9253314";
     private static final String SERVICE1_ID = 
"c83c9ee3-b7d8-4709-ae4b-5d86a152e6b1";
+    private static final String SERVICE1_NAME = "gluster-swift-test-1";
     private static final String SERVICE2_ID = 
"fc00df54-4fcd-4495-8756-b217780bdad7";
+    private static final String SERVICE2_NAME = "gluster-test";
     private static final String SERVER1_SERVICE_ID = 
"c77b4d6a-a2c9-4c9f-a873-3dbff8a34720";
     private static final Integer PID_1 = 11111;
     private static final Integer PID_2 = 22222;
@@ -119,12 +121,14 @@
 
     private void verifyServiceOnServer2(GlusterServerService service) {
         assertEquals(SERVICE2_ID, service.getServiceId().toString());
+        assertEquals(SERVICE2_NAME, service.getServiceName());
         assertEquals(PID_2, service.getPid());
         assertEquals(GlusterServiceStatus.STOPPED, service.getStatus());
     }
 
     private void verifyServiceOnServer1(GlusterServerService service) {
         assertEquals(SERVICE1_ID, service.getServiceId().toString());
+        assertEquals(SERVICE1_NAME, service.getServiceName());
         assertEquals(PID_1, service.getPid());
         assertEquals(GlusterServiceStatus.RUNNING, service.getStatus());
     }


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

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