Mentions légales du service

Skip to content
Snippets Groups Projects
Commit bc622cbf authored by Lucas Nussbaum's avatar Lucas Nussbaum Committed by Lucas Nussbaum
Browse files

[valid/network] Complain if missing links even if not managed by us

This is a partial revert of 2cb5349a:
We want to provide a connected network graph even if some equipments are
not managed by us (that means that additional equipment might need to be
added)
parent 6dbe081d
No related branches found
No related tags found
1 merge request!504Ajout d'une propriété 'managed-by-us' pour les équipements réseaux
Pipeline #849752 passed
...@@ -53,8 +53,7 @@ def check_network_description(options) ...@@ -53,8 +53,7 @@ def check_network_description(options)
netnodes << { netnodes << {
'kind' => eq['kind'], 'kind' => eq['kind'],
'uid' => eq['uid'], 'uid' => eq['uid'],
'nickname' => eq['uid'], 'nickname' => eq['uid']
'managed_by_us' => eq['managed_by_us']
} }
end end
...@@ -231,8 +230,7 @@ def check_network_description(options) ...@@ -231,8 +230,7 @@ def check_network_description(options)
# find netnodes without connection # find netnodes without connection
# for routers, it's OK, because they would be connected to other G5K routers # for routers, it's OK, because they would be connected to other G5K routers
# for equipment that we do not managed, it's OK, because they would be connected by the partner netnodes.select { |n| n['found'] == 0 and n['kind'] != 'router' }.each do |n|
netnodes.select { |n| n['found'] == 0 and n['kind'] != 'router' and (n.has_key?('managed_by_us') and n['managed_by_us']) }.each do |n|
if n['interface'] == 'InfiniBand' or n['interface'] == 'Myrinet' or n['interface'] == 'Omni-Path' or hpc_switch?(n) if n['interface'] == 'InfiniBand' or n['interface'] == 'Myrinet' or n['interface'] == 'Omni-Path' or hpc_switch?(n)
puts "WARNING: we did not find a corresponding entry on a network equipment for this InfiniBand node: #{n}" puts "WARNING: we did not find a corresponding entry on a network equipment for this InfiniBand node: #{n}"
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment