-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// 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.
+// 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, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SALOME ResourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl)
// File : SALOME_ResourcesCatalog_Handler.hxx
// Author : Estelle Deville
{
public :
- SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list,
- MapOfParserResourcesType& resources_batch_list);
+ SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list);
const MapOfParserResourcesType& GetResourcesAfterParsing() const;
virtual ~SALOME_ResourcesCatalog_Handler();
void ProcessXmlDocument(xmlDocPtr theDoc);
+
+ bool ProcessMachine(xmlNodePtr machine_descr, ParserResourcesType & resource);
+ bool ProcessCluster(xmlNodePtr cluster_descr, ParserResourcesType & resource);
+ bool ProcessMember(xmlNodePtr member_descr, ParserResourcesType & resource);
void PrepareDocToXmlFile(xmlDocPtr theDoc);
private :
- std::string previous_module_name;
+ std::string previous_component_name;
- ParserResourcesType _resource;
MapOfParserResourcesType& _resources_list;
- MapOfParserResourcesType& _resources_batch_list;
const char *test_machine;
- const char *test_resources;
-
+ const char *test_cluster;
+ const char *test_name;
const char *test_hostname;
- const char *test_alias;
+ const char *test_type;
const char *test_protocol;
- const char *test_mode;
+ const char *test_cluster_internal_protocol;
const char *test_batch;
const char *test_mpi;
const char *test_user_name;
const char *test_appli_path;
+ const char *test_can_launch_batch_jobs;
+ const char *test_can_run_containers;
+ // for compatibility
const char *test_modules;
const char *test_module_name;
+ const char *test_components;
+ const char *test_component_name;
const char *test_os;
const char *test_mem_in_mb;
const char *test_cpu_freq_mhz;
const char *test_nb_of_nodes;
+ const char *test_nb_of_proc;
const char *test_nb_of_proc_per_node;
const char *test_batch_queue;
const char *test_user_commands;
+ const char *test_use;
+ const char *test_members;
+ const char *test_working_directory;
+
+ const char *test_mode; // To be removed in SALOME 8
+ const char *test_is_cluster_head; // To be removed in SALOME 8
};