Changeset 4368 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Timestamp:

09/07/10 10:22:27 (14 years ago)

Author:

cneumuel

Message:

• created HiveClient which shows an overview over all submitted HiveExperiments
• its possible to download all submitted HiveExperiments including results
• Experiments are now sent as a whole to the Hive and the Hive-Slaves take care of creating child-jobs (if necessary). The parent job is then paused and will be reactivated when all child-jobs are finished
• WcfService-Clients are now consistently managed by WcfServicePool which allows to use IDisposable-Pattern and always keeps exactly one proxy-object until all callers disposed them.
• created ProgressView which is able to lock a View and display progress of an action. It also allows to simulate progress if no progress-information is available so that users don't get too nervous while waiting.

Location:

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Files:

• ClientFacade.cs (modified) (2 diffs)
• ServerConsoleFacade.cs (modified) (4 diffs)
• SlaveFacade.cs (modified) (4 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs

@@ -69 +69 @@
     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
-    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
+    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId) {
       using (contextFactory.GetContext(false)) {
         ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
-        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
+        return jobManager.GetLastSerializedResult(jobId);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public ResponseObject<SerializedJob> GetSnapshotResult(Guid jobId) {
+      using (contextFactory.GetContext(false)) {
+        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        return jobManager.GetSnapshotResult(jobId);
       }
     }
@@ -103 +112 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public ResponseObject<JobResultList> GetChildJobResults(Guid? parentJobId, bool recursive, bool includeParent) {
+      using (contextFactory.GetContext(false)) {
+        if (parentJobId.HasValue) {
+          ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(parentJobId.Value);
+        } 
+        // If parentJobId is null, GetChildJobResults will filter the results for the current user
+        return jobManager.GetChildJobResults(parentJobId, recursive, includeParent);
+      }
+    }
     #endregion
+
+
   }
 }

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -32 +32 @@
 using HeuristicLab.Hive.Contracts.ResponseObjects;
 using System.Security.Permissions;
+using HeuristicLab.Hive.JobBase;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -46 +47 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     public Response Login() {
       Response resp = new Response();
@@ -129 +131 @@
 
     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
-    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
-      using (contextFactory.GetContext(false)) {
-        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
+    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId) {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetLastSerializedResult(jobId);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    public ResponseObject<SerializedJob> GetSnapshotResult(Guid jobId) {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetSnapshotResult(jobId);
       }
     }
@@ -223 +232 @@
       using (contextFactory.GetContext()) {
         return jobManager.AddJobWithGroupStrings(job, resources);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    public ResponseObject<JobResultList> GetChildJobResults(Guid? parentJobId, bool recursive, bool includeParent) {
+      using (contextFactory.GetContext()) {
+        return jobManager.GetChildJobResults(parentJobId, recursive, includeParent);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    public ResponseObject<JobDto> AddChildJob(Guid parentJobId, SerializedJob serializedJob) {
+      using (contextFactory.GetContext()) {
+        return jobManager.AddChildJob(parentJobId, serializedJob);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    public ResponseObject<JobDto> PauseJob(SerializedJob serializedJob) {
+      using (contextFactory.GetContext()) {
+        return jobManager.PauseJob(serializedJob);
       }
     }

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

@@ -37 +37 @@
 using HeuristicLab.Hive.Contracts.ResponseObjects;
 using System.Security.Permissions;
+using HeuristicLab.Hive.JobBase;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -42 +43 @@
   public class SlaveFacade : ISlaveFacade {
     private ISlaveCommunicator slaveCommunicator = ServiceLocator.GetSlaveCommunicator();
+    private IJobManager jobManager = ServiceLocator.GetJobManager();
     private IContextFactory contextFactory = ServiceLocator.GetContextFactory();
 
@@ -126 +128 @@
       using (contextFactory.GetContext()) {
         return slaveCommunicator.SetCalendarStatus(slaveId, state);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public ResponseObject<JobDto> AddChildJob(Guid parentJobId, SerializedJob serializedJob) {
+      using (contextFactory.GetContext()) {
+        return jobManager.AddChildJob(parentJobId, serializedJob);
+        
       }
     }
@@ -186 +197 @@
       }
     }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public ResponseObject<JobDto> PauseJob(SerializedJob serializedJob) {
+      using (contextFactory.GetContext()) {
+        return jobManager.PauseJob(serializedJob);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public JobResultList GetChildJobResults(Guid? parentJobId, bool recursive, bool includeParent) {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetChildJobResults(parentJobId, recursive, includeParent).Obj;
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public SerializedJob GetLastSerializedResult(Guid jobId) {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetLastSerializedResult(jobId).Obj;
+      }
+    }
     #endregion
   }