diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
index 9344af71595aae54a85c4e550117b97963bc849f..2c4771896b632c906d00691593ffc8d1e79cd6eb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
index 9dad1efe23d3364aa5d1ddc3168c002143d1c4b9..dd4898722d02707374ac1d0fe330f67c4c273be3 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
index 67bac477e7d879b8da536dbd96f8324d2d9c94c0..6f6389047c4a9c02d69dcd6cdf5f1b529ea62757 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
index fb693766ab2cd158e35dee3536ee84a6a306215a..37021144832a3fc24749b12c493d73398ae36844 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
index 991d6ebead7aa144bb182f8795be3d8178f4b474..e9c69cb1c51ff8c250e345b00a1a7ca6cbc7028c 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
index c215945c0e54228775af3f9fec4b8788ee5572f7..8d36dafbdbdc73a3e3e3f9b1b8a875c8b3f0610a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
index a4be045cd3ce508410c8c99f6d8cf112069e75e7..8240328e632132d914448f2c6b95e739ce4182e7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
index 79fba2848cadb2739fd116ae087c52de48f18097..e827ce3a7f1147fd80b20e6ece7a4e157cf47a92 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
index af50e0fb45683e0dc68184b87a6f6adee5da0614..203b1c5ef6b23143c22b59f122b60104e010c2c6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
index c1b1c78fc637b767a887b039c4d375f5cc7e9e12..8077bf63c4c1449d9aa8bb101a4454969840fc36 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
index 41c198d5b7cef79b37faacc613e01c49ed5b5b0a..58947ecb291d374a6e9afaf69846426428a21c35 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
index e3dec21bfd93a6c2d4dc06dd4024202f853e84ed..6fcc8c3ed080dd106fa88a736709e59a7d6f8d9f 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
index f7c16ca77af3a6d872564253e4c602dcf048e638..7003e2642cc14389352a0dc2805cb63c74e32107 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
index 580b5f83e1e49153e21bfeb9ec1f0ed4e967604d..28dbbbd673669f15e6bf7902634344e32d677f09 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
index ea227094a40db020330a6ed6eb1e59f94549377f..0cb5065daa2796ab0f9b310e6765d88168bcfd35 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
index ed90b305f87ec36d9a18399f2da332fbf18a785d..9925b42c876c317dc07f784cfd5bb45ea2d3b427 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
index 2b7b3fc9e11f0e96cce727319cfaae8e527e14b6..12909d08ba91900d6c758bd8b54d351e7d84a96d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
index 5a872e7df0fb4d6eb0e9f4bdee0a2f44a8b51358..14bc12fb5e7b28c72e70e93378bc45002d1840fe 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
index 165aa0cc5abd6f53031cfa056773d04a7051be54..8e8399580ec7e9dba1bffbfb10456d0ca01dda68 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
index 24a651bed6880a60dbfefa595a46fb215bc0d225..399724d036be859da07bc5f4c66f9aebb6d800ce 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
index 7d6207006c226a26359e56efbe7b577ad8663439..096712920e4b043af0bff0d06b0f23d44189906f 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
index 43482e810127dc05818cff6e0e9ca2e2811b2aa2..00961ed9139b913cea537b80c9abf2c51d9e55f9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
index fe8078ea91ddb37c94007762d671b662569d139f..6c5c76b13b7782a884c2fddd2417aea7a94ba4de 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
index b5fc0fe718b5c9a7099b84de30c153e52a95a5e3..9b5612b9ec47c81eb397ebfb493312f091095faa 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
index 033941b6a3badb121fce45bc0eded23bb96c1959..075f551be5d806dcbd53589775f986ab35218802 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
index e24e2a5e05d1d800aebe6ef18bebdbe580fb652a..a08b6a9d98e3269c53bee418dca06ec7079802b6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
index 20ed64f1090ae3e109f03103d3626171b4f7d8a9..385d6df3c4446ecfd3832d659042536c07342e53 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
index e33642d4d1a76c2d7190cf67e3991b033782f9a8..28ac834a7aae9dd5960815ce722f0931cc8ee469 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
index acbcbdf293e4dd4ed6eef03ebb8ca6d3add89f2f..eddf5310d3e618e3a4222b6a1b2196cac4075512 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
index dde6c4eef938ccb9a0ac6e1c51a0c28126dbc120..037bf26368535159f4b5f4a4ad0cd26242c75a90 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
index 719a973b97a8b762935be99204791026eab995fc..53e3f2331e52a9b4795d73ab20ef4a16826ca502 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
index 63b82b67b328aee0c436fa305bdebdf139e427f8..01efc3a8e24e1517d69e9773e7ca61c333fd53b7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
@@ -121,6 +121,10 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "performance": {
+    "core_flops": 12790000000,
+    "node_flops": 428900000000
+  },
   "processor": {
     "cache_l1": null,
     "cache_l1d": 32768,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
index 64fbcd2da8a33506e7e38461b466c8ae046293cb..e0327c93d65ba14aa726d79e33fa637a94ed9818 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.10",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-10-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
index 0869ae073348803e1e7cccf8dc50627bd1c455cd..22c19ada1d9f4cc7d9ca4ac0fd815ac5135389a7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.100",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-100-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
index 48bff1e94c9a6abfcd5d0774d63a91e2e3781b85..a4c80fb3d6c0c66c6ddab2c27e2aafbfc1cf9e28 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.101",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-101-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
index ba2bac28e853847b1162096286bd2ff7c8dbbb98..7e74cb918a4aad8f98e314f7845e4a663ba969e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.102",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-102-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
index 2353b6eaff93cd5cf46a718906588dcac8f36dce..eabd9e0f1630155e436b75c9c57ed9b270278341 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.103",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-103-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
index 1246a2f7b946f9e7455161f883425209f08a2ef0..bc7e337131edc2f60c0fc0ee2d3076a089a6a0c5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.104",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-104-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
index c367209d8b7786e57b7a724be4f2290156336738..093cd2c95a3ac5395e98e3c34ebc8d7da232ce4d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.105",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-105-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
index bb11040bfb385c55739a480e2851529bb92e0b02..cac04782c92b521278942429b77d001a44613c1a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.106",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-106-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
index caca558c1d83c7f523f66c5e380a8f74dce3ebbb..d59e6b13bdb7c62b527e880c287df64429001f3d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.107",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-107-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
index e167b0c7cca5716defbc03e7cb6c6bba8fe3c0af..8cd3f3758e946930903af2e8dd61a15d17f0eee4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.108",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-108-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
index 426a95daf08926e5b26e5132bf91d9977d01d99e..a69e8fe8d6884146e153479bb08f6b4b772c8029 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.109",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-109-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
index b0b3b5218bd6e8f616c813fdfdb5d9dbce38361a..cdd96cd20fe09d8812d340b46589383e84486599 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.11",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-11-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
index ec71e7804495299411a426f559526072dbd21f81..389b778089000959623fb2c0baa2ffe13f9063bf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.110",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-110-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
index 389420c65bf82768298b92fad866d55c334a3392..71c36b2e47f74b4a95b05d5dd0aa2176faf81b1d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.111",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-111-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
index f0d52ccdd7c46b5ec550d12bf81e2cb2e7ee36aa..b15e9a7b8d6e5ee24efb37dd3cef47d95b397a08 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.112",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-112-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
index a089c6a85ef96806f795650c66936f51c28b41d6..8a2669d99634fcc7925965c45cf77d2c4f4098fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.113",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-113-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
index 41292ffef99d46570e5e72427f77ef23de8f658d..5804c0cacdefc0c2512642a35f52dff9fcf221c8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.114",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-114-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
index f07cb47b6d08f933287ed8c89a5d2805442127e6..92aa331659190c3e061f6050e48c88168afba6ce 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.115",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-115-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
index 7c1e2dcc2433f9b1b486e83429ee065db929cb0a..ef065d913f1c5a0233226b24578c3c7667a504a7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.116",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-116-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
index b55114237d96ff320a88ef71222f8182c292fa70..435adf93922d8665459164f74b820aadbec16a4a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.117",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-117-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
index 6119915d54a210955123f37fa3a87d72ec1bc6cf..5055e6c200b71b89197581957b3cef5285a0b5af 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.118",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-118-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
index 2a6fcdf567e9d7d64f1110c48a390d0a07df2a4b..2f9a5c6b62d2a9a9c59619551d1884fe2841e76c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.119",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-119-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
index 17eaecf0c848e5b07ab62f964cd8b688b521d598..6cd691020a0cf8124e3621f8f6d78093a98d58d8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.12",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-12-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
index cf4e4074be5128b1a9d9ef0915fffae2f58d4ff6..249adc36f7d76b1af2e654451add6d80cb0fa559 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.120",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-120-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
index 30f5da745e5a8c1fae60c2b98f5422f324627329..f8effea16f2af8469ecc06e4dfe6982fc21148fc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.121",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-121-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
index 6e6f16eced72d4bf5db22d425ca22d8026c7c6a0..8a658ad39509b5bdfbee37ab3ed1499c9b5d0d46 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.122",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-122-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index a0116860ece0db65e0b04043a7d83ae0e462ea91..044598a4da8656f4e9169fa9966bb14128c70d25 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.124",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-124-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
index 206073dbbe0a3834d881acd772761df30b53d025..caa3635b4e9f0845717113a039114ada1416a174 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.125",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-125-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
index da0ae0f027299ba96d2e5008e1e46feac536c21f..59bb5cd5d11df644dd95bf99a085eec21bff50ef 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.126",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-126-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
index 6dfc3f91e83ee6c12ea8191de1676c9f78e56283..dd9f6955f405973530c6ff6366d6608848bdf6da 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.127",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-127-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
index 2a48f72342a6b3e166c097b53828961f70511af9..3c453895bc7c896f18ba53e630d10013568bab74 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.128",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-128-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
index 1baea2850807631b09d552fb57fda038badb969e..76e3ae304fd4180993dbf2919f25446e2c7779a5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.129",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-129-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
index 9bd6386416ab64544e460c2911512e38721d69ca..899f873dd857aab1135b79aab3990db67204e8f9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.13",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-13-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
index ae91440c87443e18995586b7e947409e027a72dd..cc360ccfbd0b025affa889e4cbd98abbc9c20284 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.130",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-130-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index e078b0fe07b84aadce76c892683c4eb9a91d67fb..e81e118ac0f2e40a33d4d5083721174de2f0c434 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.131",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-131-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
index 8e2fff0b51d918ecfb3a87e50bb5bb1e12f4736c..53b2e481c6be57710c8cdb6bf2a5c1edc26da6b7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.132",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-132-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
index cc48203a03f5353304b2440860200d81bec2ab22..69101680df461a0a40a06f64da799e77deb488cd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.133",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-133-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
index 57f11b4dc623c1417b4afd7fb2bdb6a3640f52a4..916e81d9ed46839233af7a69750dfa04ef47d557 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.134",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-134-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
index 731a99269f7e979b1fad97c84df1cd3558ba5f0a..7ad58eb7d39c432d5e0061e838cecf976df96bb0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.135",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-135-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
index d70b76e0864b62905e0a6012aee52bc9c3ee9ba1..709dec80a7637f1d9d028d1fd129c9f4a05b5898 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.136",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-136-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
index 7e3ed1289a148ed5ff1b5e43e4297203881b505c..d81d8514fafb5f4d0703eb0abea0029bceaa5158 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.137",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-137-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
index b136079c5555c05362dc1fbf1b982111305a62db..4dea59bf4e22a8318ac6b22a33aa73ad7d55a293 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.138",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-138-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
index 6ff004e261bb5d35fe09e1c41af906c78c870fdb..7999c5a7b7e115eb501e6b29dfbc9b0d9dccc935 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.139",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-139-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
index f921d912a0499140e2a15ea2994529ab3ce8d4a2..8057c63fe6b88888c462b5b3c1aed4bb3c3625af 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.14",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-14-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
index dcb3468c4f3d33a8e0255b5b42630e925951264c..d62db736b5ea0173b46907c50e8d3852945b3829 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.140",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-140-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
index f891395289200cfbc7d4ee669dcfbedce0434c55..be2ad8e490b5f7753285a7cb762fccae054537aa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.141",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-141-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
index e193dc7ba607d4c50ac9deb9dd78b0e1237f0889..4fb7efb1fcd0637366a21ad6b10fc2185d0bda9a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.142",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-142-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
index 0dca9f16308b9c45dc06e8496b863dd159eb7712..f82ea3a8b6cec4c1b18cc3344fd224ede543b451 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.143",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-143-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
index 8385c7c77ef365928d2b285fc0b4954595105482..07a8fce74691801fcdf361cce95ae4b2a62d8ebf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.15",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-15-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
index 924a7c50cde311610ec14e6c087fc253e0732cdf..f6affc1eab524c97d0a87c77df67cd04d8f97877 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.16",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-16-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
index 323bc8452fcc438621ac87c6a5fd5cfea998c2cd..7776acb91eff4d238d4c6cf54d9560cd1ab5e607 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.17",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-17-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
index 2fdc99fc3adb5f213cafb89928653bfbda680658..46c57b0fdfbaa778348ac99b75f6389512a58cd7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.18",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-18-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
index 9748ecd98920ea9f316ac32db10748959779b608..db7eed5829dbc5422e391d073b696da256c39cd3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.19",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-19-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
index 41a83c1a444256f8c7aa4d2b4564b07816d4722b..936fc23b7f589f4192674c598af0154145db4dcd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.2",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-2-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
index a8183ba0009026669c2b91680c3bf9c9459cd63c..4ad40b0cdc79ad825d4dd70b8d6e945596bf2cb0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.20",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-20-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index 4e57b73d85f97c85a6e65ce9697cd92768618f7c..6afd5bb8a4aa55fde9db1b1713d2de37750fc65c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.21",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-21-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
index 49b334ad92d74bcefe4ba83e2d44d1e21c9b884e..d61345f1b23995ada172f1a9402a3ea879c7cafb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.22",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-22-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
index c582502372011454996e32910d07cea16667223c..1b03da19713eeaecfe896f1c2bfe43ce25dfd5a1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.23",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-23-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
index 342172029fd4729a99773908debb7e5266652de3..b338b743036501cab9f23b75f90e8943912e722e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.24",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-24-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
index 9580c0cdfb038d5e104219f116e5d9291288abf2..e77b4d8107d0cda371f42e526077cb331e22f3b4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.25",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-25-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
index 92d99ed5251941e735b4ef3664aecd3a3c1658c8..66b18fa12ef6c2ae9c577acf55a4fc337f8a54ee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.26",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-26-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
index 0d40e7499d1f3b84dcfd18ad28b41c1b9c9ea21b..442dac275cd47b0da05bb025d09c233ff00591fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.27",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-27-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
index ebe7c4afc8854580a4a8d392693779f468ea1631..35b377a735f1e02deb7ddccf55977653c64941cc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.29",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-29-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
index 0c4fcb11adf5f05670a13921e76bb09335e3aaee..cfe6e1a7d15f8fcff657c36edf96035e7780b391 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.30",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-30-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
index 91cfdd1dc2fd45941fd4422bcc64246ded0cc105..6cd8f7fd935a9b4ab3f23ca5d6d1e6c9d99c0039 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.31",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-31-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
index 06a458111bfe0b1ef847acd3c267e516770370b8..e722b02d187f4e93adda558fab7773df47b46557 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.32",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-32-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
index 6a941cf3dc95c7e860cb49b0c7624ff439f35f27..f15d13382d9edd046172e8e2fd9ef9554f01df71 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.33",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-33-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
index e0a0a3373f0c05cc78eac3e1e9fa66fda2c9f1ca..88e72d2634db57c11b43f239b423ec3de184418a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.34",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-34-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index ecd152a30157ebd3238cc09fe947dc304a7fc8ee..a95acecd4b3632897f94c473b5248b5008dd4c2c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.35",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-35-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
index 76664390df334b5de76e644613467ca2340c912b..749f1112a3b7f84b0debcb8b9d338e6bb6092c8d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.37",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-37-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
index dfe2e2ae3ee899511bb604585d70ab71dc9375f0..ce0b24bb54163e643dcba6267187310e8c0968c0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.38",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-38-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
index 9f0077a9b7a765172e10a986463906b0139fcf7c..98f6263a4b5ed4b84c9e7b695254fceb18025f3d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.39",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-39-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index 736908d396420383c83d078ee0062811c0c8a977..09597b7e31d813c4e3a19e5a2a7da7e923e5b089 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.4",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-4-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
index 00680db3c4eec3f61b5b3d8ffbbdb388f07f9bc7..43ea91468e90728c50c995a647e764be0c24a22e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.41",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-41-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
index a9e1bb17ba04ce58fd31851cfd7ff7e970b828ae..504957a5be1de0d84c63db931ec1990e7669a2fa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.42",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-42-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
index ad485db4a37f45917b97b29597d8730e9ed3c25e..21b81a193115084af1ed233511b9664ceee10176 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.43",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-43-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
index 8b6946a390bbb00456a6880375d4f12b44e507fe..63bfaba8b15828313285a55a9564984c178481a6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.44",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-44-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
index 343444fc88985371c204bdd56e7a0bc063e3195d..7f979e88feaaf6fb580f9b82fd0154be1614c20f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.45",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-45-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
index 0fa4c00912b537c38253a58269088eb175586bde..06feea169a61271a05b3b818c14c5b90c73e6aed 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.46",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-46-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
index 391d1d70d16be6aa95c071159d3bbc79c1ace20e..7537e96325ab93641164e11205b22de2b7feaaa1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.47",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-47-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
index d1df0952e986abf0d2ebfae8656232afcc4b10e9..e6abdeefc4c8de4fa9d5b65009d9a358b4b5db03 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.48",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-48-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
index 47dc3dea3905cf94e3e6e7b32d2823a357dbe863..fb8368f593b611b3bdfd4bcc86cbb0656948942c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.49",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-49-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
index 008e49885ace761bdb513caf7f64cb5156cfe1be..2d08782faa749032477b84364e7c4177a14edb1f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.5",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-5-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
index a7d1c3a332072d4850d61a78b6ac6b196ab3e61a..b488ce5d7a208b52329fb339f528462711d24e6f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.50",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-50-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
index 0e579132ad5718dd159a21f86a4e094298c24d86..c3b07730de62026e7b55e49b5b801a9cfacf3b76 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.51",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-51-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
index 1af3b6d325cee90e1e02d6a3f8bc7dc0aa1bb05e..e0eb4351c3b80626e4996c3805dd9a6234a654ab 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.52",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-52-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
index 4b8d1a0992e25e94c93b7d7772cc3d2ff7f6e07d..a91fdc3f20793da880884d5e3f286ba1c3453117 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.53",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-53-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
index a31bbd05c554650ab4c64d71bd53ac5cff7439eb..b01b9eb73f1c35401b3c874e8b1b29c4e919941d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.54",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-54-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
index 23f693d0794f6dec8f686662ff0757736aacfabc..c25770a99e6638ebc0c599bc83ae804a46c05f2c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.55",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-55-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
index e89257e762bbd279620a4db9f5499e2859fe19f5..7f11161a6c4443cc7c0e1c4e810a2bb6300ef733 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.57",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-57-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
index 03381c0a9f081d95e320450b42be1d32942491a2..61608ee55d5aee1d4bc03b987894c440eeeca46f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.58",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-58-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
index 8559899dd45b0588c586c63b8639c7cf2223c39a..63d8d734e6def747ad3658cb72db36d99d73e9a4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.59",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-59-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
index 104316b02fb64bc38840feeaf3ee2b900db3c4e0..8a52677fd250cd7649be593b7b0b514e0a3c85fa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.6",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-6-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
index b270d82486043d92896789b79e1b0502ee0a9791..dd954469e5aca6138663931a52d9c260f2ab8000 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.60",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-60-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
index 851649e82a13862c634c7efa4c022916b1415f77..84d9d8573318f509de46aebe6602b0cd4faf88f5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.61",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-61-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
index 7447cc9f36ead01be85f5fd29f00dfdf0047c35c..f930be81e88376fb6bbb63d37f3d77086a7b3101 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.62",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-62-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
index be1d780d35d5224b4deb724204d7bdaabda74016..39c70f11de314114ce47c8abebf8b07ac5c7d156 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.63",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-63-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
index 9f79e0348f5924d7acdac95ec234b11738eea24d..4c0e8cb2dc28322429d168a47ff68aeb8a343f22 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.64",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-64-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
index 96f66a0857fad372b1de2f1f4b087aab170b3997..a6e32f15c3ff3decca81a1e38b60df265fb328cb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.65",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-65-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
index d340f4996254cd173f49bc32dd7f540dfe726c1b..b7727c66d881a0af3debe65e79a8adc2226aa9a8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.66",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-66-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
index 27eeda124a4e6d5974751420598739e535501107..957907843172ee8da66b291e8f3adeb61c78fead 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.67",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-67-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
index 0fc7f0ede71226984257c8f876a15c53e901d9b2..bd4a69ef04f7e150bb26c7442c198d2cd1355fda 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.68",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-68-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
index c27c3ec673e6619f85bd5e8b305c36737cbd4ebf..97c19a78b280694a96e7e740c7325def9a16465c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.69",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-69-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
index 32800c5cb1866295d88e4e9bbb8f2efe9787d77a..44c971d6df28fff9f84f05652943851fffa85dd5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.7",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-7-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
index 6aa0565eb3efd3b568b91b8e62997aebcc31d1fb..1510f0173137b81d075f4f0eb2082513ce6b3e42 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.70",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-70-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
index ee4ab9ca9704e6bdf8f31e307ff8c3c26fa8ac6f..7b0ca215994e0d7c6e264fcce094e196cbdba7f3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.71",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-71-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
index f053827da7db432b0d4c8fcd3167643d2267a529..472ed26ad3c333376b131e605cdeb2d15809770b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.72",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-72-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
index 69da37185e46197f542037d08546201e52bd0ad3..6b10b3cb6b171c1ddb5856c03d8f1ec294b4958e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.73",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-73-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
index d18510519651c63c3c9a6d34876964d44ce00c24..afb6315bf6aee21d93209ce3b797369b07a3497b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.74",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-74-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
index a3b643867146524653730d75bd22b83c74e629bb..9f73c07d58425f6ed3c4a7e456da85dea886e9d4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.75",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-75-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
index 54a93ad7485bbc3bb255cd1cbc24bfbdd37a516c..f771392ea1b233c1a3b23086bf74c9e223cb8201 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.76",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-76-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
index 95eb423904332e24f7b0059f6000aa5126946260..6bafc7e119f7e18cbf66f54f31890ea5153f85bd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.77",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-77-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
index d8825f42fb92550ae203537ea89453e8cfab0234..0420441ee40ad7bcfa4126c557bb42269e1c09b1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.78",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-78-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
index 911348e613e7be214a32f422329d670d1a81ac1e..fe061997be3fb8185af1800812215d6e150e223d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.79",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-79-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
index 9cda7d883fa31430bb8caaa81d8d2bbbfdfb8e16..06a9c4245b57bfb8f74128cdadbb8b0222d424ce 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.8",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-8-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
index ead28c5d4054857b1e0f4282cf551f8a26ce1a8f..7367707dacb7db123bc2d3d4ac2ffea42899dbdc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.80",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-80-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
index 72d9d5c71eb6a7848ea75d471845dc9c607bd035..f7fbfa95a408b2c411f07be9c66be811c59a5d94 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.81",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-81-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
index de961099479229d6de835fafb93bd6707fd91a17..466f61b230ff798fda3527d82b4e6dd4c4ef92bd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.82",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-82-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index da628b613f87d374dc0daffde440eda74ba60c56..166ea2aebfd8319e22cb7aa2cb7f177f9d463669 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.84",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-84-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
index 607aee242ec49ee2082c340a098fee8631309c1d..82d8710f0f479485ed8a32d4384a45adddccce50 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.85",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-85-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
index 2833375a51ac63474148bdf92d42094a4d4ab563..5c1e6f172121b0eef8cbdc04dc3de8452b140d45 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.87",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-87-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
index 686b234f5ea6c49c8c7c3fdcaffdd40987b36876..7093a3be0c0339a776d4b9fcbebe687bfc08391a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.88",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-88-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
index bbf89339fd99647ed6050367157f37e26d8968d2..7bf12c80544fb5fb76cc7dac0eac879d105748f6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.89",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-89-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
index d3b3e2bc958fdff90bdb6d24c54419d8d26bdac1..e5dc84496fc791592a87341a2bfab64f35f318bc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.9",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-9-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
index 277c6e273170dc858aa9aedc575cf34141dbde30..266f47a3518a4e1b55a9b7ceb8df52e41d13493b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.90",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-90-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
index 016785bcd0dde0a30e367a3b6e8ed4e8628e6cfe..6f10b777d51864c08f596457babbf3c7a2563fee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.91",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-91-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
index 24545f870e8e21e6c8cd4d7d0a0f9baed60886f9..7e7cd6f475296a8b6e13a778ce1542018e062766 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.92",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-92-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
index e8424f7f3e8f13bce28164447d5902c0d43d6e1e..1f16bdbfd3137c7e82fec8707669bdd0a3750639 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.93",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-93-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
index 89481317564d21f01382efd1a82c80305838416c..65c3ee10348d8e445562ee9899b287b2d910e1bb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.95",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-95-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
index d8bd9aef4f837b4d830cdf9a77982fa9ead903eb..9391b1dcedfb08af23feb950f9cc7feef6f1e36b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.97",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-97-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
index c5e289fa15b530c3ab399207ac3684a46fe251b9..3671897bb37fd7d5393f959a7e704ea319be8375 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
@@ -17,9 +17,6 @@
   "gpu": {
     "gpu": false
   },
-  "ib0": {
-    "switch": "sgrapheneib"
-  },
   "kavlan": {
     "eth0": {
       "kavlan-1": "192.168.194.99",
@@ -120,6 +117,7 @@
       "name": "ib0",
       "network_address": "graphene-99-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
+      "switch": "sgrapheneib",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml
index cd986c7ee353fed3d3a40af1bff14f8918160469..7f416cd7efe39e1b2ea407377b6e8057c56ad840 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml
@@ -12,8 +12,8 @@ nodes:
 
   graphene-[1-144]:
     network_adapters:
-    ib0:
-      switch: sgrapheneib
+      ib0:
+        switch: sgrapheneib
 
   graphene-1:
     network_adapters: