From f36b2d9d9c15c24bbd5ee2a9899c4a1afebca3f8 Mon Sep 17 00:00:00 2001 From: Guillaume Raffy Date: Wed, 13 Mar 2024 15:50:47 +0100 Subject: [PATCH] cocluto v1.02 : adapted code to the recent addition of the guaranteed_util field in the machines table fixes [https://bugzilla.ipr.univ-rennes.fr/show_bug.cgi?id=3792] --- cocluto/cluster_stats.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cocluto/cluster_stats.py b/cocluto/cluster_stats.py index 686e330..41bd41d 100644 --- a/cocluto/cluster_stats.py +++ b/cocluto/cluster_stats.py @@ -72,7 +72,7 @@ def get_flops_price_over_time(inventory, time_value): flops_prices = [] for row in rows: - (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number) = row + (name, _serial_number, _affectation, _machine_spec_id, _command_id, price_ex_vat, _pos_x, _pos_y, _pos_z, _inv_number, _guaranteed_until) = row is_cluster_node = is_cluster_node_name(name) if is_cluster_node and not is_test_machine(name): purchase_date = inventory.get_machine_purchase_date(name) @@ -205,7 +205,7 @@ def draw_cluster_value_over_time_graph(inventory, from_date, to_date, graph_type rows = inventory.query("SELECT * FROM machines") for row in rows: - (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number) = row + (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number, _guaranteed_until) = row is_cluster_node = is_cluster_node_name(name) if is_cluster_node and not is_test_machine(name): purchase_date = inventory.get_machine_purchase_date(name) @@ -321,7 +321,7 @@ def draw_machine_age_pyramid_graph(inventory): rows = inventory.query("SELECT * FROM machines") for row in rows: - (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number) = row + (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number, _guaranteed_until) = row is_cluster_node = is_cluster_node_name(name) if is_cluster_node and not is_test_machine(name): purchase_date = inventory.get_machine_purchase_date(name) @@ -355,7 +355,7 @@ def draw_core_age_pyramid_graph(inventory): rows = inventory.query("SELECT * FROM machines") for row in rows: - (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number) = row + (name, serial_number, affectation, machine_spec_id, command_id, price_ex_vat, pos_x, pos_y, pos_z, inv_number, _guaranteed_until) = row is_cluster_node = is_cluster_node_name(name) if is_cluster_node and not is_test_machine(name): purchase_date = inventory.get_machine_purchase_date(name) diff --git a/setup.py b/setup.py index 3e7c8f9..f17c4c7 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name='cocluto', - version=1.01, + version=1.02, description='compute cluster utility tools', url='https://git.ipr.univ-rennes1.fr/graffy/cocluto', author='Guillaume Raffy',