diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json index 2c9bbc758316b798687f07d7da1e8088dd200389..a8a9c4d8ed89f857d329f13204f964bfa6ce75a3 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json +++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json @@ -738,10 +738,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -800,10 +797,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -862,10 +856,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -924,10 +915,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -986,10 +974,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -1048,10 +1033,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -1110,10 +1092,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { @@ -1172,10 +1151,7 @@ "grisou-45", "grisou-46", "grisou-47", - "grisou-48", - "grisou-49", - "grisou-50", - "grisou-51" + "grisou-48" ], "period": 15000, "source": { diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb index fc2421f7b020537b24a57c78c2dcd1c05d7e9ce3..fffebc31ac4e1112b0d888476887b42d7d69b68d 100644 --- a/lib/refrepo/input_loader.rb +++ b/lib/refrepo/input_loader.rb @@ -614,7 +614,7 @@ def add_network_metrics(h) # check if some cluster's nodes do not have this interface found in some network ports if not cluster['nodes'].select { |_, v| v['status'] != 'retired' }.map{|_, node| node['network_adapters'].fetch(iface_uid, {}).fetch('switch', nil)}.all?{|s| not s.nil? and site.fetch('networks', {}).fetch(s, {}).fetch('metrics', []).select{|m| m['name'] == metric['name']}} # otherwise add "only_for" key to indicate nodes found - new_metric['only_for'] = cluster['nodes'].select { |_, v| v['status'] != 'retired' }.select{|_, node| site.fetch('networks', {}).fetch(node['network_adapters'].fetch(iface_uid, {}).fetch('switch', 'notfound'), {}).fetch('metrics', []).select{|m| m['name'] == metric['name']}}.keys.sort_by{|node| node.split("-")[1].to_i} + new_metric['only_for'] = cluster['nodes'].select { |_, v| v['status'] != 'retired' }.select{|_, node| site.fetch('networks', {}).fetch(node['network_adapters'].fetch(iface_uid, {}).fetch('switch', 'notfound'), {}).fetch('metrics', []).find{|m| m['name'] == metric['name']}}.keys.sort_by{|node| node.split("-")[1].to_i} end cluster['metrics'].push(new_metric) end