Changeset 6000 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

Timestamp:

04/11/11 15:32:27 (13 years ago)

Author:

cneumuel

Message:

#1233

• added GetPlugin service method
• fixed minor issues with double plugins in database
• worked on HiveEngine
• fixed wrong role name for Hive User
• fixed bug in group assignment of slaves

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -250 +250 @@
           dao.AddSlave(slaveInfo);
         } else {
-          dao.UpdateSlave(slaveInfo);
+          var dbSlave = dao.GetSlave(slaveInfo.Id);
+
+          dbSlave.Name = slaveInfo.Name;
+          dbSlave.Description = slaveInfo.Description;
+
+          dbSlave.Cores = slaveInfo.Cores;
+          dbSlave.CpuArchitecture = slaveInfo.CpuArchitecture;
+          dbSlave.CpuSpeed = slaveInfo.CpuSpeed;
+          dbSlave.FreeCores = slaveInfo.FreeCores;
+          dbSlave.FreeMemory = slaveInfo.FreeMemory;
+          dbSlave.Memory = slaveInfo.Memory;
+          dbSlave.OperatingSystem = slaveInfo.OperatingSystem;
+          
+          dbSlave.LastHeartbeat = DateTime.Now;          
+          dbSlave.SlaveState = SlaveState.Idle;
+
+          // don't update those properties:
+          // dbSlave.IsAllowedToCalculate = slaveInfo.IsAllowedToCalculate; 
+          // dbSlave.ParentResourceId = slaveInfo.ParentResourceId;
+
+          dao.UpdateSlave(dbSlave);
         }
       });
@@ -282 +302 @@
         plugin.UserId = auth.UserId;
         plugin.DateCreated = DateTime.Now;
+        if (!plugin.IsLocal) {
+          var existing = dao.GetPlugins(x => x.Name == plugin.Name && x.Version == plugin.Version.ToString() && !x.IsLocal);
+          if (existing.Count() > 0) {
+            // a plugin with the same name and version already exists.
+            throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
+          }
+        }
         Guid pluginId = dao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
@@ -289 +316 @@
         return pluginId;
       });
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public Plugin GetPlugin(Guid pluginId) {
+      return dao.GetPlugin(pluginId);
     }