Changeset 5053 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common

Timestamp:

12/07/10 10:46:26 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed solution name
• minor changes to IHiveService

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

@@ -35 +35 @@
     JobData GetJobData(Guid jobId);
 
-    [OperationContract]
-    Stream GetJobDataStreamed(Guid jobId);
+    //[OperationContract]
+    //Stream GetJobDataStreamed(Guid jobId);
 
     [OperationContract]
     void UpdateJob(Job jobDto, JobData jobDataDto);
         
-    [OperationContract] // formerly StoreFinishedJobResultStreamed
-    void UpdateJobDataStreamed(Stream stream);
+    //[OperationContract] // formerly StoreFinishedJobResultStreamed
+    //void UpdateJobDataStreamed(Stream stream);
 
     [OperationContract]
@@ -72 +72 @@
     #endregion
 
-
     #region Job Control Methods
     [OperationContract]
-    void AbortJob(Guid jobId);
+    void StopJob(Guid jobId);
 
     [OperationContract]
@@ -116 +115 @@
     //[OperationContract]
     //void Logout(Guid clientId);
+
+    [OperationContract]
+    void Hello(Guid slaveId, string name, int cores, int memory);
+
+    [OperationContract]
+    void GoodBye();
     #endregion
 
     #region Heartbeat Methods
     [OperationContract]
-    List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat);
+    List<MessageContainer> Heartbeat(Heartbeat heartbeat);
     #endregion
 
     #region Plugin Methods
     [OperationContract]
+    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
+    [OperationContract]
+    IEnumerable<Plugin> GetPlugins();
+    [OperationContract]
     IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
-    [OperationContract]
-    Stream GetStreamedPluginDatas(List<Guid> pluginIds);
-    [OperationContract]
-    IEnumerable<Plugin> GetAvailablePlugins();
-    [OperationContract]
-    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
     #endregion
 
-    #region Calendar Methods
-    [OperationContract]
-    IEnumerable<Appointment> GetCalendar(Guid slaveId);
-    [OperationContract]
-    void SetCalendarStatus(Guid clientId, CalendarState state);
-    [OperationContract]
-    IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
-    [OperationContract]
-    void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
-    #endregion
+    // slave should be unaware of calendar. only server decides based on calendar if slave gets jobs
+    //#region Calendar Methods
+    //[OperationContract]
+    //IEnumerable<Appointment> GetCalendar(Guid slaveId);
+    //[OperationContract]
+    //void SetCalendarStatus(Guid clientId, CalendarState state);
+    //[OperationContract]
+    //IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
+    //[OperationContract]
+    //void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
+    //#endregion
 
     #region Slave Methods