Copyright update 2022

[modules/jobmanager.git] / src / engine / BL_SALOMEServices.hxx

diff --git a/src/engine/BL_SALOMEServices.hxx b/src/engine/BL_SALOMEServices.hxx
index f3500cc06e0f0854572a6046c4f3bf7c73bd424f..89273d8acca198bb2310df6a91b3523c0819a694 100644 (file)
--- a/src/engine/BL_SALOMEServices.hxx
+++ b/src/engine/BL_SALOMEServices.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +23,7 @@
 #include "BL_Engine.hxx"
 #include "BL_Traces.hxx"
 #include "BL_Job.hxx"
+#include "BL_NamingService_Wrapper.hxx"
 
 #include "SALOME_NamingService.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
@@ -58,7 +59,8 @@ namespace BL{
     std::string mpiImpl;
     std::string iprotocol;
 
-    bool is_cluster_head;
+    bool can_launch_batch_jobs;
+    bool can_run_containers;
     std::string working_directory;
   };
 
@@ -74,7 +76,7 @@ namespace BL{
 
       void set_manager(BL::JobsManager * manager) {_manager = manager;}
 
-      std::list<std::string> getResourceList();
+      std::list<std::string> getResourceList(bool batch_only);
       BL::ResourceDescr getResourceDescr(const std::string& name);
       void addResource(BL::ResourceDescr & new_resource);
       void removeResource(const std::string & name);
@@ -88,6 +90,7 @@ namespace BL{
       std::string delete_job(BL::Job * job);
       std::string stop_job(BL::Job * job);
       std::string get_results_job(BL::Job * job);
+      std::string get_assigned_hostnames(BL::Job * job); // Get names or ids of hosts assigned to the job
 
       BL::Job * get_new_job(int job_number);
 
@@ -95,7 +98,7 @@ namespace BL{
 
     private:
       CORBA::ORB_var _orb;
-      SALOME_NamingService * _salome_naming_service;
+      BL_SALOME_NamingService_Wrapper * _salome_naming_service;
       SALOME_LifeCycleCORBA * _lcc;
       Engines::SalomeLauncher_var _salome_launcher;
       Engines::ResourcesManager_var _resources_manager;