[bordeaux,grenoble] Correct high performance cards families for global...

[bordeaux,grenoble] Correct high performance cards families for global coherence InfiniHost => Mellanox

generators/input/bordeaux.rb

@@ -100,7 +100,7 @@ version 1.48"
         network_adapters [
           {:interface => 'InfiniBand SDR', :rate => 10.G, 
             :switch => "sbdp", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :vendor => 'InfiniHost', :version => "MT25208", :enabled => true},
+            :vendor => 'Mellanox', :version => "InfiniHost MT25208", :enabled => true},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
           ]
@@ -194,7 +194,7 @@ version 1.48"
           {:interface => 'Myrinet 10G', :rate => 10.G, 
             :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
             :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
-          {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'InfiniHost', :version => "MT25408", :enabled => true},
+          {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
           ]

generators/input/grenoble.rb

@@ -50,7 +50,7 @@ site :grenoble do |site_uid|
           {:interface => 'SATA', :size => 160.GB, :driver => nil}
           ]
         network_adapters [
-          {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'InfiniHost', :version => "MHGH29-XTC", :enabled => true,
+          {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MHGH29-XTC", :enabled => true,
             :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false}
           ]  

generators/input/nancy.rb

@@ -106,7 +106,7 @@ site :nancy do |site_uid|
             :driver => "e1000e", :vendor => "intel", :version => "80003ES2LAN"},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000e", :vendor => "intel", :version => "BCM5721"},
 	  {:interface => 'Infiniband DDR', :rate => 20.G, :enabled => true, :mac => lookup('nancy', "#{node_uid}", 'mac_ib'),
-	    :switch => "ib_switch", :ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'), :ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'), :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418" },
+	    :switch => "ib_switch", :ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'), :ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'), :driver => "mlx4_core", :vendor => "Mellanox", :version => " InfiniHost MT26418" },
           {:interface => 'Ipmi', :rate => 100.M, :enabled => true, :vendor => "tyan", :version => "no", :ip => lookup('nancy', "#{node_uid}", 'ip_ipmi'),
             :switch => lookup('nancy', "#{node_uid}", 'switch_ipmi'), :switch_port => lookup('nancy', "#{node_uid}", 'switch_ipmi_pos'),
             :mac => lookup('nancy', "#{node_uid}", 'mac_ipmi'),