Changeset 5053


Ignore:
Timestamp:
12/07/10 10:46:26 (11 years ago)
Author:
cneumuel
Message:

#1233

  • changed solution name
  • minor changes to IHiveService
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
2 added
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore set to
      HeuristicLab.Hive-3.4.suo
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveExperimentClient.cs

    r4905 r5053  
    305305      using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
    306306        foreach (HiveJob hj in HiveJob.GetAllHiveJobs()) {
    307           service.Obj.AbortJob(hj.Job.Id);
     307          service.Obj.StopJob(hj.Job.Id);
    308308        }
    309309      }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveJobClient.cs

    r5000 r5053  
    465465      IEnumerable<IPluginDescription> neededPlugins = ApplicationManager.Manager.Plugins; //HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
    466466      using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
    467         IEnumerable<Plugin> availablePlugins = service.Obj.GetAvailablePlugins();
     467        IEnumerable<Plugin> availablePlugins = service.Obj.GetPlugins();
    468468        foreach (IPluginDescription neededPlugin in neededPlugins) {
    469469          Plugin found = availablePlugins.Where(availablePlugin => availablePlugin.Name == neededPlugin.Name && availablePlugin.Version.Major == neededPlugin.Version.Major && availablePlugin.Version.Minor == neededPlugin.Version.Minor && availablePlugin.Version.Revision == neededPlugin.Version.Revision && availablePlugin.Version.MinorRevision == neededPlugin.Version.MinorRevision).SingleOrDefault();
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

    r5038 r5053  
    3535    JobData GetJobData(Guid jobId);
    3636
    37     [OperationContract]
    38     Stream GetJobDataStreamed(Guid jobId);
     37    //[OperationContract]
     38    //Stream GetJobDataStreamed(Guid jobId);
    3939
    4040    [OperationContract]
    4141    void UpdateJob(Job jobDto, JobData jobDataDto);
    4242       
    43     [OperationContract] // formerly StoreFinishedJobResultStreamed
    44     void UpdateJobDataStreamed(Stream stream);
     43    //[OperationContract] // formerly StoreFinishedJobResultStreamed
     44    //void UpdateJobDataStreamed(Stream stream);
    4545
    4646    [OperationContract]
     
    7272    #endregion
    7373
    74 
    7574    #region Job Control Methods
    7675    [OperationContract]
    77     void AbortJob(Guid jobId);
     76    void StopJob(Guid jobId);
    7877
    7978    [OperationContract]
     
    116115    //[OperationContract]
    117116    //void Logout(Guid clientId);
     117
     118    [OperationContract]
     119    void Hello(Guid slaveId, string name, int cores, int memory);
     120
     121    [OperationContract]
     122    void GoodBye();
    118123    #endregion
    119124
    120125    #region Heartbeat Methods
    121126    [OperationContract]
    122     List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat);
     127    List<MessageContainer> Heartbeat(Heartbeat heartbeat);
    123128    #endregion
    124129
    125130    #region Plugin Methods
    126131    [OperationContract]
     132    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
     133    [OperationContract]
     134    IEnumerable<Plugin> GetPlugins();
     135    [OperationContract]
    127136    IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
    128     [OperationContract]
    129     Stream GetStreamedPluginDatas(List<Guid> pluginIds);
    130     [OperationContract]
    131     IEnumerable<Plugin> GetAvailablePlugins();
    132     [OperationContract]
    133     Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
    134137    #endregion
    135138
    136     #region Calendar Methods
    137     [OperationContract]
    138     IEnumerable<Appointment> GetCalendar(Guid slaveId);
    139     [OperationContract]
    140     void SetCalendarStatus(Guid clientId, CalendarState state);
    141     [OperationContract]
    142     IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
    143     [OperationContract]
    144     void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
    145     #endregion
     139    // slave should be unaware of calendar. only server decides based on calendar if slave gets jobs
     140    //#region Calendar Methods
     141    //[OperationContract]
     142    //IEnumerable<Appointment> GetCalendar(Guid slaveId);
     143    //[OperationContract]
     144    //void SetCalendarStatus(Guid clientId, CalendarState state);
     145    //[OperationContract]
     146    //IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
     147    //[OperationContract]
     148    //void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
     149    //#endregion
    146150
    147151    #region Slave Methods
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

    r5038 r5053  
    113113
    114114    #region Job Control Methods
    115     public void AbortJob(Guid jobId) {
     115    public void StopJob(Guid jobId) {
    116116      using (trans.OpenTransaction()) {
    117117        throw new NotImplementedException();
     
    164164   
    165165    #region Login Methods
    166     //public void Login() {
    167     //  throw new NotImplementedException();
    168     //}
    169 
    170     //public void Login(Slave slave) {
    171     //  throw new NotImplementedException();
    172     //}
    173 
    174     //public void Logout(Guid clientId) {
    175     //  throw new NotImplementedException();
    176     //}
     166    public void Hello(Guid slaveId, string name, int cores, int memory) {
     167      throw new NotImplementedException();
     168    }
     169
     170    public void GoodBye() {
     171      throw new NotImplementedException();
     172    }
    177173    #endregion
    178174
    179175    #region Heartbeat Methods
    180     public List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat) {
     176    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
    181177      using (trans.OpenTransaction()) {
    182178        return hive.ProcessHeartbeat(heartbeat);
     
    186182
    187183    #region Plugin Methods
    188     public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
    189       throw new NotImplementedException();
    190     }
    191     public Stream GetStreamedPluginDatas(List<Guid> pluginIds) {
    192       throw new NotImplementedException();
    193     }
    194     public IEnumerable<Plugin> GetAvailablePlugins() {
    195       return dao.GetPlugins(x => true);
    196     }
    197184    public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
    198185      using (trans.OpenTransaction()) {
     
    205192      }
    206193    }
    207     #endregion
    208 
    209     #region Calendar Methods
    210     public IEnumerable<Appointment> GetCalendar(Guid clientId) {
    211       throw new NotImplementedException();
    212     }
    213 
    214     public void SetCalendarStatus(Guid clientId, CalendarState state) {
    215       using (trans.OpenTransaction()) {
    216         throw new NotImplementedException();
    217       }
    218     }
    219 
    220     public IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid) {
    221       throw new NotImplementedException();
    222     }
    223 
    224     public void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced) {
    225       throw new NotImplementedException();
    226     }
    227     #endregion
    228 
     194    public IEnumerable<Plugin> GetPlugins() {
     195      return dao.GetPlugins(x => true);
     196    }
     197    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
     198      throw new NotImplementedException();
     199    }
     200    public Stream GetStreamedPluginDatas(List<Guid> pluginIds) {
     201      throw new NotImplementedException();
     202    }
     203    #endregion
     204   
    229205    #region Slave Methods
    230206    public Guid AddSlave(Slave slave) {
     
    292268
    293269    #endregion
     270
    294271  }
    295272}
Note: See TracChangeset for help on using the changeset viewer.