SW-828: adaptations to cep4_utils.py

MAC/TBB/lib/tbb_util.py

@@ -33,7 +33,7 @@ def get_cpu_nodes_running_tbb_datawriter(timeout=60):
     :return: list cpu node numbers (ints)
     '''
     result = []
-    available_nodes = get_cep4_available_cpu_nodes(include_allocated_nodes=True)
+    available_nodes = get_cep4_up_and_running_cpu_nodes()
     procs = {}
     start = datetime.utcnow()
 
@@ -64,7 +64,7 @@ def get_cpu_nodes_available_for_tbb_datawriters_sorted_by_load(min_nr_of_free_no
     :param float max_normalized_load: filter free nodes which are at most max_normalized_load
     :return: list of node numbers
     """
-    all_available_nodes = set(get_cep4_available_cpu_nodes(include_allocated_nodes=True))
+    all_available_nodes = set(get_cep4_up_and_running_cpu_nodes())
     nodes_running_datawriters1 = set(get_cpu_nodes_running_tbb_datawriter_via_slurm())
     nodes_running_datawriters2 = set(get_cpu_nodes_running_tbb_datawriter())
     nodes_running_datawriters = nodes_running_datawriters1.union(nodes_running_datawriters2)