Changeset 4267 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs

Timestamp:

08/19/10 15:47:46 (14 years ago)

Author:

cneumuel

Message:

renamed all database entities from "Client" to "Slave" (#1157)
made slave-heartbeats synchronous, also they send HBs when timetable disallows them to calculate. they will appear on the server as Idle bis IsAllowedToCalculate will be false (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs (modified) (8 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs

@@ -32 +32 @@
 using HeuristicLab.DataAccess.Interfaces;
 using HeuristicLab.Hive.Server.LINQDataAccess;
-using ClientGroup=HeuristicLab.Hive.Contracts.BusinessObjects.ClientGroupDto;
+using SlaveGroup=HeuristicLab.Hive.Contracts.BusinessObjects.SlaveGroupDto;
 using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
   internal class SlaveManager : ISlaveManager {
-    private List<ClientGroup> clientGroups;
+    private List<SlaveGroup> slaveGroups;
 
     public SlaveManager() {
-      clientGroups = new List<ClientGroup>();
+      slaveGroups = new List<SlaveGroup>();
     }
 
-    #region IClientManager Members
+    #region ISlaveManager Members
 
     /// <summary>
-    /// Returns all clients stored in the database
+    /// Returns all slaves stored in the database
     /// </summary>
     /// <returns></returns>
-    public ResponseList<ClientDto> GetAllSlaves() {
-      ResponseList<ClientDto> response = new ResponseList<ClientDto>();
-      response.List = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
+    public ResponseList<SlaveDto> GetAllSlaves() {
+      ResponseList<SlaveDto> response = new ResponseList<SlaveDto>();
+      response.List = new List<SlaveDto>(DaoLocator.SlaveDao.FindAll());
       return response;
     }
 
     /// <summary>
-    /// returns all client groups stored in the database
+    /// returns all slave groups stored in the database
     /// </summary>
     /// <returns></returns>
-    public ResponseList<ClientGroup> GetAllClientGroups() {
-      ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
+    public ResponseList<SlaveGroup> GetAllSlaveGroups() {
+      ResponseList<SlaveGroup> response = new ResponseList<SlaveGroup>();
 
-      List<ClientGroup> allClientGroups = new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
-      ClientGroup emptyClientGroup = new ClientGroup();
-      IEnumerable<ClientDto> groupLessClients = DaoLocator.ClientDao.FindAllClientsWithoutGroup();
-      if (groupLessClients != null) {
-        foreach (ClientDto currClient in groupLessClients) {
-          emptyClientGroup.Resources.Add(currClient);
+      List<SlaveGroup> allSlaveGroups = new List<SlaveGroup>(DaoLocator.SlaveGroupDao.FindAllWithSubGroupsAndSlaves());
+      SlaveGroup emptySlaveGroup = new SlaveGroup();
+      IEnumerable<SlaveDto> groupLessSlaves = DaoLocator.SlaveDao.FindAllSlavesWithoutGroup();
+      if (groupLessSlaves != null) {
+        foreach (SlaveDto currSlave in groupLessSlaves) {
+          emptySlaveGroup.Resources.Add(currSlave);
         }
       }
-      emptyClientGroup.Id = Guid.Empty;
-      allClientGroups.Add(emptyClientGroup);
+      emptySlaveGroup.Id = Guid.Empty;
+      allSlaveGroups.Add(emptySlaveGroup);
 
-      response.List = allClientGroups;
+      response.List = allSlaveGroups;
 
       return response;
@@ -86 +86 @@
 
     /// <summary>
-    /// Add a client group into the database
+    /// Add a slave group into the database
     /// </summary>
-    /// <param name="clientGroup"></param>
+    /// <param name="slaveGroup"></param>
     /// <returns></returns>
-    public ResponseObject<ClientGroup> AddClientGroup(ClientGroup clientGroup) {
-      ResponseObject<ClientGroup> response = new ResponseObject<ClientGroup>();
+    public ResponseObject<SlaveGroup> AddSlaveGroup(SlaveGroup slaveGroup) {
+      ResponseObject<SlaveGroup> response = new ResponseObject<SlaveGroup>();
 
-      if (clientGroup.Id != Guid.Empty) {
+      if (slaveGroup.Id != Guid.Empty) {
         //response.Success = false;
-        response.StatusMessage = ResponseStatus.AddClientGroup_SlaveIdMustNotBeSet;
+        response.StatusMessage = ResponseStatus.AddSlaveGroup_SlaveIdMustNotBeSet;
       }
       else {
-        clientGroup = DaoLocator.ClientGroupDao.Insert(clientGroup);
-        //clientGroupAdapter.Update(clientGroup);
-        response.Obj = clientGroup;
+        slaveGroup = DaoLocator.SlaveGroupDao.Insert(slaveGroup);
+        //slaveGroupAdapter.Update(slaveGroup);
+        response.Obj = slaveGroup;
       }
 
@@ -109 +109 @@
     ///  Add a resource to a group
     /// </summary>
-    /// <param name="clientGroupId"></param>
+    /// <param name="slaveGroupId"></param>
     /// <param name="resource"></param>
     /// <returns></returns>
-    public Response AddResourceToGroup(Guid clientGroupId, ResourceDto resource) {
+    public Response AddResourceToGroup(Guid slaveGroupId, ResourceDto resource) {
       Response response = new Response();
 
-      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-      if (clientGroup == null) {
+      SlaveGroup slaveGroup = DaoLocator.SlaveGroupDao.FindById(slaveGroupId);
+      if (slaveGroup == null) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
@@ -122 +122 @@
       }
 
-      clientGroup.Resources.Add(resource);
-      DaoLocator.ClientGroupDao.AddRessourceToClientGroup(resource.Id, clientGroup.Id);
+      slaveGroup.Resources.Add(resource);
+      DaoLocator.SlaveGroupDao.AddRessourceToSlaveGroup(resource.Id, slaveGroup.Id);
 
-      //If our resource is in fact a client => set the callendar from the resource as current one.
+      //If our resource is in fact a slave => set the callendar from the resource as current one.
       
-      ClientDto dbr = DaoLocator.ClientDao.FindById(resource.Id);
+      SlaveDto dbr = DaoLocator.SlaveDao.FindById(resource.Id);
       if(dbr != null) {
-        DaoLocator.ClientDao.SetServerSideCalendar(dbr, clientGroup.Id);  
+        DaoLocator.SlaveDao.SetServerSideCalendar(dbr, slaveGroup.Id);  
       }
 
@@ -138 +138 @@
     /// Remove a resource from a group
     /// </summary>
-    /// <param name="clientGroupId"></param>
+    /// <param name="slaveGroupId"></param>
     /// <param name="resourceId"></param>
     /// <returns></returns>
-    public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
+    public Response DeleteResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
       Response response = new Response();
 
-      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-      if (clientGroup == null) {
+      SlaveGroup slaveGroup = DaoLocator.SlaveGroupDao.FindById(slaveGroupId);
+      if (slaveGroup == null) {
         // response.Success = false;
         response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
@@ -151 +151 @@
       }
      
-      DaoLocator.ClientGroupDao.RemoveRessourceFromClientGroup(resourceId, clientGroup.Id);
+      DaoLocator.SlaveGroupDao.RemoveRessourceFromSlaveGroup(resourceId, slaveGroup.Id);
       return response;                
     }
 
-    public ResponseObject<ClientGroupDtoList> GetAllGroupsOfResource(Guid resourceId) {
-      ResponseObject<ClientGroupDtoList> response = new ResponseObject<ClientGroupDtoList>();
+    public ResponseObject<SlaveGroupDtoList> GetAllGroupsOfResource(Guid resourceId) {
+      ResponseObject<SlaveGroupDtoList> response = new ResponseObject<SlaveGroupDtoList>();
 
-      ClientDto client = DaoLocator.ClientDao.FindById(resourceId);
-      if (client != null) {
-        ClientGroupDtoList groupsOfClient = new ClientGroupDtoList(DaoLocator.ClientGroupDao.MemberOf(client));
-        response.Obj = groupsOfClient;
+      SlaveDto slave = DaoLocator.SlaveDao.FindById(resourceId);
+      if (slave != null) {
+        SlaveGroupDtoList groupsOfSlave = new SlaveGroupDtoList(DaoLocator.SlaveGroupDao.MemberOf(slave));
+        response.Obj = groupsOfSlave;
       } else {
-        response.Obj = new ClientGroupDtoList();
+        response.Obj = new SlaveGroupDtoList();
         //response.Success = false;
         response.StatusMessage = ResponseStatus.GetAllGroupsOfResource_ResourceNotFound;
@@ -171 +171 @@
     }
 
-    public Response DeleteClientGroup(Guid clientGroupId) {
+    public Response DeleteSlaveGroup(Guid slaveGroupId) {
       Response response = new Response();
 
-      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-      if (clientGroup == null) {
-        response.StatusMessage = ResponseStatus.DeleteClientGroup_SlaveGroupDoesNotExist;
+      SlaveGroup slaveGroup = DaoLocator.SlaveGroupDao.FindById(slaveGroupId);
+      if (slaveGroup == null) {
+        response.StatusMessage = ResponseStatus.DeleteSlaveGroup_SlaveGroupDoesNotExist;
         return response;
       }
 
-      DaoLocator.ClientGroupDao.Delete(clientGroup);
+      DaoLocator.SlaveGroupDao.Delete(slaveGroup);
       return response;
     }
@@ -192 +192 @@
     public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments, bool isForced) {
       DaoLocator.UptimeCalendarDao.SetUptimeCalendarForResource(guid, appointments);
-      DaoLocator.UptimeCalendarDao.NotifyClientsOfNewCalendar(guid, isForced);
+      DaoLocator.UptimeCalendarDao.NotifySlavesOfNewCalendar(guid, isForced);
       return new Response();
     }