[Bordeaux] Network card switched again due to bug #2681

data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json

@@ -11,17 +11,23 @@
   "network_adapters": [
     {
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "Myrinet 10G",
+      "ip": "172.16.1.196",
+      "network_address": "borderline-1.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "Myrinet 10G",
+      "ip": "172.16.1.196",
+      "network_address": "borderline-4.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {

data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json

@@ -11,17 +11,23 @@
   "network_adapters": [
     {
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "Myrinet 10G",
+      "ip": "172.16.1.197",
+      "network_address": "borderline-2.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "Myrinet 10G",
+      "ip": "172.16.1.197",
+      "network_address": "borderline-3.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {

data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json

@@ -11,23 +11,17 @@
   "network_adapters": [
     {
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.198",
-      "network_address": "borderline-3.bordeaux.grid5000.fr",
+      "interface": "InfiniBand SDR",
       "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25408"
     },
     {
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.198",
-      "network_address": "borderline-2.bordeaux.grid5000.fr",
+      "interface": "InfiniBand SDR",
       "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25408"
     }
   ],
   "operating_system": {

data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json

@@ -11,23 +11,17 @@
   "network_adapters": [
     {
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.199",
-      "network_address": "borderline-4.bordeaux.grid5000.fr",
+      "interface": "InfiniBand SDR",
       "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25408"
     },
     {
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.199",
-      "network_address": "borderline-1.bordeaux.grid5000.fr",
+      "interface": "InfiniBand SDR",
       "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25408"
     }
   ],
   "operating_system": {

generators/input/bordeaux.rb

@@ -201,11 +201,11 @@ version 1.48"
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
           ]
 #some cards have been swapped between hosts - refer to bug 2681 for explanations
-	  if i == 0 or i == 1
+	  if i == 2 or i == 3
 	  network_adapters [
 		{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
 		  {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true}]
-	  elsif i == 2 or i == 3
+	  elsif i == 0 or i == 1
 	  network_adapters [
 		  {: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"),