diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index dbf6aa67c08c859067e568d46b74016f2aac0c9b..57f9c5c4a6930711b5ab40ad1186a7d2b7a22e1d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -9,12 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "myri0",
+      "driver": "mx_driver",
+      "enabled": true,
+      "interface": "Myrinet",
+      "ip": null,
+      "mac": null,
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-1-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.1",
-      "mac": "00:11:25:91:47:F2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +48,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.1",
-      "mac": "00:60:DD:47:5A:A4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-1-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.1",
-      "mac": "00:11:25:C4:35:7E",
+      "ip": "00:11:25:C4:35:7E",
+      "mac": "172.24.1.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +71,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.1",
-      "mac": "00:11:25:C4:35:7F",
+      "ip": "00:11:25:C4:35:7F",
+      "mac": "172.24.128.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-1-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 5c269006d6c36f5c4378d35d64e921f34840817f..5d50d60c9f4378329b0099b898c384418428b88d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.10",
-      "mac": "00:11:25:91:47:58",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.10",
-      "mac": "00:60:DD:47:59:65",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-10-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.10",
-      "mac": "00:11:25:C4:33:38",
+      "ip": "00:11:25:C4:33:38",
+      "mac": "172.24.1.10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.10",
-      "mac": "00:11:25:C4:33:39",
+      "ip": "00:11:25:C4:33:39",
+      "mac": "172.24.128.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-10-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index 2f115818f1d4bd3f81bde2cebe5447a83d27121c..47615c72dc7a413c49eded5adedf4a1556fe2484 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.28",
-      "mac": "00:11:25:91:48:B7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.28",
-      "mac": "00:60:DD:47:5A:8B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-100-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.28",
-      "mac": "00:11:25:C4:4E:BE",
+      "ip": "00:11:25:C4:4E:BE",
+      "mac": "172.24.9.28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.28",
-      "mac": "00:11:25:C4:4E:BF",
+      "ip": "00:11:25:C4:4E:BF",
+      "mac": "172.24.136.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-100-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index 9f3b0e342c3e11a274e5243c69de5c5d3fddadd6..56655f4e7961092374515096b884e1afca52f41e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.29",
-      "mac": "00:11:25:91:45:DF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.29",
-      "mac": "00:60:DD:47:67:8C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-101-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.29",
-      "mac": "00:11:25:C4:51:8C",
+      "ip": "00:11:25:C4:51:8C",
+      "mac": "172.24.9.29",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.29",
-      "mac": "00:11:25:C4:51:8D",
+      "ip": "00:11:25:C4:51:8D",
+      "mac": "172.24.136.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-101-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index c51df25b37e340908e8454f29b4ee4c45ecb5486..eb485f16bdbc14b163a9f038425333d59b2ed8df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.30",
-      "mac": "00:11:25:91:49:61",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.30",
-      "mac": "00:60:DD:47:68:44",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-102-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.30",
-      "mac": "00:11:25:C4:4E:DE",
+      "ip": "00:11:25:C4:4E:DE",
+      "mac": "172.24.9.30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.30",
-      "mac": "00:11:25:C4:4E:DF",
+      "ip": "00:11:25:C4:4E:DF",
+      "mac": "172.24.136.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-102-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 10f524f9618d42eca3ea1fc3739820cb1b867a4b..378971eb42bfa616fb11f2d1a3b63b7ac292b0db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.31",
-      "mac": "00:11:25:91:46:1D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.31",
-      "mac": "00:60:DD:47:67:8B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-103-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.31",
-      "mac": "00:11:25:C4:4E:FC",
+      "ip": "00:11:25:C4:4E:FC",
+      "mac": "172.24.9.31",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.31",
-      "mac": "00:11:25:C4:4E:FD",
+      "ip": "00:11:25:C4:4E:FD",
+      "mac": "172.24.136.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-103-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index 5df685854f9282adf278ce356c93ffb2af08dbde..6444a9388d949abdbe94b3d641f81e78110ba22e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.32",
-      "mac": "00:11:25:91:47:78",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.32",
-      "mac": "00:60:DD:47:67:8E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-104-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.32",
-      "mac": "00:11:25:C4:52:4A",
+      "ip": "00:11:25:C4:52:4A",
+      "mac": "172.24.9.32",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.32",
-      "mac": "00:11:25:C4:52:4B",
+      "ip": "00:11:25:C4:52:4B",
+      "mac": "172.24.136.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-104-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index e39863dc4b9e4e561becf2fc2d3817eb81d9900d..eac99d4aba2182930f91c11df8d412d89f90c506 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.33",
-      "mac": "00:11:25:91:49:14",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.33",
-      "mac": "00:60:DD:47:68:4A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-105-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.33",
-      "mac": "00:11:25:C4:4F:0A",
+      "ip": "00:11:25:C4:4F:0A",
+      "mac": "172.24.9.33",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.33",
-      "mac": "00:11:25:C4:4F:0B",
+      "ip": "00:11:25:C4:4F:0B",
+      "mac": "172.24.136.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-105-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index 429a034703327df24f2fa484024224b246f3d900..76af8cd62925b5446ae3022b535dc20047ddb4b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.34",
-      "mac": "00:11:25:91:47:6A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.34",
-      "mac": "00:60:DD:47:67:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-106-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.34",
-      "mac": "00:11:25:C4:4E:C2",
+      "ip": "00:11:25:C4:4E:C2",
+      "mac": "172.24.9.34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.34",
-      "mac": "00:11:25:C4:4E:C3",
+      "ip": "00:11:25:C4:4E:C3",
+      "mac": "172.24.136.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-106-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index 4746500eca0481b41c950f0140eda14dcb15b88c..84ed113c39029dc74545de109999c8e891188d51 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.35",
-      "mac": "00:11:25:91:48:8A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.35",
-      "mac": "00:60:DD:47:68:19",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-107-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.35",
-      "mac": "00:11:25:C4:4E:D2",
+      "ip": "00:11:25:C4:4E:D2",
+      "mac": "172.24.9.35",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.35",
-      "mac": "00:11:25:C4:4E:D3",
+      "ip": "00:11:25:C4:4E:D3",
+      "mac": "172.24.136.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-107-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index 07a2c0014201e10980f2f7c6aa5b8cf259d69f71..f629fdfd2e39819d8a5d6797dd3d7a8b6805d9aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.36",
-      "mac": "00:11:25:91:47:DC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.36",
-      "mac": "00:60:DD:47:68:12",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-108-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.36",
-      "mac": "00:11:25:C4:51:BC",
+      "ip": "00:11:25:C4:51:BC",
+      "mac": "172.24.9.36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.36",
-      "mac": "00:11:25:C4:51:BD",
+      "ip": "00:11:25:C4:51:BD",
+      "mac": "172.24.136.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-108-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index 1099580c212ffbd382937a0b7253dba4b4a073ba..abdcdee1cee772d28d35d53616d802a4d3501c35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.1",
-      "mac": "00:11:25:91:45:F1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.1",
-      "mac": "00:60:DD:47:59:7E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-109-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.1",
-      "mac": "00:11:25:C4:53:22",
+      "ip": "00:11:25:C4:53:22",
+      "mac": "172.24.10.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.1",
-      "mac": "00:11:25:C4:53:23",
+      "ip": "00:11:25:C4:53:23",
+      "mac": "172.24.137.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-109-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index 06308541fd1fa4294ca0614d0d4e6fd654188332..579af1881eca66b18d7c856259dc323b225475cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.11",
-      "mac": "00:11:25:91:48:EE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.11",
-      "mac": "00:60:DD:47:5A:53",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-11-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.11",
-      "mac": "00:11:25:C4:34:3E",
+      "ip": "00:11:25:C4:34:3E",
+      "mac": "172.24.1.11",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.11",
-      "mac": "00:11:25:C4:34:3F",
+      "ip": "00:11:25:C4:34:3F",
+      "mac": "172.24.128.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-11-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 4800e2a993d703806f3bfa3d17ebc1f427c77ab0..c899ccb660fd3a6e8d5174c959598e3264d9cfa4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.2",
-      "mac": "00:11:25:91:45:DE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.2",
-      "mac": "00:60:DD:47:5A:A7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-110-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.2",
-      "mac": "00:11:25:C4:51:A4",
+      "ip": "00:11:25:C4:51:A4",
+      "mac": "172.24.10.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.2",
-      "mac": "00:11:25:C4:51:A5",
+      "ip": "00:11:25:C4:51:A5",
+      "mac": "172.24.137.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-110-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index 8c35faba69eade6daa0ddc444de89d44b61769c5..95895d6a285fb62d1d8d6f8a7cf57f880fda5f37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.3",
-      "mac": "00:11:25:91:46:7C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.3",
-      "mac": "00:60:DD:47:65:C2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-111-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.3",
-      "mac": "00:11:25:C4:50:30",
+      "ip": "00:11:25:C4:50:30",
+      "mac": "172.24.10.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.3",
-      "mac": "00:11:25:C4:50:31",
+      "ip": "00:11:25:C4:50:31",
+      "mac": "172.24.137.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-111-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index a730d10b068b41442c560a8df8c3276303789cc2..a6b510e58cd93abe547efae238b3bf11c428c301 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.4",
-      "mac": "00:11:25:91:48:7F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.4",
-      "mac": "00:60:DD:47:65:4F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-112-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.4",
-      "mac": "00:11:25:C4:4F:C6",
+      "ip": "00:11:25:C4:4F:C6",
+      "mac": "172.24.10.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.4",
-      "mac": "00:11:25:C4:4F:C7",
+      "ip": "00:11:25:C4:4F:C7",
+      "mac": "172.24.137.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-112-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index 429b79be99698eaf42e822e38158fe183bb686a7..635a518f002ce205de34a374c19bbb89a5c28f62 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.5",
-      "mac": "00:11:25:91:45:9C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.5",
-      "mac": "00:60:DD:47:5A:56",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-113-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.5",
-      "mac": "00:11:25:C4:51:48",
+      "ip": "00:11:25:C4:51:48",
+      "mac": "172.24.10.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.5",
-      "mac": "00:11:25:C4:51:49",
+      "ip": "00:11:25:C4:51:49",
+      "mac": "172.24.137.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-113-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index 0f566bfd2df82d03397af758646fc1eb6e0f1bf0..5c821e03b6be707c6dbd3cf0c34575beaccb9e88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.6",
-      "mac": "00:11:25:91:47:AA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.6",
-      "mac": "00:60:DD:47:66:01",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-114-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.6",
-      "mac": "00:11:25:C4:53:00",
+      "ip": "00:11:25:C4:53:00",
+      "mac": "172.24.10.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.6",
-      "mac": "00:11:25:C4:53:01",
+      "ip": "00:11:25:C4:53:01",
+      "mac": "172.24.137.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-114-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index f1efc13f7233c01a637c2fd9de22068c4d1013ad..80a7fa399f65ff0666c394c8cfdd806b294f861a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.7",
-      "mac": "00:11:25:91:48:5C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.7",
-      "mac": "00:60:DD:47:65:B9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-115-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.7",
-      "mac": "00:11:25:C4:4E:44",
+      "ip": "00:11:25:C4:4E:44",
+      "mac": "172.24.10.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.7",
-      "mac": "00:11:25:C4:4E:45",
+      "ip": "00:11:25:C4:4E:45",
+      "mac": "172.24.137.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-115-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index ca39b1574ae2ea195c5866496f300be0af347b44..ca8fb6221c6ed7882c71d6a774e3406a68d5b65f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.8",
-      "mac": "00:11:25:91:45:BA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.8",
-      "mac": "00:60:DD:47:59:39",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-116-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.8",
-      "mac": "00:11:25:C4:52:A2",
+      "ip": "00:11:25:C4:52:A2",
+      "mac": "172.24.10.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.8",
-      "mac": "00:11:25:C4:52:A3",
+      "ip": "00:11:25:C4:52:A3",
+      "mac": "172.24.137.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-116-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index c0ac350d10a2d1fd906eba2e4b7d7c2c95d030af..442fd7a682d8af92fa2d7dda3ba2b4594c9afda4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.9",
-      "mac": "00:11:25:91:45:94",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.9",
-      "mac": "00:60:DD:47:65:BC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-117-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.9",
-      "mac": "00:11:25:C4:52:EC",
+      "ip": "00:11:25:C4:52:EC",
+      "mac": "172.24.10.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.9",
-      "mac": "00:11:25:C4:52:ED",
+      "ip": "00:11:25:C4:52:ED",
+      "mac": "172.24.137.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-117-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 6c857b4baf9d6a082501df7cc823803b9f8d7475..0802178b5562d53049616181363ef54ff12fb489 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.10",
-      "mac": "00:11:25:91:48:5B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.10",
-      "mac": "00:60:DD:47:66:1B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-118-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.10",
-      "mac": "00:11:25:C4:53:EA",
+      "ip": "00:11:25:C4:53:EA",
+      "mac": "172.24.10.10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.10",
-      "mac": "00:11:25:C4:53:EB",
+      "ip": "00:11:25:C4:53:EB",
+      "mac": "172.24.137.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-118-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 5685110da7202d846d00d38b3d33dfbee23bdfcc..cadcb15bbdeee9c4e9d0b1f27ff23d75d3c309f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.11",
-      "mac": "00:11:25:91:46:15",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.11",
-      "mac": "00:60:DD:47:65:C1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-119-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.11",
-      "mac": "00:11:25:C4:51:AC",
+      "ip": "00:11:25:C4:51:AC",
+      "mac": "172.24.10.11",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.11",
-      "mac": "00:11:25:C4:51:AD",
+      "ip": "00:11:25:C4:51:AD",
+      "mac": "172.24.137.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-119-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index eb5cfa5ce1512ff5cf7941ea10a2618d44288138..05b16e985ce5e5f99710e8843e4fb30eb6d73d70 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.12",
-      "mac": "00:11:25:91:45:B8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.12",
-      "mac": "00:60:DD:47:59:64",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-12-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.12",
-      "mac": "00:11:25:C4:35:42",
+      "ip": "00:11:25:C4:35:42",
+      "mac": "172.24.1.12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.12",
-      "mac": "00:11:25:C4:35:43",
+      "ip": "00:11:25:C4:35:43",
+      "mac": "172.24.128.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-12-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index b25e3e2701bbfb8f5d7f510c7c335c9aabfc9d54..bcc334c77b2945f5a70f1825d1fa7b7115ea6796 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.137.12",
-      "mac": "00:11:25:91:48:19",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.77.12",
-      "mac": "00:60:DD:47:5A:94",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-120-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.10.12",
-      "mac": "00:11:25:C4:4F:D2",
+      "ip": "00:11:25:C4:4F:D2",
+      "mac": "172.24.10.12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.137.12",
-      "mac": "00:11:25:C4:4F:D3",
+      "ip": "00:11:25:C4:4F:D3",
+      "mac": "172.24.137.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-120-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index 072ec7bb8b2142b9d478f0999186515d7b0ac654..288869fbb8defaa1b125729428e250ebd81d7d59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.13",
-      "mac": "00:11:25:91:48:88",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.13",
-      "mac": "00:60:DD:47:59:7D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-121-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.13",
-      "mac": "00:11:25:C4:50:1A",
+      "ip": "00:11:25:C4:50:1A",
+      "mac": "172.24.11.13",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.13",
-      "mac": "00:11:25:C4:50:1B",
+      "ip": "00:11:25:C4:50:1B",
+      "mac": "172.24.138.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-121-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index 8ccd13382ac9b5006bf99631d76ce453f1a0a162..02f6e7f905925bd4fb3433aa9bca797fa1ead10b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.14",
-      "mac": "00:11:25:91:46:29",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.14",
-      "mac": "00:60:DD:47:59:3F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-122-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.14",
-      "mac": "00:11:25:C4:4D:84",
+      "ip": "00:11:25:C4:4D:84",
+      "mac": "172.24.11.14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.14",
-      "mac": "00:11:25:C4:4D:85",
+      "ip": "00:11:25:C4:4D:85",
+      "mac": "172.24.138.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-122-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index f27294604ab26c4d2e01b4f0f68405055ad7657e..bf782ae0edca39daa60e1b63c5563a6d582068aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.15",
-      "mac": "00:11:25:91:45:F2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.15",
-      "mac": "00:60:DD:47:59:7A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-123-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.15",
-      "mac": "00:11:25:C4:4E:B0",
+      "ip": "00:11:25:C4:4E:B0",
+      "mac": "172.24.11.15",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.15",
-      "mac": "00:11:25:C4:4E:B1",
+      "ip": "00:11:25:C4:4E:B1",
+      "mac": "172.24.138.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-123-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index 18904248fa872bcb96e3ecd3c365e505405cda23..1bf193be9fd37242e6b414fbaf00f4ac51bada3d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.16",
-      "mac": "00:11:25:91:46:6D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.16",
-      "mac": "00:60:DD:47:66:00",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-124-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.16",
-      "mac": "00:11:25:C4:4D:C8",
+      "ip": "00:11:25:C4:4D:C8",
+      "mac": "172.24.11.16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.16",
-      "mac": "00:11:25:C4:4D:C9",
+      "ip": "00:11:25:C4:4D:C9",
+      "mac": "172.24.138.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-124-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index 994d599360fc187d8a2b49e305e28465468ec582..3bc52cf3a2d3732c3f38c503f4c957f906c65538 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.17",
-      "mac": "00:11:25:91:46:45",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.17",
-      "mac": "00:60:DD:47:5A:55",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-125-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.17",
-      "mac": "00:11:25:C4:51:F8",
+      "ip": "00:11:25:C4:51:F8",
+      "mac": "172.24.11.17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.17",
-      "mac": "00:11:25:C4:51:F9",
+      "ip": "00:11:25:C4:51:F9",
+      "mac": "172.24.138.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-125-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index 6284241b9ebd88346b5f302e7807c86f34102e61..3f9d61486297f81f0f187f5d01b59a87331d2ad7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.18",
-      "mac": "00:11:25:91:48:37",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.18",
-      "mac": "00:60:DD:47:88:FD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-126-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.18",
-      "mac": "00:11:25:C4:53:0E",
+      "ip": "00:11:25:C4:53:0E",
+      "mac": "172.24.11.18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.18",
-      "mac": "00:11:25:C4:53:0F",
+      "ip": "00:11:25:C4:53:0F",
+      "mac": "172.24.138.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-126-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index 81b6f4f9387a3e00d0efe79ea408171608fc5d8b..e1a84530d93b45623dbdcac6020b356a2d13224d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.19",
-      "mac": "00:11:25:91:46:88",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.19",
-      "mac": "00:60:DD:47:65:D9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-127-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.19",
-      "mac": "00:11:25:C4:4D:94",
+      "ip": "00:11:25:C4:4D:94",
+      "mac": "172.24.11.19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.19",
-      "mac": "00:11:25:C4:4D:95",
+      "ip": "00:11:25:C4:4D:95",
+      "mac": "172.24.138.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-127-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index f714500f4a7aff08d3c491278e78bba8d9201491..e89105c350becad6751daaef0836733b525758a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.20",
-      "mac": "00:11:25:91:46:02",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.20",
-      "mac": "00:60:DD:47:67:FC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-128-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.20",
-      "mac": "00:11:25:C4:53:18",
+      "ip": "00:11:25:C4:53:18",
+      "mac": "172.24.11.20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.20",
-      "mac": "00:11:25:C4:53:19",
+      "ip": "00:11:25:C4:53:19",
+      "mac": "172.24.138.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-128-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 0687bb32fbf809e96cbdcea3fb7185ffa172e2ac..c99962081d43b27bee0694e37f2005a443b8cbd9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.21",
-      "mac": "00:11:25:91:45:FB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.21",
-      "mac": "00:60:DD:47:59:32",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-129-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.21",
-      "mac": "00:11:25:C4:4D:80",
+      "ip": "00:11:25:C4:4D:80",
+      "mac": "172.24.11.21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.21",
-      "mac": "00:11:25:C4:4D:81",
+      "ip": "00:11:25:C4:4D:81",
+      "mac": "172.24.138.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-129-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index dde83e1723231231072cac79038edb4004731088..c7a68286889c9e81bd0e315434b2fa91c96e890a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.13",
-      "mac": "00:11:25:91:48:02",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.13",
-      "mac": "00:60:DD:47:5A:99",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-13-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.13",
-      "mac": "00:11:25:C4:34:48",
+      "ip": "00:11:25:C4:34:48",
+      "mac": "172.24.2.13",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.13",
-      "mac": "00:11:25:C4:34:49",
+      "ip": "00:11:25:C4:34:49",
+      "mac": "172.24.129.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-13-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index f26acc12ebcd816759b93093597da09f3f19aa7e..700b4fa45988e0a176df847d00cb168ad14e0824 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.22",
-      "mac": "00:11:25:91:45:A5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.22",
-      "mac": "00:60:DD:47:59:FD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-130-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.22",
-      "mac": "00:11:25:C4:54:6A",
+      "ip": "00:11:25:C4:54:6A",
+      "mac": "172.24.11.22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.22",
-      "mac": "00:11:25:C4:54:6B",
+      "ip": "00:11:25:C4:54:6B",
+      "mac": "172.24.138.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-130-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index 417f5eaab0268516defe7867ca142f78358d3725..57e99f7c156bd612250dee38d8d7aa4a360e8764 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.23",
-      "mac": "00:11:25:91:46:AA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.23",
-      "mac": "00:60:DD:47:59:6B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-131-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.23",
-      "mac": "00:11:25:C4:54:86",
+      "ip": "00:11:25:C4:54:86",
+      "mac": "172.24.11.23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.23",
-      "mac": "00:11:25:C4:54:87",
+      "ip": "00:11:25:C4:54:87",
+      "mac": "172.24.138.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-131-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index a6c9edb7cca68aac2d21001212c7e060d7ef68bd..4f47a23b5e46a76139437a9c63b501a1200a3ffe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.138.24",
-      "mac": "00:11:25:91:47:E3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.78.24",
-      "mac": "00:60:DD:47:5A:BF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-132-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.11.24",
-      "mac": "00:11:25:C4:4E:58",
+      "ip": "00:11:25:C4:4E:58",
+      "mac": "172.24.11.24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.138.24",
-      "mac": "00:11:25:C4:4E:59",
+      "ip": "00:11:25:C4:4E:59",
+      "mac": "172.24.138.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-132-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index 58b04daf0e574db25ba4bdce583a88c3111f907d..2964279ff9e412cb9e6e720c7d0afc660a020fa6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.25",
-      "mac": "00:11:25:91:47:93",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.25",
-      "mac": "00:60:DD:47:59:B7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-133-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.25",
-      "mac": "00:11:25:C4:4E:82",
+      "ip": "00:11:25:C4:4E:82",
+      "mac": "172.24.12.25",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.25",
-      "mac": "00:11:25:C4:4E:83",
+      "ip": "00:11:25:C4:4E:83",
+      "mac": "172.24.139.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-133-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index 8077e13553bb008a77d3f6cc6e32eacb162f287d..ec5408d2bfcba07536f5fc7cffcfa9b72f50f10c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.26",
-      "mac": "00:11:25:91:48:1D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.26",
-      "mac": "00:60:DD:47:65:BE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-134-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.26",
-      "mac": "00:11:25:C4:4F:4E",
+      "ip": "00:11:25:C4:4F:4E",
+      "mac": "172.24.12.26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.26",
-      "mac": "00:11:25:C4:4F:4F",
+      "ip": "00:11:25:C4:4F:4F",
+      "mac": "172.24.139.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-134-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index b6e1ba42d0b7ade2137c575aa37f54fec5cba7b1..7f87fd4fde369d50b83fec6e9d82f7d22ae8c045 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.27",
-      "mac": "00:11:25:91:47:6B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.27",
-      "mac": "00:60:DD:47:59:70",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-135-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.27",
-      "mac": "00:11:25:C4:53:E6",
+      "ip": "00:11:25:C4:53:E6",
+      "mac": "172.24.12.27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.27",
-      "mac": "00:11:25:C4:53:E7",
+      "ip": "00:11:25:C4:53:E7",
+      "mac": "172.24.139.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-135-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 3a5444e6b31abc164ac34bfb99ae79e7a9b61b39..24f700db0d79e835bb9a54490265603f3fb7284a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.28",
-      "mac": "00:11:25:91:48:A0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.28",
-      "mac": "00:60:DD:47:65:BD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-136-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.28",
-      "mac": "00:11:25:C4:4D:40",
+      "ip": "00:11:25:C4:4D:40",
+      "mac": "172.24.12.28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.28",
-      "mac": "00:11:25:C4:4D:41",
+      "ip": "00:11:25:C4:4D:41",
+      "mac": "172.24.139.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-136-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index 710761941624867a2245f14486cc606d85038031..2ff46d6c130e6de62cb7dfa74bdeb99874e83c90 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.29",
-      "mac": "00:11:25:91:45:C6",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.29",
-      "mac": "00:60:DD:47:5A:A5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-137-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.29",
-      "mac": "00:11:25:C4:4F:E2",
+      "ip": "00:11:25:C4:4F:E2",
+      "mac": "172.24.12.29",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.29",
-      "mac": "00:11:25:C4:4F:E3",
+      "ip": "00:11:25:C4:4F:E3",
+      "mac": "172.24.139.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-137-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index 9762069724585799a159c4f237affe2eb8ae910b..83a4d21b57e3870d06f45933a17bf6149e742d66 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.30",
-      "mac": "00:11:25:91:46:22",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.30",
-      "mac": "00:60:DD:47:5A:76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-138-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.30",
-      "mac": "00:11:25:C4:4D:4A",
+      "ip": "00:11:25:C4:4D:4A",
+      "mac": "172.24.12.30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.30",
-      "mac": "00:11:25:C4:4D:4B",
+      "ip": "00:11:25:C4:4D:4B",
+      "mac": "172.24.139.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-138-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index d2da700c86c0f5dbcb841f924b2f6d7b29555093..de572ea71ffb052c1d167e3e699f0b0f347a4686 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.31",
-      "mac": "00:11:25:91:45:CF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.31",
-      "mac": "00:60:DD:47:65:AA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-139-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.31",
-      "mac": "00:11:25:C4:38:DE",
+      "ip": "00:11:25:C4:38:DE",
+      "mac": "172.24.12.31",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.31",
-      "mac": "00:11:25:C4:38:DF",
+      "ip": "00:11:25:C4:38:DF",
+      "mac": "172.24.139.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-139-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index a0b11aaf91df54fb27f8aefdfbcd031bcf2eab36..d3d880b2d910beb5c5ab73c98f19eb4c5db17906 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.14",
-      "mac": "00:11:25:91:48:91",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.14",
-      "mac": "00:60:DD:47:5A:5A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-14-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.14",
-      "mac": "00:11:25:C4:34:3C",
+      "ip": "00:11:25:C4:34:3C",
+      "mac": "172.24.2.14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.14",
-      "mac": "00:11:25:C4:34:3D",
+      "ip": "00:11:25:C4:34:3D",
+      "mac": "172.24.129.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-14-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index 95975824715f5bed19c84cc512222b4b76ce98a8..dd26e15e1fe1588bf9c52031fff8c469b2bbc3aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.32",
-      "mac": "00:11:25:91:48:32",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.32",
-      "mac": "00:60:DD:47:59:62",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-140-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.32",
-      "mac": "00:11:25:C4:24:02",
+      "ip": "00:11:25:C4:24:02",
+      "mac": "172.24.12.32",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.32",
-      "mac": "00:11:25:C4:24:03",
+      "ip": "00:11:25:C4:24:03",
+      "mac": "172.24.139.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-140-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 145ec33bec72d767b1842a366d0995ff7ff8a4bf..5270a0c8b2ae2ba308d3cba2210f447e6e8b1ba2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.33",
-      "mac": "00:11:25:91:48:63",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.33",
-      "mac": "00:60:DD:47:5A:B7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-141-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.33",
-      "mac": "00:11:25:C4:3F:A8",
+      "ip": "00:11:25:C4:3F:A8",
+      "mac": "172.24.12.33",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.33",
-      "mac": "00:11:25:C4:3F:A9",
+      "ip": "00:11:25:C4:3F:A9",
+      "mac": "172.24.139.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-141-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 205c60ebefbebc2a81fbe77e61fd4a0af7fb3c15..9ec49dd8c2cda579789624fe4f992692d1b24416 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.34",
-      "mac": "00:11:25:91:46:41",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.34",
-      "mac": "00:60:DD:47:59:B6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-142-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.34",
-      "mac": "00:11:25:C4:4F:D8",
+      "ip": "00:11:25:C4:4F:D8",
+      "mac": "172.24.12.34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.34",
-      "mac": "00:11:25:C4:4F:D9",
+      "ip": "00:11:25:C4:4F:D9",
+      "mac": "172.24.139.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-142-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 62188b6ddaf66773f1700de115269ec911583c37..0c86c82dd2736135ef9dd5a232d8d0e632b2e06c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.35",
-      "mac": "00:11:25:91:48:33",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.35",
-      "mac": "00:60:DD:47:5A:B9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-143-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.35",
-      "mac": "00:11:25:C4:4F:AA",
+      "ip": "00:11:25:C4:4F:AA",
+      "mac": "172.24.12.35",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.35",
-      "mac": "00:11:25:C4:4F:AB",
+      "ip": "00:11:25:C4:4F:AB",
+      "mac": "172.24.139.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-143-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index ed39aaa2f476db01ad427acc72b1124dc887c8ab..445fd3e68d296f274faa8008e0c461a6fe5e0a4e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Keeps restarting every 3 seconds.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.139.36",
-      "mac": "00:11:25:91:45:A6",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.79.36",
-      "mac": "00:60:DD:47:5A:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-144-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.12.36",
-      "mac": "00:11:25:C4:50:0E",
+      "ip": "00:11:25:C4:50:0E",
+      "mac": "172.24.12.36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.139.36",
-      "mac": "00:11:25:C4:50:0F",
+      "ip": "00:11:25:C4:50:0F",
+      "mac": "172.24.139.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-144-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index 342ad61af8f59561017e314e0303289815af3d6e..026ca17677f864e1ea5809f063b6c06671dda534 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.1",
-      "mac": "00:11:25:91:45:AD",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.1",
-      "mac": "00:60:DD:47:68:7B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-145-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.1",
-      "mac": "00:11:25:C4:50:20",
+      "ip": "00:11:25:C4:50:20",
+      "mac": "172.24.13.1",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-145.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.1",
-      "mac": "00:11:25:C4:50:21",
+      "ip": "00:11:25:C4:50:21",
+      "mac": "172.24.140.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-145-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 1abbd1920d58319e7cb9284257fc69794190f866..f3bd7e3b2eaee0340e95ee4e5f159dc299532363 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.2",
-      "mac": "00:11:25:91:46:B4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.2",
-      "mac": "00:60:DD:47:5A:73",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-146-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.2",
-      "mac": "00:11:25:C4:4D:4C",
+      "ip": "00:11:25:C4:4D:4C",
+      "mac": "172.24.13.2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-146.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.2",
-      "mac": "00:11:25:C4:4D:4D",
+      "ip": "00:11:25:C4:4D:4D",
+      "mac": "172.24.140.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-146-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index b02dfd639c6ce00388012feb2982daafe9382e76..b4d3084b1551d5f6f31a8610d13e8a51b91537c9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.3",
-      "mac": "00:11:25:91:47:22",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.3",
-      "mac": "00:60:DD:47:59:79",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-147-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.3",
-      "mac": "00:11:25:C4:4D:FE",
+      "ip": "00:11:25:C4:4D:FE",
+      "mac": "172.24.13.3",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-147.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.3",
-      "mac": "00:11:25:C4:4D:FF",
+      "ip": "00:11:25:C4:4D:FF",
+      "mac": "172.24.140.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-147-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index c4117adf922f9a7f52951f300f0fe23bfddffb57..f194a9b89bea0294b2cf399f8a69237c09b9aa32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.4",
-      "mac": "00:11:25:91:47:FC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.4",
-      "mac": "00:60:DD:47:5A:79",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-148-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.4",
-      "mac": "00:11:25:C4:51:06",
+      "ip": "00:11:25:C4:51:06",
+      "mac": "172.24.13.4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-148.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.4",
-      "mac": "00:11:25:C4:51:07",
+      "ip": "00:11:25:C4:51:07",
+      "mac": "172.24.140.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-148-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index d21f037f4125d5200b1d06f4b41b3dffec7395c7..23dae73d70017fb427303775dcefbc404c4a93f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.5",
-      "mac": "00:11:25:91:46:2C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.5",
-      "mac": "00:60:DD:47:5A:C1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-149-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.5",
-      "mac": "00:11:25:C4:4F:C0",
+      "ip": "00:11:25:C4:4F:C0",
+      "mac": "172.24.13.5",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-149.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.5",
-      "mac": "00:11:25:C4:4F:C1",
+      "ip": "00:11:25:C4:4F:C1",
+      "mac": "172.24.140.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-149-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index 42a56e870867a58b7ca50fd2edc7e93d5c6139a2..8a789a5df66b3e229a268f9dbdf828e109161ac6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.15",
-      "mac": "00:11:25:91:48:A2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.15",
-      "mac": "00:60:DD:47:5A:58",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-15-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.15",
-      "mac": "00:11:25:C4:35:9B",
+      "ip": "00:11:25:C4:35:9B",
+      "mac": "172.24.2.15",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.15",
-      "mac": "00:11:25:C4:35:9C",
+      "ip": "00:11:25:C4:35:9C",
+      "mac": "172.24.129.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-15-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index b917356d2d711b40bc7e6489e671ec3c18934ba7..26e80703cdc9123b3c1a17da2df42625785cf669 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.6",
-      "mac": "00:11:25:91:47:B4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.6",
-      "mac": "00:60:DD:47:5A:C3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-150-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.6",
-      "mac": "00:11:25:C4:4F:02",
+      "ip": "00:11:25:C4:4F:02",
+      "mac": "172.24.13.6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-150.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.6",
-      "mac": "00:11:25:C4:4F:03",
+      "ip": "00:11:25:C4:4F:03",
+      "mac": "172.24.140.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-150-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index e96c9bf8dcd59e28cde96a15480015e9320f463b..3515ab5e66ccc904647b40f708b9c213eee385e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.7",
-      "mac": "00:11:25:91:45:9D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.7",
-      "mac": "00:60:DD:47:5A:BD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-151-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.7",
-      "mac": "00:11:25:C4:53:78",
+      "ip": "00:11:25:C4:53:78",
+      "mac": "172.24.13.7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-151.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.7",
-      "mac": "00:11:25:C4:53:79",
+      "ip": "00:11:25:C4:53:79",
+      "mac": "172.24.140.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-151-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 8ce201680d85ab33456ef610a7c33e3f90dbebe6..256594e6e0d67b09435e9a35740fb25b1594f0a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.8",
-      "mac": "00:11:25:91:49:23",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.8",
-      "mac": "00:60:DD:47:65:B3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-152-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.8",
-      "mac": "00:11:25:C4:50:B6",
+      "ip": "00:11:25:C4:50:B6",
+      "mac": "172.24.13.8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-152.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.8",
-      "mac": "00:11:25:C4:50:B7",
+      "ip": "00:11:25:C4:50:B7",
+      "mac": "172.24.140.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-152-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index acfa8d9c69ab93cb182ccb74a1a3c655e8e27503..281bc53cb5ebfcaf6177bc6cf7132f71418bc0f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.9",
-      "mac": "00:11:25:91:46:07",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.9",
-      "mac": "00:60:DD:47:65:DA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-153-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.9",
-      "mac": "00:11:25:C4:50:A8",
+      "ip": "00:11:25:C4:50:A8",
+      "mac": "172.24.13.9",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-153.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.9",
-      "mac": "00:11:25:C4:50:A9",
+      "ip": "00:11:25:C4:50:A9",
+      "mac": "172.24.140.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-153-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 6314dbce10bfb4a3c9019fe1e525786d2cf1ac66..d3200722590c28c581cd8bf0a29f4edbfc37e117 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.10",
-      "mac": "00:11:25:91:46:DE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.10",
-      "mac": "00:60:DD:47:5A:B5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-154-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.10",
-      "mac": "00:11:25:C4:4D:2A",
+      "ip": "00:11:25:C4:4D:2A",
+      "mac": "172.24.13.10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-154.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.10",
-      "mac": "00:11:25:C4:4D:2B",
+      "ip": "00:11:25:C4:4D:2B",
+      "mac": "172.24.140.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-154-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index c8fe4ef7dc758dc0be1388b7afbc6a564dfb5ad9..69a0d71da926eb08ca901ccb1fab2ef72f67b415 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.11",
-      "mac": "00:11:25:91:48:BA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.11",
-      "mac": "00:60:DD:47:5A:8E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-155-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.11",
-      "mac": "00:11:25:C4:50:A2",
+      "ip": "00:11:25:C4:50:A2",
+      "mac": "172.24.13.11",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-155.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.11",
-      "mac": "00:11:25:C4:50:A3",
+      "ip": "00:11:25:C4:50:A3",
+      "mac": "172.24.140.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-155-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index b3ef18d795e65dfc53ddc2f7e74e67b4f74cba6d..8add03fcd71c80c53f8f7d773631d7f13c99911f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.140.12",
-      "mac": "00:11:25:91:48:76",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.80.12",
-      "mac": "00:60:DD:47:5A:BC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-156-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.13.12",
-      "mac": "00:11:25:C4:0B:06",
+      "ip": "00:11:25:C4:0B:06",
+      "mac": "172.24.13.12",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-156.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.140.12",
-      "mac": "00:11:25:C4:0B:07",
+      "ip": "00:11:25:C4:0B:07",
+      "mac": "172.24.140.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-156-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index 2407560fa88a4ebdbbc95bc0bb2e1fcb3c9d139f..56423fec1a9328acfcb9e2b68d2e75faa418a0c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.13",
-      "mac": "00:11:25:91:47:71",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.13",
-      "mac": "00:60:DD:47:5A:B8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-157-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.13",
-      "mac": "00:11:25:C4:52:CA",
+      "ip": "00:11:25:C4:52:CA",
+      "mac": "172.24.14.13",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-157.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.13",
-      "mac": "00:11:25:C4:52:CB",
+      "ip": "00:11:25:C4:52:CB",
+      "mac": "172.24.141.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-157-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 6f8cca54c924d79d10d364f7a214863385c45024..07b450ec6a07c2c5258a3d180dfb3e6e1e4d3879 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.14",
-      "mac": "00:11:25:91:46:B3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.14",
-      "mac": "00:60:DD:47:5A:C2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-158-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.14",
-      "mac": "00:11:25:C4:54:46",
+      "ip": "00:11:25:C4:54:46",
+      "mac": "172.24.14.14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-158.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.14",
-      "mac": "00:11:25:C4:54:47",
+      "ip": "00:11:25:C4:54:47",
+      "mac": "172.24.141.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-158-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index a6980a8cf7589c5b1ce53b6b73ef0d420e91435a..545f14e703bf6547bca38ad92edeed3cb4cf21d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.15",
-      "mac": "00:11:25:91:48:0D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.15",
-      "mac": "00:60:DD:47:5A:77",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-159-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.15",
-      "mac": "00:11:25:C4:4F:82",
+      "ip": "00:11:25:C4:4F:82",
+      "mac": "172.24.14.15",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-159.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.15",
-      "mac": "00:11:25:C4:4F:83",
+      "ip": "00:11:25:C4:4F:83",
+      "mac": "172.24.141.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-159-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index d23a725ae70a02ab8b04c4e0d7f5f16a790d6392..ac5c1ecf5d7c6d870c3b21899810ba87ec5065e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.16",
-      "mac": "00:11:25:91:45:8E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.16",
-      "mac": "00:60:DD:47:68:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-16-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.16",
-      "mac": "00:11:25:C4:2E:CE",
+      "ip": "00:11:25:C4:2E:CE",
+      "mac": "172.24.2.16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.16",
-      "mac": "00:11:25:C4:2E:CF",
+      "ip": "00:11:25:C4:2E:CF",
+      "mac": "172.24.129.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-16-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index d87165c75b6cd9c1965c4bfcc875c101ee618828..f3af39af857041bf96459e1b02984a2c04569c94 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.16",
-      "mac": "00:11:25:91:46:8D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.16",
-      "mac": "00:60:DD:47:59:03",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-160-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.16",
-      "mac": "00:11:25:C4:4F:3A",
+      "ip": "00:11:25:C4:4F:3A",
+      "mac": "172.24.14.16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-160.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.16",
-      "mac": "00:11:25:C4:4F:3B",
+      "ip": "00:11:25:C4:4F:3B",
+      "mac": "172.24.141.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-160-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index f7cbbfc7a14d745387a7e9fd33e6258d31a221f5..8d86c5b1c9efc31d630601df12532a049f4c4949 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.17",
-      "mac": "00:11:25:91:48:B8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.17",
-      "mac": "00:60:DD:47:5A:72",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-161-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.17",
-      "mac": "00:11:25:C4:4F:8E",
+      "ip": "00:11:25:C4:4F:8E",
+      "mac": "172.24.14.17",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-161.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.17",
-      "mac": "00:11:25:C4:4F:8F",
+      "ip": "00:11:25:C4:4F:8F",
+      "mac": "172.24.141.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-161-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 1aab505b7629194db7a5d6964fac60de87d46fad..1f96a382200a0ddda732ed830e711c41100b9c92 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.18",
-      "mac": "00:11:25:91:45:FE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.18",
-      "mac": "00:60:DD:47:5A:BA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-162-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.18",
-      "mac": "00:11:25:C4:4E:B8",
+      "ip": "00:11:25:C4:4E:B8",
+      "mac": "172.24.14.18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-162.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "switch18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.118",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.18",
-      "mac": "00:11:25:C4:4E:B9",
+      "ip": "00:11:25:C4:4E:B9",
+      "mac": "172.24.141.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-162-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index 7b0cb8030c068fbca8692964e2dfe9f89afd61ba..2d3b2d596ffc82e4b3578a6c9fa6616b1864575e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.19",
-      "mac": "00:11:25:91:48:34",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.19",
-      "mac": "00:60:DD:47:65:A7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-163-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.19",
-      "mac": "00:11:25:C4:50:86",
+      "ip": "00:11:25:c4:50:86",
+      "mac": "172.24.14.19",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-163.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.19",
-      "mac": "00:11:25:C4:50:06",
+      "ip": "00:11:25:c4:50:06",
+      "mac": "172.24.141.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-163-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index 35c82354ed301c70eef77135cab1ce5cefe72358..402554a950fc80b9eac86479d3020b13e94b50c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.20",
-      "mac": "00:11:25:91:47:AE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.20",
-      "mac": "00:60:DD:47:5A:C6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-164-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.20",
-      "mac": "00:11:25:C4:53:A0",
+      "ip": "00:11:25:C4:53:A0",
+      "mac": "172.24.14.20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-164.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.20",
-      "mac": "00:11:25:C4:53:A1",
+      "ip": "00:11:25:C4:53:A1",
+      "mac": "172.24.141.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-164-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index d2a5bc50808f45139dcdd50213f9fc63f4864040..ecb72631ce9fcd8bb4b70fb7bdef306a421ee2c2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.21",
-      "mac": "00:11:25:91:45:D0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.21",
-      "mac": "00:60:DD:47:5A:C7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-165-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.21",
-      "mac": "00:11:25:C4:4D:6A",
+      "ip": "00:11:25:C4:4D:6A",
+      "mac": "172.24.14.21",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-165.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.21",
-      "mac": "00:11:25:C4:4D:6B",
+      "ip": "00:11:25:C4:4D:6B",
+      "mac": "172.24.141.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-165-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index e0f7046d107628c4244d7e6d07e855b7109dfea9..aa5ebdee4111a3ee3c2ba2b6e3dee1b8f348c039 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.22",
-      "mac": "00:11:25:91:47:5C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.22",
-      "mac": "00:60:DD:47:59:FE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-166-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.22",
-      "mac": "00:11:25:C4:04:DE",
+      "ip": "changée",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-166.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.22",
-      "mac": "00:11:25:C4:3A:91",
+      "ip": "00:11:25:C4:3A:91",
+      "mac": "172.24.141.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-166-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index b650c47bc3b66e3ee12909c0be72c775ccd8cf5e..8d9b7af0b2d355b56de279403a493512aad2d028 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.23",
-      "mac": "00:11:25:91:46:9C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.23",
-      "mac": "00:60:DD:47:5A:BB",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-167-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.23",
-      "mac": "00:11:25:C4:50:02",
+      "ip": "00:11:25:C4:50:02",
+      "mac": "172.24.14.23",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-167.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.23",
-      "mac": "00:11:25:C4:50:03",
+      "ip": "00:11:25:C4:50:03",
+      "mac": "172.24.141.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-167-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index 0a8d0b7c9b5845d050b85a65b494b47755e18e59..1152cd5cb7afacae9eaa98ee3b6a3608adc50945 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.141.24",
-      "mac": "00:11:25:91:49:17",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.81.24",
-      "mac": "00:60:DD:47:5A:B2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-168-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.14.24",
-      "mac": "00:11:25:C4:54:4C",
+      "ip": "00:11:25:C4:54:4C",
+      "mac": "172.24.14.24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-168.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.141.24",
-      "mac": "00:11:25:C4:54:4D",
+      "ip": "00:11:25:C4:54:4D",
+      "mac": "172.24.141.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-168-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index cbbe870e069cdf152c69658f1f44578649c60136..e13804dc972a9a2d55a9dcdbd7337c61b4bd5488 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.25",
-      "mac": "00:11:25:91:48:F0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.25",
-      "mac": "00:60:DD:47:5A:B3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-169-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.25",
-      "mac": "00:11:25:C4:45:B0",
+      "ip": "00:11:25:C4:45:B0",
+      "mac": "172.24.15.25",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-169.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.25",
-      "mac": "00:11:25:C4:45:B1",
+      "ip": "00:11:25:C4:45:B1",
+      "mac": "172.24.142.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-169-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index a12150db9d15e3dee6119eddcf27e466a27c7419..3014a0f5dba5cfee23ef07f66982b75a5d908791 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.17",
-      "mac": "00:11:25:91:49:4A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.17",
-      "mac": "00:60:DD:47:63:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-17-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.17",
-      "mac": "00:11:25:C4:34:56",
+      "ip": "00:11:25:C4:34:56",
+      "mac": "172.24.2.17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.17",
-      "mac": "00:11:25:C4:34:57",
+      "ip": "00:11:25:C4:34:57",
+      "mac": "172.24.129.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-17-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index fd0a2b6d50b407e8035fde6a6471d21bc0236ecc..2fcb90460f0d331be42768f7118e86a6f73278e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.26",
-      "mac": "00:11:25:91:48:3D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.26",
-      "mac": "00:60:DD:47:59:66",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-170-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.26",
-      "mac": "00:11:25:C4:4D:00",
+      "ip": "00:11:25:C4:4D:00",
+      "mac": "172.24.15.26",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-170.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.26",
-      "mac": "00:11:25:C4:4D:01",
+      "ip": "00:11:25:C4:4D:01",
+      "mac": "172.24.142.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-170-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index 0e70328cb736cd5d49ef59e06d492f861ef92435..639ae62938b9c3dca6729974f381927aaee0da8e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.27",
-      "mac": "00:11:25:91:45:FC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.27",
-      "mac": "00:60:DD:47:65:A9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-171-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.27",
-      "mac": "00:11:25:C4:4D:08",
+      "ip": "00:11:25:C4:4D:08",
+      "mac": "172.24.15.27",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-171.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.27",
-      "mac": "00:11:25:C4:4D:09",
+      "ip": "00:11:25:C4:4D:09",
+      "mac": "172.24.142.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-171-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index f902ee4aa7cb0d0198a598d5fca3ce2708b43f57..d520fda8b58ac717207270aaf086fed918eb0410 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.28",
-      "mac": "00:11:25:91:45:92",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.28",
-      "mac": "00:60:DD:47:65:BF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-172-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.28",
-      "mac": "00:11:25:C4:54:18",
+      "ip": "00:11:25:C4:54:18",
+      "mac": "172.24.15.28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-172.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.28",
-      "mac": "00:11:25:C4:54:19",
+      "ip": "00:11:25:C4:54:19",
+      "mac": "172.24.142.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-172-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index 27f9cf7884efc8c64b804f23940beae2e65d1b15..cd7228fc8d07a6b9c3cb3d88e2788c5e0f924e20 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.29",
-      "mac": "00:11:25:91:45:EA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.29",
-      "mac": "00:60:DD:47:65:C3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-173-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.29",
-      "mac": "00:11:25:C4:51:DA",
+      "ip": "00:11:25:C4:51:DA",
+      "mac": "172.24.15.29",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-173.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.29",
-      "mac": "00:11:25:C4:51:DB",
+      "ip": "00:11:25:C4:51:DB",
+      "mac": "172.24.142.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-173-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index f97b63274dd29f70d70ef726d5c01051cba9ab56..e6e018ba7fd9a37814e6cf3e3545dfc233ba0377 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.30",
-      "mac": "00:11:25:91:45:FA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.30",
-      "mac": "00:60:DD:47:65:A8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-174-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.30",
-      "mac": "00:11:25:C4:4F:46",
+      "ip": "00:11:25:C4:4F:46",
+      "mac": "172.24.15.30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-174.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.30",
-      "mac": "00:11:25:C4:4F:47",
+      "ip": "00:11:25:C4:4F:47",
+      "mac": "172.24.142.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-174-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 0ea6c2db3e6e9bcf2fa28ae933c9a01d6629c78a..8313dc31ab5ecdb844e6e552a8e69174b0add43d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.31",
-      "mac": "00:11:25:91:48:EB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.31",
-      "mac": "00:60:DD:47:65:BA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-175-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.31",
-      "mac": "00:11:25:C4:4F:AC",
+      "ip": "00:11:25:C4:4F:AC",
+      "mac": "172.24.15.31",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-175.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.31",
-      "mac": "00:11:25:C4:4F:AD",
+      "ip": "00:11:25:C4:4F:AD",
+      "mac": "172.24.142.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-175-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 6636ca7b2d0e7f86fc9c7cb008660ba2b07ba595..99510a66305151b9972cb44ccfb9d10b15e682d2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.32",
-      "mac": "00:11:25:91:48:EA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.32",
-      "mac": "00:60:DD:47:66:03",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-176-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.32",
-      "mac": "00:11:25:C4:4F:CA",
+      "ip": "00:11:25:C4:4F:CA",
+      "mac": "172.24.15.32",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-176.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.32",
-      "mac": "00:11:25:C4:4F:CB",
+      "ip": "00:11:25:C4:4F:CB",
+      "mac": "172.24.142.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-176-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index cac4e11bbca8c1a208a99d43e19d3b76f3d2561a..f207c3cf30aab70a779e27e28437c93893da0689 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.33",
-      "mac": "00:11:25:91:47:8B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.33",
-      "mac": "00:60:DD:47:66:04",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-177-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.33",
-      "mac": "00:11:25:C4:4F:C4",
+      "ip": "00:11:25:C4:4F:C4",
+      "mac": "172.24.15.33",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-177.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.33",
-      "mac": "00:11:25:C4:4F:C5",
+      "ip": "00:11:25:C4:4F:C5",
+      "mac": "172.24.142.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-177-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index c0ce9deb23f0f81278b16742df9bf5857b7fbf3d..d2017f8a48a741f8ad714349b648f3206de72c88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.34",
-      "mac": "00:11:25:91:45:C7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.34",
-      "mac": "00:60:DD:47:65:D8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-178-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.34",
-      "mac": "00:11:25:C4:50:0A",
+      "ip": "00:11:25:C4:50:0A",
+      "mac": "172.24.15.34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-178.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.34",
-      "mac": "00:11:25:C4:50:0B",
+      "ip": "00:11:25:C4:50:0B",
+      "mac": "172.24.142.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-178-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 4bbd58dc9fe4d5e634b676126130c2e76f31ecaf..b73362214d028d91ca17659916fd35e18a25e62d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.35",
-      "mac": "00:11:25:91:46:14",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.35",
-      "mac": "00:60:DD:47:65:B4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-179-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.35",
-      "mac": "00:11:25:C4:50:76",
+      "ip": "00:11:25:C4:50:76",
+      "mac": "172.24.15.35",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-179.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.35",
-      "mac": "00:11:25:C4:50:77",
+      "ip": "00:11:25:C4:50:77",
+      "mac": "172.24.142.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-179-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 3c6da99ca2906290e0c30d70421991661c5671c4..1b3879a99ed16cd68bc456b7ca180289b5c5dde9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.18",
-      "mac": "00:11:25:91:48:AF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.18",
-      "mac": "00:60:DD:47:59:6A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-18-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.18",
-      "mac": "00:11:25:C4:35:7A",
+      "ip": "00:11:25:C4:35:7A",
+      "mac": "172.24.2.18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.18",
-      "mac": "00:11:25:C4:35:7B",
+      "ip": "00:11:25:C4:35:7B",
+      "mac": "172.24.129.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-18-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index 5effb87745ec4b59835184f8da2cf0381da155cb..a2e759db46c616f815885ac51216f74a5010c76d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.142.36",
-      "mac": "00:11:25:91:45:8F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.82.36",
-      "mac": "00:60:DD:47:59:31",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-180-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.15.36",
-      "mac": "00:11:25:C4:4F:E6",
+      "ip": "00:11:25:C4:4F:E6",
+      "mac": "172.24.15.36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "switch17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.142.36",
-      "mac": "00:11:25:C4:4F:E7",
+      "ip": "00:11:25:C4:4F:E7",
+      "mac": "172.24.142.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-180-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index dbdf1a0bf07214f881ea35e6a4f3a11cb9fbedc3..1dff12d6680ef0bf4af9a0c72f50132c5671c460 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.1",
-      "mac": "00:11:25:91:45:DD",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-181-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.1",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-181-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.1",
-      "mac": "00:11:25:C4:53:4A",
+      "ip": "00:11:25:C4:53:4A",
+      "mac": "172.24.16.1",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.1",
-      "mac": "00:11:25:C4:53:4B",
+      "ip": "00:11:25:C4:53:4B",
+      "mac": "172.24.143.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-181-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index 32f882bfa799d54300d0e7146578a315707763fd..04b579c086c83d68f406102924d5291ad4135600 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.2",
-      "mac": "00:11:25:91:47:A0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-182-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.2",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-182-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.2",
-      "mac": "00:11:25:C4:52:88",
+      "ip": "00:11:25:C4:52:88",
+      "mac": "172.24.16.2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.2",
-      "mac": "00:11:25:C4:52:89",
+      "ip": "00:11:25:C4:52:89",
+      "mac": "172.24.143.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-182-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index 8131922043dd6652a5aeb8b414d516bd9c70c6d8..84ca33969967c104c5bfe26a6e7eed7050e1b5c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.3",
-      "mac": "00:11:25:91:47:91",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-183-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.3",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-183-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.3",
-      "mac": "00:11:25:C4:4F:5E",
+      "ip": "00:11:25:C4:4F:5E",
+      "mac": "172.24.16.3",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.3",
-      "mac": "00:11:25:C4:4F:5F",
+      "ip": "00:11:25:C4:4F:5F",
+      "mac": "172.24.143.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-183-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index d2ac0eaf65de1321adb7f64abcede86c5d638646..61c4ce5e89c0b52763614d7ed093c5dd7462c146 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.4",
-      "mac": "00:11:25:91:46:3B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-184-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.4",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-184-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.4",
-      "mac": "00:11:25:C4:4E:08",
+      "ip": "00:11:25:C4:4E:08",
+      "mac": "172.24.16.4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.4",
-      "mac": "00:11:25:C4:4E:09",
+      "ip": "00:11:25:C4:4E:09",
+      "mac": "172.24.143.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-184-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index e12fcf1041e930b9bba711c8b33654e6a07c4261..d0e82589585e3b9a9c348820277c3866cdad68da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.5",
-      "mac": "00:11:25:91:46:A0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-185-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.5",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-185-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.5",
-      "mac": "00:11:25:C4:53:B6",
+      "ip": "00:11:25:C4:53:B6",
+      "mac": "172.24.16.5",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.5",
-      "mac": "00:11:25:C4:53:B7",
+      "ip": "00:11:25:C4:53:B7",
+      "mac": "172.24.143.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-185-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index f2131bec4e3b45e1e6183ad7fe34144b92ce9061..083de6e2d0bb650176eb8eb85f99cb72ca0368ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.6",
-      "mac": "00:11:25:91:47:F6",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-186-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.6",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-186-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.6",
-      "mac": "00:11:25:C4:4E:48",
+      "ip": "00:11:25:C4:4E:48",
+      "mac": "172.24.16.6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.6",
-      "mac": "00:11:25:C4:4E:49",
+      "ip": "00:11:25:C4:4E:49",
+      "mac": "172.24.143.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-186-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index d9995033531952bf26f35f7a6330587a7977d58e..9283737dcec53b0d626238b907ce886b5cf50fa9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.7",
-      "mac": "00:11:25:91:48:58",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-187-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.7",
-      "mac": "00:60:DD:47:86:54",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-187-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.7",
-      "mac": "00:11:25:C4:4E:70",
+      "ip": "00:11:25:C4:4E:70",
+      "mac": "172.24.16.7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.7",
-      "mac": "00:11:25:C4:4E:71",
+      "ip": "00:11:25:C4:4E:71",
+      "mac": "172.24.143.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-187-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index a74d8581b06447507e5c7a6504f6ce78958d727d..d0e5ce9e0b655d92b4bb5e2ca2184bd830d33744 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.8",
-      "mac": "00:11:25:91:47:30",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-188-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.8",
-      "mac": "00:60:DD:47:7C:63",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-188-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.8",
-      "mac": "00:11:25:C4:52:4E",
+      "ip": "00:11:25:C4:52:4E",
+      "mac": "172.24.16.8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.8",
-      "mac": "00:11:25:C4:52:4F",
+      "ip": "00:11:25:C4:52:4F",
+      "mac": "172.24.143.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-188-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index 3e974e36c71ea41bd0884a08230ccb423ded2888..82cf8e11fa95f05f7e7422404931c9f9ea4ab5ce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.9",
-      "mac": "00:11:25:91:48:5F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-189-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.9",
-      "mac": "00:60:DD:47:86:57",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-189-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.9",
-      "mac": "00:11:25:C4:52:46",
+      "ip": "00:11:25:C4:52:46",
+      "mac": "172.24.16.9",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.9",
-      "mac": "00:11:25:C4:52:47",
+      "ip": "00:11:25:C4:52:47",
+      "mac": "172.24.143.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-189-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index 734314868caf6ac8230820efd2d115dfecc01898..2f9efbaa26effe211b21b442701a27be4e3f27e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.19",
-      "mac": "00:11:25:91:49:55",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.19",
-      "mac": "00:60:DD:47:5A:54",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-19-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.19",
-      "mac": "00:11:25:C4:34:4C",
+      "ip": "00:11:25:C4:34:4C",
+      "mac": "172.24.2.19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.19",
-      "mac": "00:11:25:C4:34:4D",
+      "ip": "00:11:25:C4:34:4D",
+      "mac": "172.24.129.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-19-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 07eeabde45b54a99ba66da1bdac48493970b3f23..3405de19521496521301fa6410a75b293533d4df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.10",
-      "mac": "00:11:25:91:48:11",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-190-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.10",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-190-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.10",
-      "mac": "00:11:25:C4:4E:34",
+      "ip": "00:11:25:C4:4E:34",
+      "mac": "172.24.16.10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.10",
-      "mac": "00:11:25:C4:4E:35",
+      "ip": "00:11:25:C4:4E:35",
+      "mac": "172.24.143.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-190-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index 0cde976bc786d791ef9dd54bd9b5ec20ee77d1cb..295784309c3592024029df76f3c4673ed19e230e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.11",
-      "mac": "00:11:25:91:49:4D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-191-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.11",
-      "mac": "00:60:DD:47:86:53",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-191-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.11",
-      "mac": "00:11:25:C4:4E:3A",
+      "ip": "00:11:25:C4:4E:3A",
+      "mac": "172.24.16.11",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.11",
-      "mac": "00:11:25:C4:4E:3B",
+      "ip": "00:11:25:C4:4E:3B",
+      "mac": "172.24.143.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-191-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index e380c6a264ef60b643cee2bb367f74bf067a34a9..36131f20bd830862565eb915a40a4e0a59bfc059 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.143.12",
-      "mac": "00:11:25:91:47:56",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-192-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
+      "switch": "netgear06.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.83.12",
-      "mac": "00:60:DD:47:86:45",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-192-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.16.12",
-      "mac": "00:11:25:C4:4E:A8",
+      "ip": "00:11:25:C4:4E:A8",
+      "mac": "172.24.16.12",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.143.12",
-      "mac": "00:11:25:C4:4E:A9",
+      "ip": "00:11:25:C4:4E:A9",
+      "mac": "172.24.143.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-192-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index f85ced54d39ecb64382459defc96b571ed8191ef..e98332264d339beb1ea536c0cb2eb35cfd945da1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.13",
-      "mac": "00:11:25:91:49:12",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.13",
-      "mac": "00:60:DD:47:86:62",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-193-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.13",
-      "mac": "00:11:25:C4:4E:14",
+      "ip": "00:11:25:C4:4E:14",
+      "mac": "172.24.17.13",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.13",
-      "mac": "00:11:25:C4:4E:15",
+      "ip": "00:11:25:C4:4E:15",
+      "mac": "172.24.144.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-193-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index 50f63e3176315240c9f12e8d020daeccfe94b727..6d3af03515f44bd772d4003e45180a27f3d9e212 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.14",
-      "mac": "00:11:25:91:47:74",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.14",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-194-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.14",
-      "mac": "00:11:25:C4:52:D0",
+      "ip": "00:11:25:C4:52:D0",
+      "mac": "172.24.17.14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.14",
-      "mac": "00:11:25:C4:52:D1",
+      "ip": "00:11:25:C4:52:D1",
+      "mac": "172.24.144.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-194-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index f15a0513fae3a28b22df783450fae7d2b5164571..c3293d849ecf862ebf36bced0a283062e03af4f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.15",
-      "mac": "00:11:25:91:47:F5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.15",
-      "mac": "00:60:DD:47:5A:A3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-195-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.15",
-      "mac": "00:11:25:C4:38:D4",
+      "ip": "00:11:25:C4:38:D4",
+      "mac": "172.24.17.15",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.15",
-      "mac": "00:11:25:C4:38:D5",
+      "ip": "00:11:25:C4:38:D5",
+      "mac": "172.24.144.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-195-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index f377b4a43a0fbc75fee2b7713c39d422bb85b82b..57f349e37413d1df29a0f9c2ea44f7e713b2ad4d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.16",
-      "mac": "00:11:25:91:45:7B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.16",
-      "mac": "00:60:DD:47:7C:0F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-196-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.16",
-      "mac": "00:11:25:C4:4F:E4",
+      "ip": "00:11:25:C4:4F:E4",
+      "mac": "172.24.17.16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.16",
-      "mac": "00:11:25:C4:4F:E5",
+      "ip": "00:11:25:C4:4F:E5",
+      "mac": "172.24.144.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-196-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index f1c6e961be0714b6d16a6c98987d3308b936ad2a..acf7eded07136a75c8b106011ac92eed727f3898 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.17",
-      "mac": "00:11:25:91:45:F9",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.17",
-      "mac": "00:60:DD:47:86:52",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-197-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.17",
-      "mac": "00:11:25:C4:51:72",
+      "ip": "00:11:25:C4:51:72",
+      "mac": "172.24.17.17",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.17",
-      "mac": "00:11:25:C4:51:73",
+      "ip": "00:11:25:C4:51:73",
+      "mac": "172.24.144.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-197-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 7bcfd1298482806ae6f6e0405499ea2746ca1f48..f0456c2c505e14ad5661b67abe774289e07cc813 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.18",
-      "mac": "00:11:25:91:48:95",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.18",
-      "mac": "00:60:DD:47:89:0B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-198-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.18",
-      "mac": "00:11:25:C4:4E:C8",
+      "ip": "00:11:25:C4:4E:C8",
+      "mac": "172.24.17.18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.18",
-      "mac": "00:11:25:C4:4E:C9",
+      "ip": "00:11:25:C4:4E:C9",
+      "mac": "172.24.144.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-198-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index 6c356b937cbd508f209a48cbc2b9716620ed884c..da8961cc803fe8aa597d0fc67abded5c327c9047 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.19",
-      "mac": "00:11:25:91:48:99",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.19",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-199-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.19",
-      "mac": "00:11:25:C4:4E:CC",
+      "ip": "00:11:25:C4:4E:CC",
+      "mac": "172.24.17.19",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.19",
-      "mac": "00:11:25:C4:4E:CD",
+      "ip": "00:11:25:C4:4E:CD",
+      "mac": "172.24.144.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-199-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index a92b9942338457eae6aac826c5fe4cea71f083e2..08b3d0d867964cc93e9233df8e0d21f016fb7a56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -9,12 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "myri0",
+      "driver": "mx_driver",
+      "enabled": true,
+      "interface": "Myrinet",
+      "ip": null,
+      "mac": null,
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-2-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.2",
-      "mac": "00:11:25:91:48:A7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +48,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.2",
-      "mac": "00:60:DD:47:59:75",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-2-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.2",
-      "mac": "00:11:25:C4:35:56",
+      "ip": "00:11:25:C4:35:56",
+      "mac": "172.24.1.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +71,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.2",
-      "mac": "00:11:25:C4:35:57",
+      "ip": "00:11:25:C4:35:57",
+      "mac": "172.24.128.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-2-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index 76a0184c7322e631bbeebd007746a5bca3f80e13..8caffd402b22ed6ff5406a0948f7e1f25d11640b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.20",
-      "mac": "00:11:25:91:45:7C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.20",
-      "mac": "00:60:DD:47:88:F7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-20-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.20",
-      "mac": "00:11:25:C4:35:52",
+      "ip": "00:11:25:C4:35:52",
+      "mac": "172.24.2.20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.20",
-      "mac": "00:11:25:C4:35:53",
+      "ip": "00:11:25:C4:35:53",
+      "mac": "172.24.129.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-20-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index 79fe8ec7ec645d08ea04cfc5dca495fcc630b5b0..2c23fd537e25997bb32c2501f931100c67a55b0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.20",
-      "mac": "00:11:25:91:47:C9",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.20",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-200-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.20",
-      "mac": "00:11:25:C4:50:D2",
+      "ip": "00:11:25:C4:50:D2",
+      "mac": "172.24.17.20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.20",
-      "mac": "00:11:25:C4:50:D3",
+      "ip": "00:11:25:C4:50:D3",
+      "mac": "172.24.144.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-200-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index 4cff4ef7e30595aef72be226899267466e4f0299..85433f888b13d7698697327311b8dce181a36806 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.21",
-      "mac": "00:11:25:91:47:A2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.21",
-      "mac": "00:60:DD:47:86:51",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-201-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.21",
-      "mac": "00:11:25:C4:51:B2",
+      "ip": "00:11:25:C4:51:B2",
+      "mac": "172.24.17.21",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.21",
-      "mac": "00:11:25:C4:51:B3",
+      "ip": "00:11:25:C4:51:B3",
+      "mac": "172.24.144.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-201-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index ffa05896174fecb64d481c348a1d6adf422e3aeb..9261baca638516b7b427fa680fa95527d4aeac3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.22",
-      "mac": "00:11:25:91:47:A8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.22",
-      "mac": "00:60:DD:47:86:49",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-202-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.22",
-      "mac": "00:11:25:C4:53:F8",
+      "ip": "00:11:25:C4:53:F8",
+      "mac": "172.24.17.22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.22",
-      "mac": "00:11:25:C4:53:F9",
+      "ip": "00:11:25:C4:53:F9",
+      "mac": "172.24.144.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-202-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index bf57afbc3a28851c0fd8e0d13ab45f3ac2aa2d77..89a501902f325d205f6aaa698cbb582bcf2294b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.23",
-      "mac": "00:11:25:91:45:F5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.23",
-      "mac": "00:60:DD:47:86:48",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-203-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.23",
-      "mac": "00:11:25:C4:4C:FC",
+      "ip": "00:11:25:C4:4C:FC",
+      "mac": "172.24.17.23",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.23",
-      "mac": "00:11:25:C4:4C:FD",
+      "ip": "00:11:25:C4:4C:FD",
+      "mac": "172.24.144.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-203-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 9864c2fbd856c414212e540000a75dd397dd873e..64710b37954244d874265b597ba9693a764e9e4e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.144.24",
-      "mac": "00:11:25:91:46:16",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.84.24",
-      "mac": "00:60:DD:47:86:46",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-204-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.17.24",
-      "mac": "00:11:25:C4:4F:04",
+      "ip": "00:11:25:C4:4F:04",
+      "mac": "172.24.17.24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.144.24",
-      "mac": "00:11:25:C4:4F:05",
+      "ip": "00:11:25:C4:4F:05",
+      "mac": "172.24.144.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-204-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index 39f4f4449757ca48ef0223b432ecbd236aaeb2cc..3a8f0f2b435df0a4406eb68f624d7e89242c16d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.25",
-      "mac": "00:11:25:91:47:95",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.25",
-      "mac": "00:60:DD:47:C4:3F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-205-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.25",
-      "mac": "00:11:25:C4:4F:14",
+      "ip": "00:11:25:C4:4F:14",
+      "mac": "172.24.18.25",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.25",
-      "mac": "00:11:25:C4:4F:15",
+      "ip": "00:11:25:C4:4F:15",
+      "mac": "172.24.145.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-205-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index ddac4c0aa7c677308a85170cdf402410ca57e4e2..8db75f63e52b62afe9ae704f4ee4eae504e91a6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.26",
-      "mac": "00:11:25:91:46:54",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.26",
-      "mac": "00:60:DD:47:86:5E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-206-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.26",
-      "mac": "00:11:25:C4:52:64",
+      "ip": "00:11:25:C4:52:64",
+      "mac": "172.24.18.26",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.26",
-      "mac": "00:11:25:C4:52:65",
+      "ip": "00:11:25:C4:52:65",
+      "mac": "172.24.145.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-206-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index 6056e6e815c58afb8d62b44c7d27083840b11022..bc6929ccdc619b945229b2e344ba6de3e258f4f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.27",
-      "mac": "00:11:25:91:48:D5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.27",
-      "mac": "00:60:DD:47:86:59",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-207-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.27",
-      "mac": "00:11:25:C4:4F:B4",
+      "ip": "00:11:25:C4:4F:B4",
+      "mac": "172.24.18.27",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.27",
-      "mac": "00:11:25:C4:4F:B5",
+      "ip": "00:11:25:C4:4F:B5",
+      "mac": "172.24.145.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-207-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index 5190f7320c7287d34f137af29eb44c3c3f9c0880..8d7a80e1f548f5296a734d15b42f1c92422a7b04 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.28",
-      "mac": "00:11:25:91:46:7D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.28",
-      "mac": "00:60:DD:47:86:5A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-208-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.28",
-      "mac": "00:11:25:C4:4F:AE",
+      "ip": "00:11:25:C4:4F:AE",
+      "mac": "172.24.18.28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.28",
-      "mac": "00:11:25:C4:4F:AF",
+      "ip": "00:11:25:C4:4F:AF",
+      "mac": "172.24.145.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-208-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index 347aaa625637088c6c8c8f33ba7daaf914149b5a..54732dc38682804515967061e34e6c931e61c489 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.29",
-      "mac": "00:11:25:91:45:82",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.29",
-      "mac": "00:60:DD:47:89:84",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-209-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.29",
-      "mac": "00:11:25:C4:4E:C4",
+      "ip": "00:11:25:C4:4E:C4",
+      "mac": "172.24.18.29",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.29",
-      "mac": "00:11:25:C4:4E:C5",
+      "ip": "00:11:25:C4:4E:C5",
+      "mac": "172.24.145.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-209-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 0c26569d10477004ae528e67fc73f96f3309fdab..2092e5ad1c05123fd65221ab941fc3fa4c7c0b5d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.21",
-      "mac": "00:11:25:91:47:F8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.21",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-21-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.21",
-      "mac": "00:11:25:C4:35:A8",
+      "ip": "00:11:25:C4:35:A8",
+      "mac": "172.24.2.21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.21",
-      "mac": "00:11:25:C4:35:A9",
+      "ip": "00:11:25:C4:35:A9",
+      "mac": "172.24.129.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-21-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index a155db8062a859610745e3c645df435d2060f87a..741d09cea2b51c8f360748623524ae7859ec2ca8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.30",
-      "mac": "00:11:25:91:45:AA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.30",
-      "mac": "00:60:DD:47:89:D0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-210-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.30",
-      "mac": "00:11:25:C4:4E:94",
+      "ip": "00:11:25:C4:4E:94",
+      "mac": "172.24.18.30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.30",
-      "mac": "00:11:25:C4:4E:95",
+      "ip": "00:11:25:C4:4E:95",
+      "mac": "172.24.145.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-210-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 44042b4e0b8a55dc8ca56583f25edac4655e2287..e3a357bd1d44a18e26296a005a7b9edcca1909ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.31",
-      "mac": "00:11:25:91:48:38",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.31",
-      "mac": "00:60:DD:47:86:5C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-211-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.31",
-      "mac": "00:11:25:C4:4F:94",
+      "ip": "00:11:25:C4:4F:94",
+      "mac": "172.24.18.31",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.31",
-      "mac": "00:11:25:C4:4F:95",
+      "ip": "00:11:25:C4:4F:95",
+      "mac": "172.24.145.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-211-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index cc46e785c591a8d12bfbe78062c277a6023319bb..9229e232e29042902b9e9e8181d6e859c34f9122 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.32",
-      "mac": "00:11:25:91:47:C3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.32",
-      "mac": "00:60:DD:47:B5:EF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-212-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.32",
-      "mac": "00:11:25:C4:4F:BA",
+      "ip": "00:11:25:C4:4F:BA",
+      "mac": "172.24.18.32",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.32",
-      "mac": "00:11:25:C4:4F:BB",
+      "ip": "00:11:25:C4:4F:BB",
+      "mac": "172.24.145.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-212-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index 009df52fbc9cf91bd2a2693cc662ad411c3bb87c..164ee153d00b288d7b5fd8fb17ee61f3e6b93dac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.33",
-      "mac": "00:11:25:91:47:EE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.33",
-      "mac": "00:60:DD:47:86:5D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-213-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.33",
-      "mac": "00:11:25:C4:54:50",
+      "ip": "00:11:25:C4:54:50",
+      "mac": "172.24.18.33",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.33",
-      "mac": "00:11:25:C4:54:51",
+      "ip": "00:11:25:C4:54:51",
+      "mac": "172.24.145.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-213-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index cb50408cfec20f8fb61ff2f4935d55e4c2c38c48..372c57be1b90f8b3f6569e784e75b75a32240025 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.34",
-      "mac": "00:11:25:91:47:C7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.34",
-      "mac": "00:60:DD:47:B4:C4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-214-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.34",
-      "mac": "00:11:25:C4:4E:50",
+      "ip": "00:11:25:C4:4E:50",
+      "mac": "172.24.18.34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.34",
-      "mac": "00:11:25:C4:4E:51",
+      "ip": "00:11:25:C4:4E:51",
+      "mac": "172.24.145.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-214-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index ad1f9eabedf6af833b6a261875e0dd8b0229b74f..6d7cc77e992127454f496f1d6532740d4357a649 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.35",
-      "mac": "00:11:25:91:46:83",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.35",
-      "mac": "00:60:DD:47:89:EC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-215-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.35",
-      "mac": "00:11:25:C4:54:7E",
+      "ip": "00:11:25:C4:54:7E",
+      "mac": "172.24.18.35",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.35",
-      "mac": "00:11:25:C4:54:7F",
+      "ip": "00:11:25:C4:54:7F",
+      "mac": "172.24.145.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-215-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index 5acf6caf7be2ce8cab809a9f6cd37dd25e7bd79d..64f3c2091f40498118330f372542e12a0a019e7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.145.36",
-      "mac": "00:11:25:91:47:AF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.85.36",
-      "mac": "00:60:DD:47:89:76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-216-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.18.36",
-      "mac": "00:11:25:C4:4D:1C",
+      "ip": "00:11:25:C4:4D:1C",
+      "mac": "172.24.18.36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "00:12:00:4c:a7:c2",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.145.36",
-      "mac": "00:11:25:C4:4D:1D",
+      "ip": "00:11:25:C4:4D:1D",
+      "mac": "172.24.145.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-216-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index 475cd114302dff1437a56c6d1d105fe7075ea0c4..b3310ed342eefe5ab23ea71265dfdab66796bb54 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.1",
-      "mac": "00:11:25:91:46:70",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.1",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-217-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.1",
-      "mac": "00:11:25:C4:3B:7C",
+      "ip": "00:11:25:C4:3B:7C",
+      "mac": "172.24.19.1",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.1",
-      "mac": "00:11:25:C4:3B:7D",
+      "ip": "00:11:25:C4:3B:7D",
+      "mac": "172.24.146.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-217-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index eafce3e593b5caf1620f661e1f097af86729e065..7346019eb4b8128bd7df65444c6f9e0d1e648f96 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.2",
-      "mac": "00:11:25:91:48:D2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.2",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-218-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.2",
-      "mac": "00:11:25:C4:35:46",
+      "ip": "00:11:25:C4:35:46",
+      "mac": "172.24.19.2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.2",
-      "mac": "00:11:25:C4:35:47",
+      "ip": "00:11:25:C4:35:47",
+      "mac": "172.24.146.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-218-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 844001ed3fed77609c087bcf4128b7cf6a27e53f..80ab5fe17fc41a56fbf73646dacd39ebbd022373 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.3",
-      "mac": "00:11:25:91:48:AA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.3",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-219-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.3",
-      "mac": "00:11:25:C4:39:A8",
+      "ip": "00:11:25:C4:39:A8",
+      "mac": "172.24.19.3",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.3",
-      "mac": "00:11:25:C4:39:A9",
+      "ip": "00:11:25:C4:39:A9",
+      "mac": "172.24.146.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-219-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index d0d8a26e137a3874b558896467e85dfd270a8704..91ce28e1766b0cfef7385b9e87d5f9bffa56217f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.22",
-      "mac": "00:11:25:91:49:2A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.22",
-      "mac": "00:60:DD:47:5A:A2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-22-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.22",
-      "mac": "00:11:25:C4:34:5A",
+      "ip": "00:11:25:C4:34:5A",
+      "mac": "172.24.2.22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.22",
-      "mac": "00:11:25:C4:34:5B",
+      "ip": "00:11:25:C4:34:5B",
+      "mac": "172.24.129.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-22-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 3cd3bc42bbfae4bcaef5e07006e65f0d27d81838..bf29ef0b355282e70080e2858446e0e78df37297 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.4",
-      "mac": "00:11:25:91:48:39",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.4",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-220-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.4",
-      "mac": "00:11:25:C4:3C:6A",
+      "ip": "00:11:25:C4:3C:6A",
+      "mac": "172.24.19.4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.4",
-      "mac": "00:11:25:C4:3C:6B",
+      "ip": "00:11:25:C4:3C:6B",
+      "mac": "172.24.146.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-220-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index 432405dd7358db2752464c7866d9253cb40dd9b0..2239831e6a788e80e8428f498c74ba2f9a207e12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.5",
-      "mac": "00:11:25:91:45:C3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.5",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-221-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.5",
-      "mac": "00:11:25:C4:3D:96",
+      "ip": "00:11:25:C4:3D:96",
+      "mac": "172.24.19.5",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.5",
-      "mac": "00:11:25:C4:3D:97",
+      "ip": "00:11:25:C4:3D:97",
+      "mac": "172.24.146.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-221-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index 79f175e1901fc794e7cc00569ad60932ec6ed19e..4bbc4f0a925a39283c9c76a2ebdbe8ad25f4b894 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.6",
-      "mac": "00:11:25:91:48:16",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.6",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-222-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.6",
-      "mac": "00:11:25:C4:39:54",
+      "ip": "00:11:25:C4:39:54",
+      "mac": "172.24.19.6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.6",
-      "mac": "00:11:25:C4:39:55",
+      "ip": "00:11:25:C4:39:55",
+      "mac": "172.24.146.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-222-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 5b72726a75d885924ef96dd7d13ed6a6ad6cb8d6..dbf2745b398b84af2ffdd7e68c88d60a6ddf671b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Stuck on the black screen with a blinking cursor on the screen top left corner.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.7",
-      "mac": "00:11:25:91:48:A4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.7",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-223-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.7",
-      "mac": "00:11:25:C4:3C:14",
+      "ip": "00:11:25:C4:3C:14",
+      "mac": "172.24.19.7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.7",
-      "mac": "00:11:25:C4:3C:15",
+      "ip": "00:11:25:C4:3C:15",
+      "mac": "172.24.146.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-223-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index c997952688c50b91d213621e1ccf779d61f5edcf..c810fbfc4c57c198b3d38bada2c90cc15f66d9d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.8",
-      "mac": "00:11:25:91:46:7E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.8",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-224-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.8",
-      "mac": "00:11:25:C4:39:00",
+      "ip": "00:11:25:C4:39:00",
+      "mac": "172.24.19.8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.8",
-      "mac": "00:11:25:C4:39:01",
+      "ip": "00:11:25:C4:39:01",
+      "mac": "172.24.146.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-224-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index 58910883681e706ef93f7e956db7aa21ef58589e..5bd294c9cb1e5c42367fdae0747f20a70944ee6a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.9",
-      "mac": "00:11:25:91:46:AE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.9",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-225-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.9",
-      "mac": "00:11:25:C4:38:D0",
+      "ip": "00:11:25:C4:38:D0",
+      "mac": "172.24.19.9",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.9",
-      "mac": "00:11:25:C4:38:D1",
+      "ip": "00:11:25:C4:38:D1",
+      "mac": "172.24.146.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-225-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 6e69ec0ccbd44614f11a350b01fd893c44130ab8..e0f93614103d354003e4451b09c697329442f557 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.10",
-      "mac": "00:11:25:91:48:35",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.10",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-226-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.10",
-      "mac": "00:11:25:C4:38:F6",
+      "ip": "00:11:25:C4:38:F6",
+      "mac": "172.24.19.10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.10",
-      "mac": "00:11:25:C4:38:F7",
+      "ip": "00:11:25:C4:38:F7",
+      "mac": "172.24.146.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-226-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index e844a064d4e4530f58b847336b42d2922e2d9f73..9577854933ebb03f2e11b6bed9a02f845e7b7e8f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.11",
-      "mac": "00:14:5E:65:C6:4A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.11",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-227-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.11",
-      "mac": "00:11:25:C4:34:52",
+      "ip": "changée",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.11",
-      "mac": "00:11:25:C4:39:8F",
+      "ip": "00:11:25:C4:39:8F",
+      "mac": "172.24.146.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-227-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 3e7e3dbfb31fd5b6484c25a36151b3ec5baad248..a5bd6b5f1ab5f743336170c66f025934aba1ed2c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.146.12",
-      "mac": "00:11:25:91:46:0C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.86.12",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-228-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.19.12",
-      "mac": "00:11:25:C4:32:A6",
+      "ip": "00:11:25:C4:32:A6",
+      "mac": "172.24.19.12",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.146.12",
-      "mac": "00:11:25:C4:32:A7",
+      "ip": "00:11:25:C4:32:A7",
+      "mac": "172.24.146.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-228-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 44a225c5a9799cda8f1552ea7c259b299ce4d5c9..356d840f464b7edf1a75ac9fcee8422d9b7a4da5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.13",
-      "mac": "00:11:25:91:45:8A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.13",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-229-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.13",
-      "mac": "00:11:25:C4:3C:76",
+      "ip": "00:11:25:C4:3C:76",
+      "mac": "172.24.20.13",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.13",
-      "mac": "00:11:25:C4:3C:77",
+      "ip": "00:11:25:C4:3C:77",
+      "mac": "172.24.147.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-229-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index d9cd551f757a99ecdfdd69695f8eb4fd19edbd34..7ea1b6a8727df8321305f7862f4af4ffa4326ef3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.23",
-      "mac": "00:11:25:91:46:B7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.23",
-      "mac": "00:60:DD:47:5A:8F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-23-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.23",
-      "mac": "00:11:25:C4:34:EA",
+      "ip": "00:11:25:C4:34:EA",
+      "mac": "172.24.2.23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.23",
-      "mac": "00:11:25:C4:34:EB",
+      "ip": "00:11:25:C4:34:EB",
+      "mac": "172.24.129.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-23-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index 0e9b73f037c25479bc9d881a5a7ed0f22a8fc6dd..47ac3df56b58b2ddc66c5c69280117c1e71f78b6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.14",
-      "mac": "00:11:25:91:45:B4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.14",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-230-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.14",
-      "mac": "00:11:25:C4:35:A6",
+      "ip": "00:11:25:C4:35:A6",
+      "mac": "172.24.20.14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.14",
-      "mac": "00:11:25:C4:35:A7",
+      "ip": "00:11:25:C4:35:A7",
+      "mac": "172.24.147.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-230-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index f2906ac1bd94af534afae0ec7ccbcc517f6fc127..8c01e9d088e65931c3eafc8b6e282ffdb025d7cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.15",
-      "mac": "00:11:25:91:47:E5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.15",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-231-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.15",
-      "mac": "00:11:25:C4:3C:78",
+      "ip": "00:11:25:C4:3C:78",
+      "mac": "172.24.20.15",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.15",
-      "mac": "00:11:25:C4:3C:79",
+      "ip": "00:11:25:C4:3C:79",
+      "mac": "172.24.147.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-231-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index 0a753c887adb5b48d038c3b713e06cd7d564fe56..26b36d12681c3ee80a9bb91fcfa764d4bfe5d37e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.16",
-      "mac": "00:11:25:91:45:79",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.16",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-232-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.16",
-      "mac": "00:11:25:C4:38:CA",
+      "ip": "00:11:25:C4:38:CA",
+      "mac": "172.24.20.16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.16",
-      "mac": "00:11:25:C4:38:CB",
+      "ip": "00:11:25:C4:38:CB",
+      "mac": "172.24.147.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-232-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index e9328c86bdb420f2431df33eb37146fe4cfd262f..48c3ca852cd0d95cfbfb84925fa0b03b873158b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.17",
-      "mac": "00:11:25:91:45:96",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.17",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-233-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.17",
-      "mac": "00:11:25:C4:3C:20",
+      "ip": "00:11:25:C4:3C:20",
+      "mac": "172.24.20.17",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.17",
-      "mac": "00:11:25:C4:3C:21",
+      "ip": "00:11:25:C4:3C:21",
+      "mac": "172.24.147.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-233-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 94b0d67b67b227d73428a2703a84f5fa9629cc4a..5837dda655c79a48a79ca7037be01b83a8af3368 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.18",
-      "mac": "00:11:25:91:46:08",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.18",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-234-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.18",
-      "mac": "00:11:25:C4:3C:42",
+      "ip": "00:11:25:C4:3C:42",
+      "mac": "172.24.20.18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.18",
-      "mac": "00:11:25:C4:3C:43",
+      "ip": "00:11:25:C4:3C:43",
+      "mac": "172.24.147.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-234-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index 322dcc01ab269acfe254c5841e71347fcab8f20b..e8502afec4588ea14fa4ba22e5a50d770ab24157 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.19",
-      "mac": "00:11:25:91:47:EB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.19",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-235-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.19",
-      "mac": "00:11:25:C4:35:50",
+      "ip": "00:11:25:C4:35:50",
+      "mac": "172.24.20.19",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.19",
-      "mac": "00:11:25:C4:35:51",
+      "ip": "00:11:25:C4:35:51",
+      "mac": "172.24.147.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-235-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index d5fbc6a4a909fb14393eccb666388766f287ac2d..adeb74bd7963d6ea813bbe7b3e30f1d08c699773 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.20",
-      "mac": "00:11:25:91:47:F7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.20",
-      "mac": "00:60:DD:47:89:D1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-236-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.20",
-      "mac": "00:11:25:C4:39:AC",
+      "ip": "00:11:25:C4:39:AC",
+      "mac": "172.24.20.20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.20",
-      "mac": "00:11:25:C4:39:AD",
+      "ip": "00:11:25:C4:39:AD",
+      "mac": "172.24.147.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-236-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 617f48dfe50a0c2e35cc60e6b5836ca3cfc3b1f7..5928e04b02c732239d1cb9c11362ceda63ed3548 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.21",
-      "mac": "00:11:25:91:48:45",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.21",
-      "mac": "00:60:DD:47:89:CF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-237-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.21",
-      "mac": "00:11:25:C4:3C:80",
+      "ip": "00:11:25:C4:3C:80",
+      "mac": "172.24.20.21",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.21",
-      "mac": "00:11:25:C4:3C:81",
+      "ip": "00:11:25:C4:3C:81",
+      "mac": "172.24.147.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-237-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index afb278fc8a4c11f6ded7d69b3506babbb3cac808..ae060a95320495724d42b3d95add86fa44f19095 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.22",
-      "mac": "00:11:25:91:48:CF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.22",
-      "mac": "00:60:DD:47:7D:7D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-238-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.22",
-      "mac": "00:11:25:C4:3C:7E",
+      "ip": "00:11:25:C4:3C:7E",
+      "mac": "172.24.20.22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.22",
-      "mac": "00:11:25:C4:3C:7F",
+      "ip": "00:11:25:C4:3C:7F",
+      "mac": "172.24.147.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-238-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index 57e069841efa5b49d8a871cd2d1f36629d74c49b..498b67603347f8449647cdefb3b7d625f609e3ab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.23",
-      "mac": "00:11:25:91:48:C1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.23",
-      "mac": "00:60:DD:47:7D:97",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-239-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.23",
-      "mac": "00:11:25:C4:3F:50",
+      "ip": "00:11:25:C4:3F:50",
+      "mac": "172.24.20.23",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.23",
-      "mac": "00:11:25:C4:3F:51",
+      "ip": "00:11:25:C4:3F:51",
+      "mac": "172.24.147.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-239-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index 159492f6877eec31313328792f0aaea083c25a14..26b228076c8b301902a98adb5fbb1781238a97d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.129.24",
-      "mac": "00:11:25:91:47:39",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.69.24",
-      "mac": "00:60:DD:47:5A:57",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-24-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.2.24",
-      "mac": "00:11:25:C4:34:50",
+      "ip": "00:11:25:C4:34:50",
+      "mac": "172.24.2.24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.129.24",
-      "mac": "00:11:25:C4:34:51",
+      "ip": "00:11:25:C4:34:51",
+      "mac": "172.24.129.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-24-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index 709d69321ff51f67c45fa022ffddbdf8d4c55759..98132483df181303dc670a6cda100e3fd78330dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.147.24",
-      "mac": "00:11:25:91:46:09",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.87.24",
-      "mac": "00:60:DD:47:7D:7C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-240-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.20.24",
-      "mac": "00:11:25:C4:3E:34",
+      "ip": "00:11:25:C4:3E:34",
+      "mac": "172.24.20.24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.147.24",
-      "mac": "00:11:25:C4:3E:35",
+      "ip": "00:11:25:C4:3E:35",
+      "mac": "172.24.147.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-240-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index efef6b48ac308cf34861c59e031dedd588093395..2e93c372a49475d7fe8ab57e084d95b9a37f5072 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.25",
-      "mac": "00:11:25:91:46:5D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.25",
-      "mac": "00:60:DD:47:7C:D4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-241-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.25",
-      "mac": "00:11:25:C4:3C:74",
+      "ip": "00:11:25:C4:3C:74",
+      "mac": "172.24.21.25",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.25",
-      "mac": "00:11:25:C4:3C:75",
+      "ip": "00:11:25:C4:3C:75",
+      "mac": "172.24.148.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-241-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index c312fcd9cbc24e97f6b992f2faf1db834222a249..ffad517046ac6734316435da1160f4f2ea53f89f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.26",
-      "mac": "00:11:25:91:48:AD",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.26",
-      "mac": "00:60:DD:47:7C:C8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-242-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.26",
-      "mac": "00:11:25:C4:2B:FC",
+      "ip": "00:11:25:C4:2B:FC",
+      "mac": "172.24.21.26",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.26",
-      "mac": "00:11:25:C4:2B:FD",
+      "ip": "00:11:25:C4:2B:FD",
+      "mac": "172.24.148.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-242-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 99ac8fff319f25d34ad5ae8444ecc8afb1e3ede8..e38cd2359a5708b1878f29e8c27cf4302358e12a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.27",
-      "mac": "00:11:25:91:46:7A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.27",
-      "mac": "00:60:DD:47:7C:07",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-243-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.27",
-      "mac": "00:11:25:C4:2B:58",
+      "ip": "00:11:25:C4:2B:58",
+      "mac": "172.24.21.27",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.27",
-      "mac": "00:11:25:C4:2B:59",
+      "ip": "00:11:25:C4:2B:59",
+      "mac": "172.24.148.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-243-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index dd70516f23c4e6402e73ca85d5b949293d2cc46d..dc93e74684546eb3e5c8f6bc29b797bf2a29ce64 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.28",
-      "mac": "00:11:25:91:46:A3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.28",
-      "mac": "00:60:DD:47:89:07",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-244-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.28",
-      "mac": "00:11:25:C4:10:FA",
+      "ip": "changée",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.28",
-      "mac": "00:11:25:C4:10:FB",
+      "ip": "00:11:25:C4:3B:ED",
+      "mac": "172.24.148.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-244-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index 69aacbe018eec02df4e88096a55997827bccc9ba..59136b9a9369e907f9e54fb679bbb02c00bf6f8c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.29",
-      "mac": "00:11:25:91:47:EA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.29",
-      "mac": "00:60:DD:47:7B:FE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-245-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.29",
-      "mac": "00:11:25:C4:3A:4E",
+      "ip": "00:11:25:C4:3A:4E",
+      "mac": "172.24.21.29",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.29",
-      "mac": "00:11:25:C4:3A:4F",
+      "ip": "00:11:25:C4:3A:4F",
+      "mac": "172.24.148.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-245-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 14dd16d579ad1d04af439fa0e5e94d7c724a8922..3f602de2ddc710330b3d7841895b63b3ea6fff55 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.30",
-      "mac": "00:11:25:91:46:0E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.30",
-      "mac": "00:60:DD:47:86:58",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-246-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.30",
-      "mac": "00:11:25:C4:38:E2",
+      "ip": "00:11:25:C4:38:E2",
+      "mac": "172.24.21.30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.30",
-      "mac": "00:11:25:C4:38:E3",
+      "ip": "00:11:25:C4:38:E3",
+      "mac": "172.24.148.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-246-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 094375bb5a637100794089ff58ca17f518ad68e8..f7bf8ee8dd2de9456809968c9d82101a2dc65449 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.31",
-      "mac": "00:11:25:91:48:F4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.31",
-      "mac": "00:60:DD:47:7B:FD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-247-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.31",
-      "mac": "00:11:25:C4:32:76",
+      "ip": "00:11:25:C4:32:76",
+      "mac": "172.24.21.31",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.31",
-      "mac": "00:11:25:C4:32:77",
+      "ip": "00:11:25:C4:32:77",
+      "mac": "172.24.148.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-247-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index cd16a88eee28d9e0fc158a176a19a45a3c856f01..725d2ff895bdb38521cb3d00d993fa8d15303d02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.32",
-      "mac": "00:11:25:91:48:3B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.32",
-      "mac": "00:60:DD:47:7B:FC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-248-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.32",
-      "mac": "00:11:25:C4:31:FA",
+      "ip": "00:11:25:C4:31:FA",
+      "mac": "172.24.21.32",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.32",
-      "mac": "00:11:25:C4:31:FB",
+      "ip": "00:11:25:C4:31:FB",
+      "mac": "172.24.148.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-248-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 94035183ef8316ceab0b3a932427b755457f607a..5e3ef37cea2ae0c4280ff8942932f6621a7127ee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.33",
-      "mac": "00:11:25:91:45:E9",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.33",
-      "mac": "00:60:DD:47:88:62",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-249-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.33",
-      "mac": "00:11:25:C4:33:40",
+      "ip": "00:11:25:C4:33:40",
+      "mac": "172.24.21.33",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.33",
-      "mac": "00:11:25:C4:33:41",
+      "ip": "00:11:25:C4:33:41",
+      "mac": "172.24.148.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-249-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 2b84da07054db27c56667fb884062f3adc4a4e65..c7c6d2cc159daa3a14e59459024f7113f44894ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.25",
-      "mac": "00:11:25:91:47:A1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.25",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-25-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.25",
-      "mac": "00:11:25:C4:35:1C",
+      "ip": "00:11:25:C4:35:1C",
+      "mac": "172.24.3.25",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.25",
-      "mac": "00:11:25:C4:35:1D",
+      "ip": "00:11:25:C4:35:1D",
+      "mac": "172.24.130.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-25-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 138f1a9796b7721e6c79d51ac8b1ba509c4cc799..102b4a9506673b17cb7f30bcf4410c9376496cae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.34",
-      "mac": "00:11:25:91:45:E8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.34",
-      "mac": "00:60:DD:47:7B:FF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-250-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.34",
-      "mac": "00:11:25:C4:3B:9A",
+      "ip": "00:11:25:C4:3B:9A",
+      "mac": "172.24.21.34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.34",
-      "mac": "00:11:25:C4:3B:9B",
+      "ip": "00:11:25:C4:3B:9B",
+      "mac": "172.24.148.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-250-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 2e760d90336d865614cab5e7f187ebefbdbe4124..6ecf6c8e94bfe606938bf747eba9680da9ef454a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.35",
-      "mac": "00:11:25:91:47:40",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.35",
-      "mac": "00:60:DD:47:88:6E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-251-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.35",
-      "mac": "00:11:25:C4:3F:90",
+      "ip": "00:11:25:C4:3F:90",
+      "mac": "172.24.21.35",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.35",
-      "mac": "00:11:25:C4:3F:91",
+      "ip": "00:11:25:C4:3F:91",
+      "mac": "172.24.148.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-251-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index ca1cba97ce97ded9795ba98b6d4e75c8f1ba09c3..4e7af1b5b7fe2201bf0520400b2b414c33baf017 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.148.36",
-      "mac": "00:11:25:91:48:28",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.88.36",
-      "mac": "00:60:DD:47:7C:65",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-252-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.21.36",
-      "mac": "00:11:25:C4:32:5A",
+      "ip": "00:11:25:C4:32:5A",
+      "mac": "172.24.21.36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.148.36",
-      "mac": "00:11:25:C4:32:5B",
+      "ip": "00:11:25:C4:32:5B",
+      "mac": "172.24.148.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-252-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index c36a2e5d30477a1dc2fc30983d28d1e9681dc180..18c5b555c2b0503ce04a856c7b5dcef8fa2d8e9b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.1",
-      "mac": "00:11:25:91:47:CC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.1",
-      "mac": "00:60:DD:47:C7:FB",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-253-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.1",
-      "mac": "00:11:25:C4:34:68",
+      "ip": "00:11:25:C4:34:68",
+      "mac": "172.24.22.1",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-253.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.1",
-      "mac": "00:11:25:C4:34:69",
+      "ip": "00:11:25:C4:34:69",
+      "mac": "172.24.149.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-253-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index 184cde91405dd46d725ef8f6e831b15e7cc00330..dd6f7ce9812fe7042b40ec97c3191aabe2d37ed4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.2",
-      "mac": "00:11:25:91:46:C7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.2",
-      "mac": "00:60:DD:47:C7:FE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-254-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.2",
-      "mac": "00:11:25:C4:35:B8",
+      "ip": "00:11:25:C4:35:B8",
+      "mac": "172.24.22.2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-254.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.2",
-      "mac": "00:11:25:C4:35:B9",
+      "ip": "00:11:25:C4:35:B9",
+      "mac": "172.24.149.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-254-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index bfe095e28dbc6f8dcc0dd355dc5c28c714a76d45..4a2a9f01654ec7bb3f9bdf1e91e23ef5b4325f5f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.3",
-      "mac": "00:11:25:91:48:BC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.3",
-      "mac": "00:60:DD:47:7C:E1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-255-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.3",
-      "mac": "00:11:25:C4:09:86",
+      "ip": "changée",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-255.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.3",
-      "mac": "00:11:25:C4:09:87",
+      "ip": "00:11:25:C4:33:05",
+      "mac": "172.24.149.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-255-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index f3edfa947b1f11d9f5e33373c73e64bdf7c3d72e..8f47b09dd4b4ab62d2dbcefc79da4d6ddd4e647c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.4",
-      "mac": "00:11:25:91:47:F0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.4",
-      "mac": "00:60:DD:47:88:FA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-256-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.4",
-      "mac": "00:11:25:C4:35:90",
+      "ip": "00:11:25:C4:35:90",
+      "mac": "172.24.22.4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-256.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.4",
-      "mac": "00:11:25:C4:35:91",
+      "ip": "00:11:25:C4:35:91",
+      "mac": "172.24.149.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-256-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 493bb955c96cba20b2970fe949aa02f1e8c2d18d..8ab387fffff1e05bdff16cbb37eb0921e0dec123 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.5",
-      "mac": "00:11:25:91:47:E2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.5",
-      "mac": "00:60:DD:47:C7:F6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-257-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.5",
-      "mac": "00:11:25:C4:35:62",
+      "ip": "00:11:25:C4:35:62",
+      "mac": "172.24.22.5",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-257.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.5",
-      "mac": "00:11:25:C4:35:63",
+      "ip": "00:11:25:C4:35:63",
+      "mac": "172.24.149.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-257-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 8da953ef0fb6c79c50aa4e8d4df4a95bc3c12560..e67013d68c9311cfd64d7e7eb9a29ae41af690c2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.6",
-      "mac": "00:11:25:91:47:7C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.6",
-      "mac": "00:60:DD:47:7D:7F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-258-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.6",
-      "mac": "00:11:25:C4:13:1A",
+      "ip": "00:11:25:C4:13:1A",
+      "mac": "172.24.22.6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-258.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.6",
-      "mac": "00:11:25:C4:13:1B",
+      "ip": "00:11:25:C4:13:1B",
+      "mac": "172.24.149.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-258-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 1deb5832e596be37dd815100af4fd8c56c577bd4..f75ff0d8d86a8194525fc3164b7466aa3d5b0db1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.7",
-      "mac": "00:11:25:91:49:15",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.7",
-      "mac": "00:60:DD:47:88:FF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-259-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.7",
-      "mac": "00:11:25:C4:35:6A",
+      "ip": "00:11:25:C4:35:6A",
+      "mac": "172.24.22.7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-259.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.7",
-      "mac": "00:11:25:C4:35:6B",
+      "ip": "00:11:25:C4:35:6B",
+      "mac": "172.24.149.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-259-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 67619928bd34c79565b13a31286553d11c2435dc..3de9ee99adbb775de21d67d7f069da24eee5f33b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.26",
-      "mac": "00:11:25:91:48:A5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.26",
-      "mac": "00:60:DD:47:5A:59",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-26-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.26",
-      "mac": "00:11:25:C4:35:A4",
+      "ip": "00:11:25:C4:35:A4",
+      "mac": "172.24.3.26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.26",
-      "mac": "00:11:25:C4:35:A5",
+      "ip": "00:11:25:C4:35:A5",
+      "mac": "172.24.130.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-26-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 2fe791de0f63db6bf24d7a1a7b87a058239a17e0..00abade4c477fb2896cd86fc864fefd93542e779 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.8",
-      "mac": "00:11:25:91:45:D3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.8",
-      "mac": "00:60:DD:47:7D:B0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-260-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.8",
-      "mac": "00:11:25:C4:33:82",
+      "ip": "00:11:25:C4:33:82",
+      "mac": "172.24.22.8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-260.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.8",
-      "mac": "00:11:25:C4:33:83",
+      "ip": "00:11:25:C4:33:83",
+      "mac": "172.24.149.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-260-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index 599b6a3edcb37dbdcf7f846ec6dc3a3a69a402e0..0332f0e065e804edc0daab1c122bf98f41607b5a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.9",
-      "mac": "00:11:25:91:48:7B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.9",
-      "mac": "00:60:DD:47:88:F8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-261-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.9",
-      "mac": "00:11:25:C4:2D:72",
+      "ip": "00:11:25:C4:2D:72",
+      "mac": "172.24.22.9",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-261.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.9",
-      "mac": "00:11:25:C4:2D:73",
+      "ip": "00:11:25:C4:2D:73",
+      "mac": "172.24.149.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-261-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index 1c61beae0f50d362b7ad3fea891973904738aecd..0eb8d12fcb74ce4df6edaa0883ecfb83b259d961 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.10",
-      "mac": "00:11:25:91:47:46",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.10",
-      "mac": "00:60:DD:47:7D:11",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-262-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.10",
-      "mac": "00:11:25:C4:34:E8",
+      "ip": "00:11:25:C4:34:E8",
+      "mac": "172.24.22.10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-262.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.10",
-      "mac": "00:11:25:C4:34:E9",
+      "ip": "00:11:25:C4:34:E9",
+      "mac": "172.24.149.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-262-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index f2a66e615b8429669162ae40f2b54e4569b6494e..064d2fc3638186ce122248129e24a1df72b8cfc4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.11",
-      "mac": "00:11:25:91:48:07",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.11",
-      "mac": "00:60:DD:47:89:C5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-263-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.11",
-      "mac": "00:11:25:C4:35:88",
+      "ip": "00:11:25:C4:35:88",
+      "mac": "172.24.22.11",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-263.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.11",
-      "mac": "00:11:25:C4:35:89",
+      "ip": "00:11:25:C4:35:89",
+      "mac": "172.24.149.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-263-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index 6ff291528f6295612225f3274341bedb92fddc33..b3b89fc00cfd981d0c0adbcdee1956599ad86dd0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.149.12",
-      "mac": "00:11:25:91:48:14",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.89.12",
-      "mac": "00:60:DD:47:89:CA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-264-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.22.12",
-      "mac": "00:11:25:C4:33:5E",
+      "ip": "00:11:25:C4:33:5E",
+      "mac": "172.24.22.12",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-264.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.149.12",
-      "mac": "00:11:25:C4:33:5F",
+      "ip": "00:11:25:C4:33:5F",
+      "mac": "172.24.149.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-264-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index 4e1827145432cff453d91c33ee01328f698f53d5..ca3a0dfb2aa36168f5991ce2b0d02c600b4cba3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.13",
-      "mac": "00:11:25:91:46:36",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.13",
-      "mac": "00:60:DD:47:5A:1F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-265-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.13",
-      "mac": "00:11:25:C4:34:64",
+      "ip": "00:11:25:C4:34:64",
+      "mac": "172.24.23.13",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-265.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.13",
-      "mac": "00:11:25:C4:34:65",
+      "ip": "00:11:25:C4:34:65",
+      "mac": "172.24.150.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-265-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 48e71b3175d9c1c047f65e492f774f309b6414c0..9aa26968bd3f750fa2e1517f5f82b400e7597eb7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.14",
-      "mac": "00:11:25:91:46:60",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.14",
-      "mac": "00:60:DD:47:89:8B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-266-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.14",
-      "mac": "00:11:25:C4:34:8A",
+      "ip": "00:11:25:C4:34:8A",
+      "mac": "172.24.23.14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-266.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.14",
-      "mac": "00:11:25:C4:34:8B",
+      "ip": "00:11:25:C4:34:8B",
+      "mac": "172.24.150.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-266-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index 3435247fe3c936b046738342ef3ff05175d800e2..cb2b4be1f319b9772270e869c12adf2d1944e4dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.15",
-      "mac": "00:11:25:91:45:AE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.15",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-267-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.15",
-      "mac": "00:11:25:C4:35:36",
+      "ip": "00:11:25:C4:35:36",
+      "mac": "172.24.23.15",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-267.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.15",
-      "mac": "00:11:25:C4:35:37",
+      "ip": "00:11:25:C4:35:37",
+      "mac": "172.24.150.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-267-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index c76bb174a87b6fad577bdd7d77fa747f058e842a..42579365dfabbabfa8814cef61497e812b7f250a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.16",
-      "mac": "00:11:25:91:45:87",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.16",
-      "mac": "00:60:DD:47:89:C7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-268-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.16",
-      "mac": "00:11:25:C4:34:4E",
+      "ip": "00:11:25:C4:34:4E",
+      "mac": "172.24.23.16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-268.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.16",
-      "mac": "00:11:25:C4:34:4F",
+      "ip": "00:11:25:C4:34:4F",
+      "mac": "172.24.150.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-268-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index 9aae0fd827e3199dcd4f3256d448993b8e9c6d57..739189f1cf90a6181c9bb58b023b09cff60058c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.17",
-      "mac": "00:11:25:91:46:D0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.17",
-      "mac": "00:60:DD:47:89:C9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-269-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.17",
-      "mac": "00:11:25:C4:33:0E",
+      "ip": "00:11:25:C4:33:0E",
+      "mac": "172.24.23.17",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-269.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.17",
-      "mac": "00:11:25:C4:33:0F",
+      "ip": "00:11:25:C4:33:0F",
+      "mac": "172.24.150.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-269-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index 60cdb792b01bec6985c5c982178f37bceb8370ce..63f0d31227b12d840d835f0c7b2f3305227ecab0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.27",
-      "mac": "00:11:25:91:49:1C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.27",
-      "mac": "00:60:DD:47:59:33",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-27-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.27",
-      "mac": "00:11:25:C4:31:4E",
+      "ip": "00:11:25:C4:31:4E",
+      "mac": "172.24.3.27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.27",
-      "mac": "00:11:25:C4:31:4F",
+      "ip": "00:11:25:C4:31:4F",
+      "mac": "172.24.130.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-27-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index 85978b621644d63aab65daa4958062412d4b3bc4..b90fa3547c4d7eb8aafe9f6005264a2ce0df52c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.18",
-      "mac": "00:11:25:91:46:CF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.18",
-      "mac": "00:60:DD:47:89:C4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-270-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.18",
-      "mac": "00:11:25:C4:35:48",
+      "ip": "00:11:25:C4:35:48",
+      "mac": "172.24.23.18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-270.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.18",
-      "mac": "00:11:25:C4:35:49",
+      "ip": "00:11:25:C4:35:49",
+      "mac": "172.24.150.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-270-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index b7d98199a5ae60f53c7efb1f2e08f2d1196b10fc..c14171a9f59115be250653f12b6c3b7d4e9d790b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.19",
-      "mac": "00:11:25:91:47:7D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.19",
-      "mac": "00:60:DD:47:7C:CC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-271-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.19",
-      "mac": "00:11:25:C4:31:92",
+      "ip": "00:11:25:C4:31:92",
+      "mac": "172.24.23.19",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-271.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.19",
-      "mac": "00:11:25:C4:31:93",
+      "ip": "00:11:25:C4:31:93",
+      "mac": "172.24.150.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-271-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 545afa9dcf542a63330e6b859ff854ea6c37a54e..48edec4502c7ea95df271cd6f725975ea1975655 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.20",
-      "mac": "00:11:25:91:48:15",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.20",
-      "mac": "00:60:DD:47:89:CE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-272-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.20",
-      "mac": "00:11:25:C4:2F:20",
+      "ip": "00:11:25:C4:2F:20",
+      "mac": "172.24.23.20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-272.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.20",
-      "mac": "00:11:25:C4:2F:21",
+      "ip": "00:11:25:C4:2F:21",
+      "mac": "172.24.150.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-272-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index 5cbc79b55baf55114cb2a1258369fff796da6fb9..5d76ca4e8b6ba0a19028dfdec95ea8a0e08aafaf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.21",
-      "mac": "00:11:25:91:46:99",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.21",
-      "mac": "00:60:DD:47:89:C8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-273-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.21",
-      "mac": "00:11:25:C4:32:EE",
+      "ip": "00:11:25:C4:32:EE",
+      "mac": "172.24.23.21",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-273.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.21",
-      "mac": "00:11:25:C4:32:EF",
+      "ip": "00:11:25:C4:32:EF",
+      "mac": "172.24.150.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-273-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 9b01fc8b2ab034200e1b29dbd183bf8a393b747b..7b04ca7c38d0f0936581db5a19fa3b3068f4f60d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.22",
-      "mac": "00:11:25:91:45:C9",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.22",
-      "mac": "00:60:DD:47:89:D2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-274-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.22",
-      "mac": "00:11:25:C4:35:C0",
+      "ip": "00:11:25:C4:35:C0",
+      "mac": "172.24.23.22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-274.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.22",
-      "mac": "00:11:25:C4:35:C1",
+      "ip": "00:11:25:C4:35:C1",
+      "mac": "172.24.150.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-274-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 17c841874ba7a7b2bfaa6ec33f420b70eea0d10b..c19c740e240cd17ca91c08def6a5c613936d1649 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.23",
-      "mac": "00:11:25:91:45:F0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.23",
-      "mac": "00:60:DD:47:89:90",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-275-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.23",
-      "mac": "00:11:25:C4:11:38",
+      "ip": "00:11:25:C4:11:38",
+      "mac": "172.24.23.23",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-275.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.23",
-      "mac": "00:11:25:C4:11:39",
+      "ip": "00:11:25:C4:11:39",
+      "mac": "172.24.150.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-275-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index bb726c099fe3c418ec6a78d70fb520fe95be6ad9..ad3f375c0ce13dd3f6fad354251474c6b48980ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.150.24",
-      "mac": "00:09:6B:5E:FB:10",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.90.24",
-      "mac": "00:60:DD:47:89:0D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-276-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.23.24",
-      "mac": "00:11:25:C4:35:B6",
+      "ip": "00:11:25:C4:35:B6",
+      "mac": "172.24.23.24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-276.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.150.24",
-      "mac": "00:11:25:C4:35:B7",
+      "ip": "00:11:25:C4:35:B7",
+      "mac": "172.24.150.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-276-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index 794bb09a540f2fa2a5bb465fa934d51425cc9068..2fe124c22d259a443d4b42597e8a618f8185521c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.25",
-      "mac": "00:11:25:91:49:5E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.25",
-      "mac": "00:60:DD:47:89:87",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-277-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.25",
-      "mac": "00:11:25:C4:34:58",
+      "ip": "00:11:25:C4:34:58",
+      "mac": "172.24.24.25",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-277.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.25",
-      "mac": "00:11:25:C4:34:59",
+      "ip": "00:11:25:C4:34:59",
+      "mac": "172.24.151.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-277-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index 7d38d129e2b1a37e48924597cc3e9507690384ba..d098515031e0e7bdc153140f856703e7eeae2263 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.26",
-      "mac": "00:11:25:91:47:6C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.26",
-      "mac": "00:60:DD:47:C7:3E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-278-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.26",
-      "mac": "00:11:25:C4:34:46",
+      "ip": "00:11:25:C4:34:46",
+      "mac": "172.24.24.26",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-278.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.26",
-      "mac": "00:11:25:C4:34:47",
+      "ip": "00:11:25:C4:34:47",
+      "mac": "172.24.151.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-278-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index db0e98f130e8d81662c44e02191d820e4b297b78..9c1bde3208d15fb5ca677791ce3b515cef084f16 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.27",
-      "mac": "00:11:25:91:46:42",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.27",
-      "mac": "00:60:DD:47:C7:FD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-279-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.27",
-      "mac": "00:11:25:C4:33:96",
+      "ip": "00:11:25:C4:33:96",
+      "mac": "172.24.24.27",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-279.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.27",
-      "mac": "00:11:25:C4:33:97",
+      "ip": "00:11:25:C4:33:97",
+      "mac": "172.24.151.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-279-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index 333cb5f2604dce20370c6af82a6c436280f35e31..7be5137c971fb7fd56953a2e5c0704d439a2e18c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.28",
-      "mac": "00:11:25:91:49:01",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.28",
-      "mac": "00:60:DD:47:5A:B6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-28-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.28",
-      "mac": "00:11:25:C4:34:6E",
+      "ip": "00:11:25:C4:34:6E",
+      "mac": "172.24.3.28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.28",
-      "mac": "00:11:25:C4:34:6F",
+      "ip": "00:11:25:C4:34:6F",
+      "mac": "172.24.130.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-28-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index 4dcc0f664fc1939683c9bf825acdd0fa85d3da1b..3b247bdc4063164d54076a2075fcbdceac79cf84 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.28",
-      "mac": "00:11:25:91:46:92",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.28",
-      "mac": "00:60:DD:47:C7:FC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-280-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.28",
-      "mac": "00:11:25:C4:33:20",
+      "ip": "00:11:25:C4:33:20",
+      "mac": "172.24.24.28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-280.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.28",
-      "mac": "00:11:25:C4:33:21",
+      "ip": "00:11:25:C4:33:21",
+      "mac": "172.24.151.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-280-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index d7f1eb4a7d3c4f2deb0a28b4cac3ae7eecc80e86..5340855ff253d5789e8bada8604a3fd508912fc8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.29",
-      "mac": "00:11:25:91:45:7F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.29",
-      "mac": "00:60:DD:47:C7:7D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-281-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.29",
-      "mac": "00:11:25:C4:33:18",
+      "ip": "00:11:25:C4:33:18",
+      "mac": "172.24.24.29",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-281.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.29",
-      "mac": "00:11:25:C4:33:19",
+      "ip": "00:11:25:C4:33:19",
+      "mac": "172.24.151.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-281-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index 9e10da26697cd896d3437f2b0a28a667147b33b3..08fdc1979dc520455417f6e7634dd54931085351 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.30",
-      "mac": "00:11:25:91:47:11",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.30",
-      "mac": "00:60:DD:47:89:1C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-282-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.30",
-      "mac": "00:11:25:C4:31:44",
+      "ip": "00:11:25:C4:31:44",
+      "mac": "172.24.24.30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-282.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.30",
-      "mac": "00:11:25:C4:31:45",
+      "ip": "00:11:25:C4:31:45",
+      "mac": "172.24.151.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-282-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 0145ca705e72f391df1da60f50ece44bc278544b..e79e1f760e6853ab70149b087ad8453a1adbd783 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.31",
-      "mac": "00:11:25:91:45:9E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.31",
-      "mac": "00:60:DD:47:89:86",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-283-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.31",
-      "mac": "00:11:25:C4:34:5E",
+      "ip": "00:11:25:C4:34:5E",
+      "mac": "172.24.24.31",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-283.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.31",
-      "mac": "00:11:25:C4:34:5F",
+      "ip": "00:11:25:C4:34:5F",
+      "mac": "172.24.151.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-283-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index 0754e15ef589d1a349272f7d186f33e701f5b6f5..cb03a27ea75d3f482a845764f895951202aab3c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.32",
-      "mac": "00:11:25:91:45:A2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.32",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-284-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.32",
-      "mac": "00:11:25:C4:49:DE",
+      "ip": "00:11:25:C4:49:DE",
+      "mac": "172.24.24.32",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-284.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.32",
-      "mac": "00:11:25:C4:49:DF",
+      "ip": "00:11:25:C4:49:DF",
+      "mac": "172.24.151.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-284-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index e1c483e4fdffcad27fd74b4b8762921f0f1b0bee..5a89938060b0f9f223cb168baee53eeee09d03f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.33",
-      "mac": "00:11:25:91:48:CE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.33",
-      "mac": "00:60:DD:47:89:CC",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-285-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.33",
-      "mac": "00:11:25:C4:35:BE",
+      "ip": "00:11:25:C4:35:BE",
+      "mac": "172.24.24.33",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-285.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.33",
-      "mac": "00:11:25:C4:35:BF",
+      "ip": "00:11:25:C4:35:BF",
+      "mac": "172.24.151.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-285-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index 3edc6aa5b35f4ef6474846cac9d4e06ffe20c328..43c0116642dc43b5a2cf5c40011b4df1a44554e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.34",
-      "mac": "00:11:25:91:45:DA",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.34",
-      "mac": "00:60:DD:47:89:C2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-286-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.34",
-      "mac": "00:11:25:C4:2A:C2",
+      "ip": "00:11:25:C4:2A:C2",
+      "mac": "172.24.24.34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-286.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.34",
-      "mac": "00:11:25:C4:2A:C3",
+      "ip": "00:11:25:C4:2A:C3",
+      "mac": "172.24.151.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-286-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index e7132c7549862a602c5c295ebef919a3d2b70cc2..48ea604f403fa46354b63cfa12dd9b4f5c65344a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.35",
-      "mac": "00:11:25:91:46:33",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.35",
-      "mac": "00:60:DD:47:89:C6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-287-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.35",
-      "mac": "00:11:25:C4:34:40",
+      "ip": "00:11:25:C4:34:40",
+      "mac": "172.24.24.35",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-287.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.35",
-      "mac": "00:11:25:C4:34:41",
+      "ip": "00:11:25:C4:34:41",
+      "mac": "172.24.151.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-287-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index 69e9f53f61767be671bab0144063497fef79308a..8741df1183a05efc46b573d261cbe6c7a314e045 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.151.36",
-      "mac": "00:11:25:91:46:58",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,39 +30,21 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.91.36",
-      "mac": "00:60:DD:47:89:CD",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-288-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.24.36",
-      "mac": "00:11:25:C4:34:66",
+      "ip": "00:11:25:C4:34:66",
+      "mac": "172.24.24.36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.151.36",
-      "mac": "00:11:25:C4:34:67",
+      "ip": "00:11:25:C4:34:67",
+      "mac": "172.24.151.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-288-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index e2dcdaa1a58c1b94fbf49a3aaa1cc15b9fbbddee..bb0c237ca9d6bb667a2acb18f43d36228025de0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.1",
-      "mac": "00:11:25:91:48:22",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-289-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.1",
-      "mac": "00:60:DD:47:89:1D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-289-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.1",
-      "mac": "00:11:25:C4:33:68",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-289.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.1",
-      "mac": "00:11:25:C4:33:69",
+      "ip": "00:11:25:C4:33:69",
+      "mac": "172.24.152.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-289-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index e31eb195d67a1a4326aa0ba2d94fd31e9ddc472f..f7946ae810913a7f25e7f2fe005d46663edcd7ed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.29",
-      "mac": "00:14:5E:65:C6:29",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.29",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-29-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.29",
-      "mac": "00:11:25:C4:05:0C",
+      "ip": "00:11:25:C4:34:52",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.29",
-      "mac": "00:11:25:C4:34:53",
+      "ip": "00:11:25:C4:34:53",
+      "mac": "172.24.130.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-29-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 0cf0d455f6ee67057da463e7650de306b23e2b27..d3b87d6ae47cf81a68953e866ca29dec541dd5c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -4,83 +4,26 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.2",
-      "mac": "00:11:25:91:48:A4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-290-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.2",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-290-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.2",
-      "mac": "00:11:25:C4:33:7C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-290.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.2",
-      "mac": "00:11:25:C4:33:7D",
+      "ip": "00:11:25:C4:33:7D",
+      "mac": "172.24.152.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-290-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 09882612c02d1a544f4877525d07c43b214f3d85..e25179cdbe07329a17791f84dde44d84a02b7fa2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.3",
-      "mac": "00:11:25:91:47:77",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-291-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.3",
-      "mac": "00:60:DD:47:C7:FA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-291-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.3",
-      "mac": "00:11:25:C4:33:1C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-291.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.3",
-      "mac": "00:11:25:C4:33:1D",
+      "ip": "00:11:25:C4:33:1D",
+      "mac": "172.24.152.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-291-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 5c64952ac15888476c0b8c31a288588e610984d2..78a736fbd513d3e9dc6984b20f0745c16ca2eb4d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.4",
-      "mac": "00:11:25:91:46:19",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-292-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.4",
-      "mac": "00:60:DD:47:C7:FF",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-292-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.4",
-      "mac": "00:11:25:C4:33:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-292.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.4",
-      "mac": "00:11:25:C4:33:89",
+      "ip": "00:11:25:C4:33:89",
+      "mac": "172.24.152.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-292-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index c6569cefb91cd1175998a596d44a39ac888f41f7..239dca37a19562b97bd8cea5cddb85a896f6a072 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.5",
-      "mac": "00:11:25:91:43:D8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-293-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.5",
-      "mac": "00:60:DD:47:89:13",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-293-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.5",
-      "mac": "00:11:25:C4:33:4A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-293.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.5",
-      "mac": "00:11:25:C4:33:4B",
+      "ip": "00:11:25:C4:33:4B",
+      "mac": "172.24.152.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-293-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 355e77da8a7f2d7acc49d902f0f1ca9f262e68b8..3cac9fc39f60d90d8e38e7b17ea640a0d3414363 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.6",
-      "mac": "00:11:25:91:47:EF",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-294-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.6",
-      "mac": "00:60:DD:47:89:78",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-294-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.6",
-      "mac": "00:11:25:C4:33:24",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-294.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.6",
-      "mac": "00:11:25:C4:33:25",
+      "ip": "00:11:25:C4:33:25",
+      "mac": "172.24.152.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-294-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index 0d4e599b0df730933eb39240b105e2f5d5ee63e3..4e98cc2f5d41c4664a567ff4358dced390d243e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.7",
-      "mac": "00:11:25:91:46:5A",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-295-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.7",
-      "mac": "00:60:DD:47:89:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-295-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.7",
-      "mac": "00:11:25:C4:33:7A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-295.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.7",
-      "mac": "00:11:25:C4:33:7B",
+      "ip": "00:11:25:C4:33:7B",
+      "mac": "172.24.152.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-295-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index ea0bb9bd5b616bd7f0da160951faf7fbd85395b0..47760a2e9cd4efb38942addb6b6aa7a2dd0245ea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.8",
-      "mac": "00:11:25:91:47:AB",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-296-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.8",
-      "mac": "00:60:DD:47:89:B1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-296-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.8",
-      "mac": "00:11:25:C4:20:06",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-296.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.8",
-      "mac": "00:11:25:C4:20:07",
+      "ip": "00:11:25:C4:20:07",
+      "mac": "172.24.152.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-296-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index 70ee41d56241727290660578b60d688569a6f6d7..4e400cf04c2e82b382f5abd674b5a0b6989abdd3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -9,77 +9,21 @@
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.26.152.9",
-      "mac": "00:11:25:91:47:D2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "gdx-297-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
-      "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
-      "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.9",
-      "mac": "00:60:DD:47:89:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-297-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.24.25.9",
-      "mac": "00:11:25:C4:33:3C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-297.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.9",
-      "mac": "00:11:25:C4:33:3D",
+      "ip": "00:11:25:C4:33:3D",
+      "mac": "172.24.152.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-297-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 916d71793d16b30e2b34bf0eef27ef408824e940..47fd3a71472c195685adac412d08caf647452550 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.152.10",
-      "mac": "00:11:25:91:46:8E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-298-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.10",
-      "mac": "00:60:DD:47:89:95",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-298-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.25.10",
-      "mac": "00:11:25:C4:33:48",
+      "ip": "00:11:25:C4:33:48",
+      "mac": "172.24.25.10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.10",
-      "mac": "00:11:25:C4:33:49",
+      "ip": "00:11:25:C4:33:49",
+      "mac": "172.24.152.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-298-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 39884bddbc5ed405803baa6b6e73bfb607c0c2e8..b46f6170194d7e81b3b9150b9c96e134f91de6ab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.152.11",
-      "mac": "00:11:25:91:47:0B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-299-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.11",
-      "mac": "00:60:DD:47:89:0E",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-299-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.25.11",
-      "mac": "00:11:25:C4:33:46",
+      "ip": "00:11:25:C4:33:46",
+      "mac": "172.24.25.11",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.11",
-      "mac": "00:11:25:C4:33:47",
+      "ip": "00:11:25:C4:33:47",
+      "mac": "172.24.152.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-299-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index 504af85d9a1fc5f941e4ad292c75875f4373b9e5..1dddfa2ab8a32f44b8162f4f6b009386b1bc5bdb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -9,12 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "myri0",
+      "driver": "mx_driver",
+      "enabled": true,
+      "interface": "Myrinet",
+      "ip": null,
+      "mac": null,
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-3-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.3",
-      "mac": "00:11:25:91:47:3B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +48,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.3",
-      "mac": "00:60:DD:47:59:76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-3-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.3",
-      "mac": "00:11:25:C4:35:3A",
+      "ip": "00:11:25:C4:35:3A",
+      "mac": "172.24.1.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +71,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.3",
-      "mac": "00:11:25:C4:35:3B",
+      "ip": "00:11:25:C4:35:3B",
+      "mac": "172.24.128.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-3-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index df288f4d10f1d47c78c2176a20e18cb55adc95ae..0e2065d7cd15d52539f4722cffe738decca7003f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.30",
-      "mac": "00:11:25:91:46:61",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.30",
-      "mac": "00:60:DD:47:65:DE",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-30-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.30",
-      "mac": "00:11:25:C4:35:2C",
+      "ip": "00:11:25:C4:35:2C",
+      "mac": "172.24.3.30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.30",
-      "mac": "00:11:25:C4:35:2D",
+      "ip": "00:11:25:C4:35:2D",
+      "mac": "172.24.130.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-30-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index ec0c35755276350f5e57983a8293e6c28e592bbf..8dd6ca6d02981a37039d3392719b9ab7adbaee75 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.152.12",
-      "mac": "00:11:25:91:45:A9",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-300-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.92.12",
-      "mac": "00:60:DD:47:89:1B",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-300-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.25.12",
-      "mac": "00:11:25:C4:33:14",
+      "ip": "00:11:25:C4:33:14",
+      "mac": "172.24.25.12",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.152.12",
-      "mac": "00:11:25:C4:33:15",
+      "ip": "00:11:25:C4:33:15",
+      "mac": "172.24.152.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-300-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 201fb2433f0611e10e1ed85b655dcb092d24f823..1377b2d508667cea58aa4f3a7980eb4eb795ab08 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.13",
-      "mac": "00:11:25:91:45:C4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-301-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.13",
-      "mac": "00:60:DD:47:89:93",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-301-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.13",
-      "mac": "00:11:25:C4:35:06",
+      "ip": "00:11:25:C4:35:06",
+      "mac": "172.24.26.13",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.13",
-      "mac": "00:11:25:C4:35:07",
+      "ip": "00:11:25:C4:35:07",
+      "mac": "172.24.153.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-301-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 75040cb74385b2ad64f8d636353fd4d51824705d..4940d451715e9d0cae7958eec6940a08ea140783 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.14",
-      "mac": "00:11:25:91:46:64",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-302-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.14",
-      "mac": "00:60:DD:47:89:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-302-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.14",
-      "mac": "00:11:25:C4:34:42",
+      "ip": "00:11:25:C4:34:42",
+      "mac": "172.24.26.14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.14",
-      "mac": "00:11:25:C4:34:43",
+      "ip": "00:11:25:C4:34:43",
+      "mac": "172.24.153.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-302-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index d91db625ee5dda8fb710597aa9d7fb509c6029d8..f65bde6312c72bc3526b14e64a5a8cad067147e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.15",
-      "mac": "00:11:25:91:45:9A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-303-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.15",
-      "mac": "00:60:DD:47:89:7D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-303-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.15",
-      "mac": "00:11:25:C4:0F:10",
+      "ip": "00:11:25:C4:0F:10",
+      "mac": "172.24.26.15",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.15",
-      "mac": "00:11:25:C4:0F:11",
+      "ip": "00:11:25:C4:0F:11",
+      "mac": "172.24.153.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-303-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index c376872e4827a29dd1c46e6343d736451d65bb41..0649ced827dffcf268807f6de3cafba3c4d9478b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.16",
-      "mac": "00:11:25:91:47:9C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-304-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.16",
-      "mac": "00:60:DD:47:89:8F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-304-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.16",
-      "mac": "00:11:25:C4:33:58",
+      "ip": "00:11:25:C4:33:58",
+      "mac": "172.24.26.16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.16",
-      "mac": "00:11:25:C4:33:59",
+      "ip": "00:11:25:C4:33:59",
+      "mac": "172.24.153.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-304-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index a9ecd1849419a55eeb7ea30c7339b923996a907c..a3d1838ec8f738c74b438c9119ce97067f4a9a63 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.17",
-      "mac": "00:11:25:91:46:5B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-305-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.17",
-      "mac": "00:60:DD:47:88:B0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-305-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.17",
-      "mac": "00:11:25:C4:34:62",
+      "ip": "00:11:25:C4:34:62",
+      "mac": "172.24.26.17",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.17",
-      "mac": "00:11:25:C4:34:63",
+      "ip": "00:11:25:C4:34:63",
+      "mac": "172.24.153.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-305-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index 46990a70465730a0a373c2c64b9c16895a4b4048..967072df032dcdab8e7af55f2b02f9bd3c5e505e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -11,56 +11,39 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.18",
-      "mac": "00:11:25:91:46:35",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-306-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.18",
-      "mac": "00:60:DD:47:89:96",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-306-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.18",
-      "mac": "00:11:25:C4:41:5A",
+      "ip": "00:11:25:C4:41:5A",
+      "mac": "172.24.26.18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.18",
-      "mac": "00:11:25:C4:41:5B",
+      "ip": "00:11:25:C4:41:5B",
+      "mac": "172.24.153.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-306-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index 14612c35b75e3fcc3fd60d2d61e624e4f7acb77f..8a2a5e112cb19f5fcec759dc055096546ae79901 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.19",
-      "mac": "00:11:25:91:46:FE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-307-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.19",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-307-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.19",
-      "mac": "00:11:25:C4:33:4C",
+      "ip": "00:11:25:C4:33:4C",
+      "mac": "172.24.26.19",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.19",
-      "mac": "00:11:25:C4:33:4D",
+      "ip": "00:11:25:C4:33:4D",
+      "mac": "172.24.153.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-307-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index de25c49f85a3f703c43ef26b1ce88cd84576a5b2..2d1a378b4b6d0b6d67e54c7dfece7a2dda647e19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Freezes on the very first boot screen. Not even possible to enter BIOS settings menu.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.20",
-      "mac": "00:11:25:91:46:66",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-308-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.20",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-308-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.20",
-      "mac": "00:11:25:C4:32:6A",
+      "ip": "00:11:25:C4:32:6A",
+      "mac": "172.24.26.20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.20",
-      "mac": "00:11:25:C4:32:6B",
+      "ip": "00:11:25:C4:32:6B",
+      "mac": "172.24.153.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-308-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index 01691073d7269ec9622a1cd211590178cc632623..809517c1c5112bc3005aa2935c1a53c642d0a9dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.21",
-      "mac": "00:11:25:91:45:F6",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-309-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.21",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-309-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.21",
-      "mac": "00:11:25:C4:33:30",
+      "ip": "00:11:25:C4:33:30",
+      "mac": "172.24.26.21",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.21",
-      "mac": "00:11:25:C4:33:31",
+      "ip": "00:11:25:C4:33:31",
+      "mac": "172.24.153.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-309-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index ec9220958f446217b5f8e310f4b0b3116b208fd4..23ed724719e2368a8c60d6380750ba0fe44b07ca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.31",
-      "mac": "00:11:25:91:45:C5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.31",
-      "mac": "00:60:DD:47:59:69",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-31-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.31",
-      "mac": "00:11:25:C4:35:24",
+      "ip": "00:11:25:C4:35:24",
+      "mac": "172.24.3.31",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.31",
-      "mac": "00:11:25:C4:35:25",
+      "ip": "00:11:25:C4:35:25",
+      "mac": "172.24.130.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-31-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 48fc10313f473da85092d9a55b196197cbe0d36c..08345175e1a0890e8e7e00c1ef660af269891c06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -11,57 +11,40 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.153.22",
-      "mac": "00:11:25:91:47:A6",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-310-bmc.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear09.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
-      "switch_ip": "172.26.120.159",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.160",
+      "switch_mac": "00:0f:b5:fc:0d:a8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.93.22",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-310-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.26.22",
-      "mac": "00:11:25:C4:33:D0",
+      "ip": "00:11:25:C4:33:D0",
+      "mac": "172.24.26.22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.184",
-      "switch_mac": "nil",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.153.22",
-      "mac": "00:11:25:C4:33:D1",
+      "ip": "00:11:25:C4:33:D1",
+      "mac": "172.24.153.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-310-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 36afbb8e6f66c78828c72deddb3ec58d373348cd..25b0cc98e8af997e981b750ff7e52af7c42ec4fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.32",
-      "mac": "00:11:25:91:49:3D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.32",
-      "mac": "00:60:DD:47:65:B7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-32-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.32",
-      "mac": "00:11:25:C4:35:08",
+      "ip": "00:11:25:C4:35:08",
+      "mac": "172.24.3.32",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.32",
-      "mac": "00:11:25:C4:35:09",
+      "ip": "00:11:25:C4:35:09",
+      "mac": "172.24.130.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-32-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 404f38f4a19571eab79051f8f878e1f2f56207e0..aa9b79d7abc890ebc811346d0893dfd7b890d58b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.33",
-      "mac": "00:11:25:91:45:EB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.33",
-      "mac": "00:60:DD:47:5A:20",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-33-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.33",
-      "mac": "00:11:25:C4:34:70",
+      "ip": "00:11:25:C4:34:70",
+      "mac": "172.24.3.33",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.33",
-      "mac": "00:11:25:C4:34:71",
+      "ip": "00:11:25:C4:34:71",
+      "mac": "172.24.130.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-33-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 278283bec00eac4a85e4f4207d42cdde38b1e3af..8ff29b93c930f33ba9b62106c2571ce343fb9248 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.34",
-      "mac": "00:11:25:91:49:34",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.34",
-      "mac": "00:60:DD:47:5A:91",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-34-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.34",
-      "mac": "00:11:25:C4:33:8E",
+      "ip": "00:11:25:C4:33:8E",
+      "mac": "172.24.3.34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.34",
-      "mac": "00:11:25:C4:33:8F",
+      "ip": "00:11:25:C4:33:8F",
+      "mac": "172.24.130.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-34-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 0fb0061cecb6a11d28a136bd8e06e9ec33c62049..45e6b5061b71afa6aae133acdcb3b7614a5bdade 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.35",
-      "mac": "00:11:25:91:47:C5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.35",
-      "mac": "00:60:DD:47:65:BB",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-35-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.35",
-      "mac": "00:11:25:C4:34:7A",
+      "ip": "00:11:25:C4:34:7A",
+      "mac": "172.24.3.35",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.35",
-      "mac": "00:11:25:C4:34:7B",
+      "ip": "00:11:25:C4:34:7B",
+      "mac": "172.24.130.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-35-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index e0b7df565cbef467dd4581ddb31c67644158218f..18bf40a715ea142035dd8281ec66276fb0317d9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.130.36",
-      "mac": "00:11:25:91:45:E7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.70.36",
-      "mac": "00:60:DD:47:5A:90",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-36-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.3.36",
-      "mac": "00:11:25:C4:33:56",
+      "ip": "00:11:25:C4:33:56",
+      "mac": "172.24.3.36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.130.36",
-      "mac": "00:11:25:C4:33:57",
+      "ip": "00:11:25:C4:33:57",
+      "mac": "172.24.130.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-36-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index b1cd33c9b174f862af5f065b2d094e564d7d4b90..1241ecfc3c08f19e9ed31ffb758a8fde0a2a13b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.1",
-      "mac": "00:11:25:91:48:3C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.1",
-      "mac": "00:60:DD:47:59:AA",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-37-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.1",
-      "mac": "00:11:25:C4:31:66",
+      "ip": "00:11:25:C4:31:66",
+      "mac": "172.24.4.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.1",
-      "mac": "00:11:25:C4:31:67",
+      "ip": "00:11:25:C4:31:67",
+      "mac": "172.24.131.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-37-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index d648bae9f6d906426b420de45481e865838a2d6d..ae7d88d31b7d3a0e39ed50a87a6f3921b6d5012b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.2",
-      "mac": "00:11:25:91:47:26",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.2",
-      "mac": "00:60:DD:47:59:B1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-38-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.2",
-      "mac": "00:11:25:C4:34:6C",
+      "ip": "00:11:25:C4:34:6C",
+      "mac": "172.24.4.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.2",
-      "mac": "00:11:25:C4:34:6D",
+      "ip": "00:11:25:C4:34:6D",
+      "mac": "172.24.131.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-38-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index e2397808a0d3ec37fcabcce67528db00012a8a30..b1cc9adc5568653fc0e98e5c39a72f1ee640b7db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.3",
-      "mac": "00:11:25:91:45:A8",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.3",
-      "mac": "00:60:DD:47:59:71",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-39-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.3",
-      "mac": "00:11:25:C4:34:4A",
+      "ip": "00:11:25:C4:34:4A",
+      "mac": "172.24.4.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.3",
-      "mac": "00:11:25:C4:34:4B",
+      "ip": "00:11:25:C4:34:4B",
+      "mac": "172.24.131.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-39-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index b8af5a809fc4730063a040919650433ae6aa5039..8040d392b23dc6ecd13093f8de2b9e7783bbe098 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -9,12 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "myri0",
+      "driver": "mx_driver",
+      "enabled": true,
+      "interface": "Myrinet",
+      "ip": null,
+      "mac": null,
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-4-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.4",
-      "mac": "00:11:25:91:49:63",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +48,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.4",
-      "mac": "00:60:DD:47:59:74",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-4-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.4",
-      "mac": "00:11:25:C4:35:40",
+      "ip": "00:11:25:C4:35:40",
+      "mac": "172.24.1.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +71,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.4",
-      "mac": "00:11:25:C4:35:41",
+      "ip": "00:11:25:C4:35:41",
+      "mac": "172.24.128.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-4-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index c188ff0ee58b3449c699ee4961277146c9d343f8..7e73b6ff137d9a8fa013f93104a3970430736def 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.4",
-      "mac": "00:11:25:91:46:84",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.4",
-      "mac": "00:60:DD:47:68:87",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-40-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.4",
-      "mac": "00:11:25:C4:33:66",
+      "ip": "00:11:25:C4:33:66",
+      "mac": "172.24.4.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.4",
-      "mac": "00:11:25:C4:33:67",
+      "ip": "00:11:25:C4:33:67",
+      "mac": "172.24.131.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-40-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index cf3c4ec5f849fff376f3288ca68537f962c363c5..ca65410408e499936a38453a926b29547ee4ef66 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.5",
-      "mac": "00:11:25:91:45:AB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.5",
-      "mac": "00:60:DD:47:59:04",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-41-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.5",
-      "mac": "00:11:25:C4:34:86",
+      "ip": "00:11:25:C4:34:86",
+      "mac": "172.24.4.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.5",
-      "mac": "00:11:25:C4:34:87",
+      "ip": "00:11:25:C4:34:87",
+      "mac": "172.24.131.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-41-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index f5084a883641caf8478e174708aec41311282def..edb480c0cf81d9fd8a8ce212bbf936644d718cf9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.6",
-      "mac": "00:11:25:91:49:2C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.6",
-      "mac": "00:60:DD:47:67:94",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-42-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.6",
-      "mac": "00:11:25:C4:2B:F0",
+      "ip": "00:11:25:C4:2B:F0",
+      "mac": "172.24.4.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.6",
-      "mac": "00:11:25:C4:2B:F1",
+      "ip": "00:11:25:C4:2B:F1",
+      "mac": "172.24.131.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-42-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index bf313c5de6d0e4375ef28368469099f3242d3c52..d2dac33dbd0091678e12ca313fd103eac9f10bed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.7",
-      "mac": "00:11:25:91:45:BD",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.7",
-      "mac": "00:60:DD:47:59:05",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-43-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.7",
-      "mac": "00:11:25:C4:33:2A",
+      "ip": "00:11:25:C4:33:2A",
+      "mac": "172.24.4.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.7",
-      "mac": "00:11:25:C4:33:2B",
+      "ip": "00:11:25:C4:33:2B",
+      "mac": "172.24.131.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-43-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index 2aea3656839d1feb2f4d89fb2b45aebf6b5e2cce..356b8de3ca184a7305a350f7dba68bf6c33e1811 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.8",
-      "mac": "00:11:25:91:48:EC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.8",
-      "mac": "00:60:DD:47:59:00",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-44-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.8",
-      "mac": "00:11:25:C4:2F:50",
+      "ip": "00:11:25:C4:2F:50",
+      "mac": "172.24.4.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.8",
-      "mac": "00:11:25:C4:2F:51",
+      "ip": "00:11:25:C4:2F:51",
+      "mac": "172.24.131.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-44-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index e19d168b119ffe425bca0bb0adcb0e7cf9064d5a..73683ef80f75ed7be22084318aff4540eafe5cab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.9",
-      "mac": "00:11:25:91:49:3F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.9",
-      "mac": "00:60:DD:47:59:A3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-45-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.9",
-      "mac": "00:11:25:C4:35:18",
+      "ip": "00:11:25:C4:35:18",
+      "mac": "172.24.4.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.9",
-      "mac": "00:11:25:C4:35:19",
+      "ip": "00:11:25:C4:35:19",
+      "mac": "172.24.131.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-45-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index d330dec1467a9d3f0139c3d4637fe94829161bd7..47c6849f49c18e31f4c39b673b2807c93643dea7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.10",
-      "mac": "00:11:25:91:76:3B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.10",
-      "mac": "00:60:DD:47:65:DB",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-46-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.10",
-      "mac": "00:11:25:C4:09:C6",
+      "ip": "changée",
+      "mac": "{",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.10",
-      "mac": "00:11:25:C4:09:C7",
+      "ip": "00:11:25:C4:35:21",
+      "mac": "172.24.131.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-46-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 6265ccfef32ca652c9a5f38373351f24ba06e134..bfdec53e8792e54e53643d1c679eab5f707ed9c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.11",
-      "mac": "00:11:25:91:48:52",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.11",
-      "mac": "00:60:DD:47:58:F6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-47-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.11",
-      "mac": "00:11:25:C4:35:99",
+      "ip": "00:11:25:C4:35:99",
+      "mac": "172.24.4.11",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.11",
-      "mac": "00:11:25:C4:35:9A",
+      "ip": "00:11:25:C4:35:9A",
+      "mac": "172.24.131.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-47-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index b13bf25ca3dcceba7321ee80667c2905e8484f31..c115bb8fbec250ba5687dc4ebf22ee532420c4ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.131.12",
-      "mac": "00:11:25:91:46:06",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.71.12",
-      "mac": "00:60:DD:47:5A:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-48-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.4.12",
-      "mac": "00:11:25:C4:2D:6C",
+      "ip": "00:11:25:C4:2D:6C",
+      "mac": "172.24.4.12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.131.12",
-      "mac": "00:11:25:C4:2D:6D",
+      "ip": "00:11:25:C4:2D:6D",
+      "mac": "172.24.131.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-48-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index b60ff95c3246036201dcb6dd5e733dd468c3c97e..7dc442d958c92ef95b385ecae118189d2ee0604f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.13",
-      "mac": "00:11:25:91:49:11",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.13",
-      "mac": "00:60:DD:47:5A:80",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-49-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.13",
-      "mac": "00:11:25:C4:33:16",
+      "ip": "00:11:25:C4:33:16",
+      "mac": "172.24.5.13",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.13",
-      "mac": "00:11:25:C4:33:17",
+      "ip": "00:11:25:C4:33:17",
+      "mac": "172.24.132.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-49-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index a836ba9a3f50161c08d345beb0166e00ccf288af..cf39492a36d927992daa0881fef268f0c4d884f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.5",
-      "mac": "00:11:25:91:47:B0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.5",
-      "mac": "00:60:DD:47:59:68",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-5-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.5",
-      "mac": "00:11:25:C4:33:52",
+      "ip": "00:11:25:C4:33:52",
+      "mac": "172.24.1.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.5",
-      "mac": "00:11:25:C4:33:53",
+      "ip": "00:11:25:C4:33:53",
+      "mac": "172.24.128.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-5-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index ccd13ae3cfe3bf22dc0d40ddc5f0553a9cda0300..0ac5fc8336c99d8dc5c7f96f211eefbf3feebdc9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.14",
-      "mac": "00:11:25:91:49:3C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.14",
-      "mac": "00:60:DD:47:67:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-50-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.14",
-      "mac": "00:11:25:C4:33:92",
+      "ip": "00:11:25:C4:33:92",
+      "mac": "172.24.5.14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.14",
-      "mac": "00:11:25:C4:33:93",
+      "ip": "00:11:25:C4:33:93",
+      "mac": "172.24.132.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-50-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index e7b10856d58cc1549ae53556729ba4f2d301a4c7..11222f7aa56692c4982d57b267db9c5d0760f506 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.15",
-      "mac": "00:11:25:91:45:C1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.15",
-      "mac": "00:60:DD:47:5A:8D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-51-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.15",
-      "mac": "00:11:25:C4:49:8E",
+      "ip": "00:11:25:C4:49:8E",
+      "mac": "172.24.5.15",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.15",
-      "mac": "00:11:25:C4:49:8F",
+      "ip": "00:11:25:C4:49:8F",
+      "mac": "172.24.132.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-51-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 751f534c08f1762b4b4367afd877ff4cf09361b4..c9fb5c3c131eebac5f703a91e42828d75ac9bb1d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.16",
-      "mac": "00:11:25:91:47:21",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.16",
-      "mac": "00:60:DD:47:5A:7C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-52-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.16",
-      "mac": "00:11:25:C4:35:97",
+      "ip": "00:11:25:C4:35:97",
+      "mac": "172.24.5.16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.16",
-      "mac": "00:11:25:C4:35:98",
+      "ip": "00:11:25:C4:35:98",
+      "mac": "172.24.132.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-52-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index e9135788cb21fa06a9a76ca65c28da07f929f539..671bddb180836aece6f50fd4d23caf609c419600 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Stuck on the black screen with a blinking cursor on the screen top left corner.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.17",
-      "mac": "00:11:25:91:47:B1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.17",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-53-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.17",
-      "mac": "00:11:25:C4:3B:F6",
+      "ip": "00:11:25:C4:3B:F6",
+      "mac": "172.24.5.17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.17",
-      "mac": "00:11:25:C4:3B:F7",
+      "ip": "00:11:25:C4:3B:F7",
+      "mac": "172.24.132.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-53-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index ac81040cb1baf3fc34d625d1d05fb431f93d17e7..c18f07ae57174e100521defb36262c08d0deda9b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.18",
-      "mac": "00:11:25:91:45:93",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.18",
-      "mac": "00:60:DD:47:5A:84",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-54-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.18",
-      "mac": "00:11:25:C4:35:BC",
+      "ip": "00:11:25:C4:35:BC",
+      "mac": "172.24.5.18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.18",
-      "mac": "00:11:25:C4:35:BD",
+      "ip": "00:11:25:C4:35:BD",
+      "mac": "172.24.132.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-54-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index a2345727417704c64a6d6c90a60d227a72738927..1e520f78334e90bf13785a5bf19fe77e78c5a9d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.19",
-      "mac": "00:11:25:91:49:0B",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.19",
-      "mac": "00:60:DD:47:59:6F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-55-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.19",
-      "mac": "00:11:25:C4:3B:BC",
+      "ip": "00:11:25:C4:3B:BC",
+      "mac": "172.24.5.19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.19",
-      "mac": "00:11:25:C4:3B:BD",
+      "ip": "00:11:25:C4:3B:BD",
+      "mac": "172.24.132.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-55-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index be4e50f7fe56be1ca4ffa950de2a86000d1372d2..b5180f57d3f09c7193c10060185de9762745e8b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.20",
-      "mac": "00:11:25:91:47:96",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.20",
-      "mac": "00:60:DD:47:59:40",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-56-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.20",
-      "mac": "00:11:25:C4:3C:7C",
+      "ip": "00:11:25:C4:3C:7C",
+      "mac": "172.24.5.20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.20",
-      "mac": "00:11:25:C4:3C:7D",
+      "ip": "00:11:25:C4:3C:7D",
+      "mac": "172.24.132.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-56-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index 9a43800c0c67260e90deed04d0475567876fa263..e57482a40a6d115ec8316db95b480c35d86a87fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.21",
-      "mac": "00:11:25:91:49:50",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.21",
-      "mac": "00:60:DD:47:88:43",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-57-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.21",
-      "mac": "00:11:25:C4:3C:24",
+      "ip": "00:11:25:C4:3C:24",
+      "mac": "172.24.5.21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.21",
-      "mac": "00:11:25:C4:3C:25",
+      "ip": "00:11:25:C4:3C:25",
+      "mac": "172.24.132.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-57-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index ffb3bc5a355d62cafea98cde25e5e75edf53c2f7..db7f1904de1953a54c1ea2aa8e718649f86ef75e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.22",
-      "mac": "00:11:25:91:46:51",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.22",
-      "mac": "00:60:DD:47:68:42",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-58-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.22",
-      "mac": "00:11:25:C4:39:3E",
+      "ip": "00:11:25:C4:39:3E",
+      "mac": "172.24.5.22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.22",
-      "mac": "00:11:25:C4:39:3F",
+      "ip": "00:11:25:C4:39:3F",
+      "mac": "172.24.132.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-58-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 083072b8e1695807bfc88a74efb6144899154402..46cd39aea47d4f7afd0244a52ad2ae9882c8fa6c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.23",
-      "mac": "00:11:25:91:49:03",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.23",
-      "mac": "00:60:DD:47:67:89",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-59-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.23",
-      "mac": "00:11:25:C4:2E:30",
+      "ip": "00:11:25:C4:2E:30",
+      "mac": "172.24.5.23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.23",
-      "mac": "00:11:25:C4:2E:31",
+      "ip": "00:11:25:C4:2E:31",
+      "mac": "172.24.132.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-59-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 4e17994e35b3f96edd35439219aef0209f60757d..3f0f90a1c43d401489cdffd8b1770158487472f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.6",
-      "mac": "00:11:25:91:48:17",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.6",
-      "mac": "00:60:DD:47:59:77",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-6-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.6",
-      "mac": "00:11:25:C4:35:1E",
+      "ip": "00:11:25:C4:35:1E",
+      "mac": "172.24.1.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.6",
-      "mac": "00:11:25:C4:35:1F",
+      "ip": "00:11:25:C4:35:1F",
+      "mac": "172.24.128.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-6-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index 8bfbe0e99a73b3421b75e45001a65c9b5b4e150b..7f0837d63f2869e0869d32be32704e8c896bcd20 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.132.24",
-      "mac": "00:11:25:91:46:57",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.72.24",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-60-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.5.24",
-      "mac": "00:11:25:C4:3E:2C",
+      "ip": "00:11:25:C4:3E:2C",
+      "mac": "172.24.5.24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.132.24",
-      "mac": "00:11:25:C4:3E:2D",
+      "ip": "00:11:25:C4:3E:2D",
+      "mac": "172.24.132.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-60-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index 560aee1cbcb819784056e1a8cdac4e950175c82f..08647b42db9d10cbc7ce9249284d9ed137b6f634 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.25",
-      "mac": "00:11:25:91:48:B3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.25",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-61-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.25",
-      "mac": "00:11:25:C4:4E:10",
+      "ip": "00:11:25:C4:4E:10",
+      "mac": "172.24.6.25",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.25",
-      "mac": "00:11:25:C4:4E:11",
+      "ip": "00:11:25:C4:4E:11",
+      "mac": "172.24.133.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-61-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index e450c14dd7cc5baba2c5b1bbb0bf851a333f3621..c195e09f4b95a14d11675594c4f27d5464cc69d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.26",
-      "mac": "00:11:25:91:45:BB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.26",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-62-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.26",
-      "mac": "00:11:25:C4:3C:62",
+      "ip": "00:11:25:C4:3C:62",
+      "mac": "172.24.6.26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.26",
-      "mac": "00:11:25:C4:3C:63",
+      "ip": "00:11:25:C4:3C:63",
+      "mac": "172.24.133.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-62-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 232e73557ce43d802c7adf5e7bbd111cfc70b067..aa35f5f9772a10ee65da69737a6ba3822919d722 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.27",
-      "mac": "00:11:25:91:45:B2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.27",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-63-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.27",
-      "mac": "00:11:25:C4:3B:B4",
+      "ip": "00:11:25:C4:3B:B4",
+      "mac": "172.24.6.27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.27",
-      "mac": "00:11:25:C4:3B:B5",
+      "ip": "00:11:25:C4:3B:B5",
+      "mac": "172.24.133.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-63-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index bb859296156664f86762226184eea655c3285a5c..17fbdee4bfe3397c9727d9ce45ea989f52526620 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.28",
-      "mac": "00:11:25:91:45:AF",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.28",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-64-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.28",
-      "mac": "00:11:25:C4:39:86",
+      "ip": "00:11:25:C4:39:86",
+      "mac": "172.24.6.28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.28",
-      "mac": "00:11:25:C4:39:87",
+      "ip": "00:11:25:C4:39:87",
+      "mac": "172.24.133.28",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-64-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index 3cc2d2ca007bed5dfc6cab737fd52dc264f4d552..70361bca0dd04820cbb1615ca7a086240d9a1a9d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.29",
-      "mac": "00:11:25:91:46:C0",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.29",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-65-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.29",
-      "mac": "00:11:25:C4:3C:4C",
+      "ip": "00:11:25:C4:3C:4C",
+      "mac": "172.24.6.29",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.29",
-      "mac": "00:11:25:C4:3C:4D",
+      "ip": "00:11:25:C4:3C:4D",
+      "mac": "172.24.133.29",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-65-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index f4f59b141b38a26f6228877ce72459daf4dba5f5..970a16856e66bc786b47b0247c1fcbde55e48c81 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.30",
-      "mac": "00:11:25:91:46:E1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.30",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-66-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.30",
-      "mac": "00:11:25:C4:3B:E0",
+      "ip": "00:11:25:C4:3B:E0",
+      "mac": "172.24.6.30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.30",
-      "mac": "00:11:25:C4:3B:E1",
+      "ip": "00:11:25:C4:3B:E1",
+      "mac": "172.24.133.30",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-66-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index aa74b5bd77866b6de3a53182c8c45ef4b3f0a4af..87c0b199fc15063136f74da6a03c53bfa61f85c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.31",
-      "mac": "00:11:25:91:47:09",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.31",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-67-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.31",
-      "mac": "00:11:25:C4:35:66",
+      "ip": "00:11:25:C4:35:66",
+      "mac": "172.24.6.31",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.31",
-      "mac": "00:11:25:C4:35:67",
+      "ip": "00:11:25:C4:35:67",
+      "mac": "172.24.133.31",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-67-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index 52f785016835561cd5feef4a6f4d50bb447c1276..b0eb6a60925348dbc68d1c5e58a14d891015cd81 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.32",
-      "mac": "00:11:25:91:48:9E",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.32",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-68-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.32",
-      "mac": "00:11:25:C4:3C:18",
+      "ip": "00:11:25:C4:3C:18",
+      "mac": "172.24.6.32",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.32",
-      "mac": "00:11:25:C4:3C:19",
+      "ip": "00:11:25:C4:3C:19",
+      "mac": "172.24.133.32",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-68-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index f4b062bea3fbd1f80d94409f5f1244b0a534da69..7b0f19ea4f78f4ad7d2e7a5f513409de8195c234 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.33",
-      "mac": "00:11:25:91:47:B3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.33",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-69-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.33",
-      "mac": "00:11:25:C4:34:82",
+      "ip": "00:11:25:C4:34:82",
+      "mac": "172.24.6.33",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.33",
-      "mac": "00:11:25:C4:34:83",
+      "ip": "00:11:25:C4:34:83",
+      "mac": "172.24.133.33",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-69-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index c44e8a44ee609523bf91bd7469109a43536107c1..067d3ccc3c3dc9be2dab4ffd438b48b1d2dea154 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.7",
-      "mac": "00:11:25:91:46:05",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.7",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-7-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.7",
-      "mac": "00:11:25:C4:35:92",
+      "ip": "00:11:25:C4:35:92",
+      "mac": "172.24.1.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.7",
-      "mac": "00:11:25:C4:35:93",
+      "ip": "00:11:25:C4:35:93",
+      "mac": "172.24.128.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-7-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index 7036d3f3a32308d533612a42b6bbed8a5cfaea76..85ef396998f9051b3aac543859c881d56238eb1c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.34",
-      "mac": "00:11:25:91:46:77",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.34",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-70-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.34",
-      "mac": "00:11:25:C4:3C:4A",
+      "ip": "00:11:25:C4:3C:4A",
+      "mac": "172.24.6.34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.34",
-      "mac": "00:11:25:C4:3C:4B",
+      "ip": "00:11:25:C4:3C:4B",
+      "mac": "172.24.133.34",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-70-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 03a1e6f5c085a910390d46a28c9a0e54fe574980..680b71216ec6c866a8655897cac4195ea84d92cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.35",
-      "mac": "00:11:25:91:49:1F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.35",
-      "mac": "00:60:DD:47:68:7F",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-71-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.35",
-      "mac": "00:11:25:C4:35:78",
+      "ip": "00:11:25:C4:35:78",
+      "mac": "172.24.6.35",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.35",
-      "mac": "00:11:25:C4:35:79",
+      "ip": "00:11:25:C4:35:79",
+      "mac": "172.24.133.35",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-71-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index df36e03b75b4207da2c227d27e818a48bce29edc..ca20d2e533acc7dec7776995d6b834d9219ae959 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.133.36",
-      "mac": "00:11:25:91:46:3D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.73.36",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-72-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.6.36",
-      "mac": "00:11:25:C4:3E:3C",
+      "ip": "00:11:25:C4:3E:3C",
+      "mac": "172.24.6.36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.133.36",
-      "mac": "00:11:25:C4:3E:3D",
+      "ip": "00:11:25:C4:3E:3D",
+      "mac": "172.24.133.36",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-72-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index 94e0fe83f6de3101565ebcbcca31a6a5b4988062..caae2fb04219983e7d48091360a15e78160cfb46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.1",
-      "mac": "00:11:25:91:46:80",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.1",
-      "mac": "00:60:DD:47:59:6D",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-73-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.1",
-      "mac": "00:11:25:C4:35:9E",
+      "ip": "00:11:25:C4:35:9E",
+      "mac": "172.24.7.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.1",
-      "mac": "00:11:25:C4:35:9F",
+      "ip": "00:11:25:C4:35:9F",
+      "mac": "172.24.134.1",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-73-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index be05efe5d25e14301cd88779797b48786b5c84b7..38d3ef0ce2dd3add8593b54854fb9b3bc6d35881 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.2",
-      "mac": "00:11:25:91:48:46",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.2",
-      "mac": "00:60:DD:47:59:73",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-74-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.2",
-      "mac": "00:11:25:C4:2D:0A",
+      "ip": "00:11:25:C4:2D:0A",
+      "mac": "172.24.7.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.2",
-      "mac": "00:11:25:C4:2D:0B",
+      "ip": "00:11:25:C4:2D:0B",
+      "mac": "172.24.134.2",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-74-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index 1b0beeb9035e5cc07ed40a6775fe7dae44409789..d0e2d5e7086f74ccff6a4eef2041afaf26647ed8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.3",
-      "mac": "00:11:25:91:49:00",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.3",
-      "mac": "00:60:DD:47:59:07",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-75-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.3",
-      "mac": "00:11:25:C4:39:AE",
+      "ip": "00:11:25:C4:39:AE",
+      "mac": "172.24.7.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.3",
-      "mac": "00:11:25:C4:39:AF",
+      "ip": "00:11:25:C4:39:AF",
+      "mac": "172.24.134.3",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-75-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index 071cab80b096853c6fe49b9cad8262ce3af50465..0497b8b15d22e187103c1fe8402db55a71914940 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.4",
-      "mac": "00:11:25:91:49:37",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.4",
-      "mac": "00:60:DD:47:59:30",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-76-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.4",
-      "mac": "00:11:25:C4:2B:2C",
+      "ip": "00:11:25:C4:2B:2C",
+      "mac": "172.24.7.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.4",
-      "mac": "00:11:25:C4:2B:2D",
+      "ip": "00:11:25:C4:2B:2D",
+      "mac": "172.24.134.4",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-76-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index d1e4f423573bab4daf265bbd48b6b35951987ab2..2b9b1103b4f9faca1e0bf3db4dffdfac63df743b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.5",
-      "mac": "00:11:25:91:46:46",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.5",
-      "mac": "00:60:DD:47:5A:7A",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-77-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.5",
-      "mac": "00:11:25:C4:38:94",
+      "ip": "00:11:25:C4:38:94",
+      "mac": "172.24.7.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.5",
-      "mac": "00:11:25:C4:38:95",
+      "ip": "00:11:25:C4:38:95",
+      "mac": "172.24.134.5",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-77-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index e791fe0c0c47c154957a68aee0237e7c10c24198..32ebba63ef2d7504ba53c0f58eda717d1bfd2862 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.6",
-      "mac": "00:11:25:91:47:F1",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.6",
-      "mac": "00:60:DD:47:59:06",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-78-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.6",
-      "mac": "00:11:25:C4:26:56",
+      "ip": "00:11:25:C4:26:56",
+      "mac": "172.24.7.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.6",
-      "mac": "00:11:25:C4:26:57",
+      "ip": "00:11:25:C4:26:57",
+      "mac": "172.24.134.6",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-78-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index 51aef26ddada8eaf8b63a5ce85986af40e7b487f..ab9435f4641f6f5b0f49b91bf61e981573183c06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.7",
-      "mac": "00:11:25:91:48:4D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.7",
-      "mac": "00:60:DD:47:67:97",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-79-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.7",
-      "mac": "00:11:25:C4:35:76",
+      "ip": "00:11:25:C4:35:76",
+      "mac": "172.24.7.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.7",
-      "mac": "00:11:25:C4:35:77",
+      "ip": "00:11:25:C4:35:77",
+      "mac": "172.24.134.7",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-79-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index 1a326453c87290b36d4c594b33f4b187634ac1a6..7e6ada357fc5b2f17512c0e626a043660be4f68c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.8",
-      "mac": "00:11:25:91:46:3F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.8",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-8-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.8",
-      "mac": "00:11:25:C4:35:C2",
+      "ip": "00:11:25:C4:35:C2",
+      "mac": "172.24.1.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.8",
-      "mac": "00:11:25:C4:35:C3",
+      "ip": "00:11:25:C4:35:C3",
+      "mac": "172.24.128.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-8-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index 07ad17274cc3c2407b895b02fc995409292a3c37..833fd81838fd466a956c185042ebeb5b47a41966 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.8",
-      "mac": "00:11:25:91:45:A3",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.8",
-      "mac": "00:60:DD:47:67:95",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-80-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.8",
-      "mac": "00:11:25:C4:3A:BE",
+      "ip": "00:11:25:C4:3A:BE",
+      "mac": "172.24.7.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.8",
-      "mac": "00:11:25:C4:3A:BF",
+      "ip": "00:11:25:C4:3A:BF",
+      "mac": "172.24.134.8",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-80-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index e2b41888cefe0319bfe5c65c9e569a82ced42229..42ab99953e14a7bed08de43d91da1294218721b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.9",
-      "mac": "00:11:25:91:46:0A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.9",
-      "mac": "00:11:25:C4:26:51",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-81-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.9",
-      "mac": "00:11:25:C4:26:50",
+      "ip": "00:11:25:C4:26:50",
+      "mac": "172.24.7.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.9",
-      "mac": "00:11:25:C4:26:51",
+      "ip": "00:11:25:C4:26:51",
+      "mac": "172.24.134.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-81-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index 9aabe6e77fc042baec8d51e90b4f15f80c137f94..c9f3e8211c3f1777f7b8f0b567b8e10961490771 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.10",
-      "mac": "00:11:25:91:45:D5",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.10",
-      "mac": "00:60:DD:47:59:A0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-82-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.10",
-      "mac": "00:11:25:C4:24:04",
+      "ip": "00:11:25:C4:24:04",
+      "mac": "172.24.7.10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.10",
-      "mac": "00:11:25:C4:24:05",
+      "ip": "00:11:25:C4:24:05",
+      "mac": "172.24.134.10",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-82-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index 50d1a3c3b7dc814c4b39ba1e76777be59d792be0..d0d3d5555aab902410c1b5b0ecdf1372c263f5b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.11",
-      "mac": "00:11:25:91:46:03",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.11",
-      "mac": "00:60:DD:47:5A:C8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-83-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.11",
-      "mac": "00:11:25:C4:26:8A",
+      "ip": "00:11:25:C4:26:8A",
+      "mac": "172.24.7.11",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.11",
-      "mac": "00:11:25:C4:26:8B",
+      "ip": "00:11:25:C4:26:8B",
+      "mac": "172.24.134.11",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-83-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 819656d60b640497eaf62c475bed5dffa2b9efe9..dba153d1eb5aec06fd07ac60c8263d1b4c254cb6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.134.12",
-      "mac": "00:11:25:91:46:1A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.74.12",
-      "mac": "00:60:DD:47:65:A6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-84-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.7.12",
-      "mac": "00:11:25:C4:3A:86",
+      "ip": "00:11:25:C4:3A:86",
+      "mac": "172.24.7.12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.134.12",
-      "mac": "00:11:25:C4:3A:87",
+      "ip": "00:11:25:C4:3A:87",
+      "mac": "172.24.134.12",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-84-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 2a5acf75986d9c6b755495030df1eb2a50d39f27..713b55210e831617362930844a0be66554834c23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.13",
-      "mac": "00:11:25:91:48:93",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.13",
-      "mac": "00:60:DD:47:59:72",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-85-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.13",
-      "mac": "00:11:25:C4:3B:44",
+      "ip": "00:11:25:C4:3B:44",
+      "mac": "172.24.8.13",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.13",
-      "mac": "00:11:25:C4:3B:45",
+      "ip": "00:11:25:C4:3B:45",
+      "mac": "172.24.135.13",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-85-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index 38fdd01bc8cd0f14e2c3712276412b2489674690..e7d52d4d3847416f780011921596c8cd79070c69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.14",
-      "mac": "00:11:25:91:49:47",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.14",
-      "mac": "00:60:DD:47:59:6C",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-86-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.14",
-      "mac": "00:11:25:C4:26:4C",
+      "ip": "00:11:25:C4:26:4C",
+      "mac": "172.24.8.14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.14",
-      "mac": "00:11:25:C4:26:4D",
+      "ip": "00:11:25:C4:26:4D",
+      "mac": "172.24.135.14",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-86-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index e663b0e751ee60440c73389a68a7d0feaadd6543..3d1e34d67ca5e3d38f13e65ecf3e9dbe525ce1c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.15",
-      "mac": "00:11:25:91:48:B4",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.15",
-      "mac": "00:60:DD:47:68:81",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-87-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.15",
-      "mac": "00:11:25:C4:4D:F4",
+      "ip": "00:11:25:C4:4D:F4",
+      "mac": "172.24.8.15",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.15",
-      "mac": "00:11:25:C4:4D:F5",
+      "ip": "00:11:25:C4:4D:F5",
+      "mac": "172.24.135.15",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-87-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 3b53a5d4a7644ced5a75c411e41f7c131ce6a429..c2b829bd144945e014a91f20b41721ea0b176237 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.16",
-      "mac": "00:11:25:91:46:3A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.16",
-      "mac": "00:60:DD:47:67:93",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-88-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.16",
-      "mac": "00:11:25:C4:4E:28",
+      "ip": "00:11:25:C4:4E:28",
+      "mac": "172.24.8.16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.16",
-      "mac": "00:11:25:C4:4E:29",
+      "ip": "00:11:25:C4:4E:29",
+      "mac": "172.24.135.16",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-88-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index f8425b64bf444017195590e8c414e58fe0eee5e9..862c7e5b965f839ed63622b27ee011c1cef34bea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.17",
-      "mac": "00:11:25:91:45:CE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.17",
-      "mac": "00:60:DD:47:68:79",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-89-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.17",
-      "mac": "00:11:25:C4:4E:5C",
+      "ip": "00:11:25:C4:4E:5C",
+      "mac": "172.24.8.17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.17",
-      "mac": "00:11:25:C4:4E:5D",
+      "ip": "00:11:25:C4:4E:5D",
+      "mac": "172.24.135.17",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-89-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index 61daeff315c95de8966ce2e9da7886196659e802..45c69183d1272bf5b9198739dd743621616f121b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.128.9",
-      "mac": "00:11:25:91:48:AC",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.68.9",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-9-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.1.9",
-      "mac": "00:11:25:C4:34:6A",
+      "ip": "00:11:25:C4:34:6A",
+      "mac": "172.24.1.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.128.9",
-      "mac": "00:11:25:C4:34:6B",
+      "ip": "00:11:25:C4:34:6B",
+      "mac": "172.24.128.9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-9-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index ff6f5f6b3f24eb3416fcd73f0f8e22a0b863c7be..0fc30de7d04c57576cdf90f5633795d7efcaed7e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.18",
-      "mac": "00:11:25:91:49:5A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.18",
-      "mac": "00:60:DD:47:59:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-90-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.18",
-      "mac": "00:11:25:C4:51:02",
+      "ip": "00:11:25:C4:51:02",
+      "mac": "172.24.8.18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.18",
-      "mac": "00:11:25:C4:51:03",
+      "ip": "00:11:25:C4:51:03",
+      "mac": "172.24.135.18",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-90-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index ae8152c35853b8432b97edc8b9acbad0f8425faf..38b6660290d7fc61f7576ce3011cd23dda138b0b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.19",
-      "mac": "00:11:25:91:46:1C",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.19",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-91-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.19",
-      "mac": "00:11:25:C4:51:4C",
+      "ip": "00:11:25:C4:51:4C",
+      "mac": "172.24.8.19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.19",
-      "mac": "00:11:25:C4:51:4D",
+      "ip": "00:11:25:C4:51:4D",
+      "mac": "172.24.135.19",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-91-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index a62e0a4c652a14617f042559a525dd8ec19f074b..d2687cbb558532b72a1307ce9facfb79e8509a50 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -11,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.20",
-      "mac": "00:11:25:91:46:4D",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -29,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.20",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-92-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.20",
-      "mac": "00:11:25:C4:4D:82",
+      "ip": "00:11:25:C4:4D:82",
+      "mac": "172.24.8.20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -70,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.20",
-      "mac": "00:11:25:C4:4D:83",
+      "ip": "00:11:25:C4:4D:83",
+      "mac": "172.24.135.20",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-92-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index 5d75fe870c08f6abb0e90203934d0a2ffdfe3f43..1bf54369ca598a2b05168bfa1bd6c95b902f5936 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.21",
-      "mac": "00:11:25:91:48:2F",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.21",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-93-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.21",
-      "mac": "00:11:25:C4:4F:A6",
+      "ip": "00:11:25:C4:4F:A6",
+      "mac": "172.24.8.21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.21",
-      "mac": "00:11:25:C4:4F:A7",
+      "ip": "00:11:25:C4:4F:A7",
+      "mac": "172.24.135.21",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-93-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index 083ead6f54743325382b89161c6cd22a225dfd75..4cf92de9fb16ea52cf110e31137c2d0334ab6046 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.22",
-      "mac": "00:11:25:91:48:05",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.22",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-94-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.22",
-      "mac": "00:11:25:C4:53:FC",
+      "ip": "00:11:25:C4:53:FC",
+      "mac": "172.24.8.22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.22",
-      "mac": "00:11:25:C4:53:FD",
+      "ip": "00:11:25:C4:53:FD",
+      "mac": "172.24.135.22",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-94-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index 75a741a3fa527ec98904a552edfb0b9f94f41aeb..390ca6495f3db6f00984cd0174f61c559540328b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.23",
-      "mac": "00:11:25:91:45:F7",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.23",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-95-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.23",
-      "mac": "00:11:25:C4:4F:30",
+      "ip": "00:11:25:C4:4F:30",
+      "mac": "172.24.8.23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.23",
-      "mac": "00:11:25:C4:4F:31",
+      "ip": "00:11:25:C4:4F:31",
+      "mac": "172.24.135.23",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-95-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index e533dea2f1022268d3f543c8749612dc9651f107..270b00b222cac56305689051a35f15a16ee53280 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.135.24",
-      "mac": "00:11:25:91:45:EE",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.75.24",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-96-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.8.24",
-      "mac": "00:11:25:C4:50:A6",
+      "ip": "00:11:25:C4:50:A6",
+      "mac": "172.24.8.24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.135.24",
-      "mac": "00:11:25:C4:50:A7",
+      "ip": "00:11:25:C4:50:A7",
+      "mac": "172.24.135.24",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-96-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 8ff5428c566a9d8e4c15e1f8db2cccecb813cb7c..72a055a210dd5cea091541c2c49adb214ebf07d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.25",
-      "mac": "00:11:25:91:45:7A",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.25",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-97-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.25",
-      "mac": "00:11:25:C4:4F:06",
+      "ip": "00:11:25:C4:4F:06",
+      "mac": "172.24.9.25",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.25",
-      "mac": "00:11:25:C4:4F:07",
+      "ip": "00:11:25:C4:4F:07",
+      "mac": "172.24.136.25",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-97-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index f987e0159a3c18d44f00e79916ab3fd4a1852ec5..20b03c2b324a55e4e11f6eac952b1588feff4dda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.26",
-      "mac": "00:11:25:91:47:BB",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.26",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-98-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.26",
-      "mac": "00:11:25:C4:4E:1A",
+      "ip": "00:11:25:C4:4E:1A",
+      "mac": "172.24.9.26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.26",
-      "mac": "00:11:25:C4:4E:1B",
+      "ip": "00:11:25:C4:4E:1B",
+      "mac": "172.24.136.26",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-98-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index 622ca854052465538c9846d3a2733212e92b584e..b0d18e2be8eb8acd311e4341774e0553c95dabf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -4,7 +4,6 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -12,10 +11,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.26.136.27",
-      "mac": "00:11:25:91:45:C2",
+      "ip": null,
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -30,31 +30,13 @@
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
-    {
-      "device": "myri0",
-      "driver": "mx_driver",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.24.76.27",
-      "mac": "nil",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "gdx-99-myri0.orsay.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "nil",
-      "switch_mac": "nil",
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.24.9.27",
-      "mac": "00:11:25:C4:4F:3E",
+      "ip": "00:11:25:C4:4F:3E",
+      "mac": "172.24.9.27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -71,16 +53,16 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "172.24.136.27",
-      "mac": "00:11:25:C4:4F:3F",
+      "ip": "00:11:25:C4:4F:3F",
+      "mac": "172.24.136.27",
       "management": false,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-99-eth1.orsay.grid5000.fr",
       "rate": 0,
       "switch": null,
-      "switch_ip": null,
-      "switch_mac": null,
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
diff --git a/generators/input/orsay-gdx.back.yaml b/generators/input/orsay-gdx.back.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..69c9243ff7a7d4d238939666866e47d9f9cdd523
--- /dev/null
+++ b/generators/input/orsay-gdx.back.yaml
@@ -0,0 +1,1583 @@
+--- 
+gdx-9: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:34:6A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:34:6B
+  mac_bmc: 00:11:25:91:48:AC
+gdx-28: 
+  mac_myri0: 00:60:DD:47:5A:B6
+  mac_eth0: 00:11:25:C4:34:6E
+  mac_eth1: 00:11:25:C4:34:6F
+  mac_bmc: 00:11:25:91:49:01
+gdx-54: 
+  mac_myri0: 00:60:DD:47:5A:84
+  mac_eth0: 00:11:25:C4:35:BC
+  mac_eth1: 00:11:25:C4:35:BD
+  mac_bmc: 00:11:25:91:45:93
+gdx-80: 
+  mac_myri0: 00:60:DD:47:67:95
+  mac_eth0: 00:11:25:C4:3A:BE
+  mac_eth1: 00:11:25:C4:3A:BF
+  mac_bmc: 00:11:25:91:45:A3
+gdx-105: 
+  mac_myri0: 00:60:DD:47:68:4A
+  mac_eth0: 00:11:25:C4:4F:0A
+  mac_eth1: 00:11:25:C4:4F:0B
+  mac_bmc: 00:11:25:91:49:14
+gdx-132: 
+  mac_myri0: 00:60:DD:47:5A:BF
+  mac_eth0: 00:11:25:C4:4E:58
+  mac_eth1: 00:11:25:C4:4E:59
+  mac_bmc: 00:11:25:91:47:E3
+gdx-212: 
+  mac_eth0: 00:11:25:C4:4F:BA
+  mac_myri0: 00:60:DD:47:B5:EF
+  mac_eth1: 00:11:25:C4:4F:BB
+  mac_bmc: 00:11:25:91:47:C3
+gdx-29: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:05:0C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:34:53
+  mac_bmc: 00:14:5E:65:C6:29
+gdx-55: 
+  mac_myri0: 00:60:DD:47:59:6F
+  mac_eth0: 00:11:25:C4:3B:BC
+  mac_eth1: 00:11:25:C4:3B:BD
+  mac_bmc: 00:11:25:91:49:0B
+gdx-81: 
+  mac_eth0: 00:11:25:C4:26:50
+  mac_myri0: 00:11:25:C4:26:51
+  mac_eth1: 00:11:25:C4:26:51
+  mac_bmc: 00:11:25:91:46:0A
+gdx-106: 
+  mac_myri0: 00:60:DD:47:67:88
+  mac_eth0: 00:11:25:C4:4E:C2
+  mac_eth1: 00:11:25:C4:4E:C3
+  mac_bmc: 00:11:25:91:47:6A
+gdx-133: 
+  mac_myri0: 00:60:DD:47:59:B7
+  mac_eth0: 00:11:25:C4:4E:82
+  mac_eth1: 00:11:25:C4:4E:83
+  mac_bmc: 00:11:25:91:47:93
+gdx-213: 
+  mac_eth0: 00:11:25:C4:54:50
+  mac_myri0: 00:60:DD:47:86:5D
+  mac_eth1: 00:11:25:C4:54:51
+  mac_bmc: 00:11:25:91:47:EE
+gdx-240: 
+  mac_myri0: 00:60:DD:47:7D:7C
+  mac_eth0: 00:11:25:C4:3E:34
+  mac_eth1: 00:11:25:C4:3E:35
+  mac_bmc: 00:11:25:91:46:09
+gdx-56: 
+  mac_myri0: 00:60:DD:47:59:40
+  mac_eth0: 00:11:25:C4:3C:7C
+  mac_eth1: 00:11:25:C4:3C:7D
+  mac_bmc: 00:11:25:91:47:96
+gdx-82: 
+  mac_myri0: 00:60:DD:47:59:A0
+  mac_eth0: 00:11:25:C4:24:04
+  mac_eth1: 00:11:25:C4:24:05
+  mac_bmc: 00:11:25:91:45:D5
+gdx-107: 
+  mac_myri0: 00:60:DD:47:68:19
+  mac_eth0: 00:11:25:C4:4E:D2
+  mac_eth1: 00:11:25:C4:4E:D3
+  mac_bmc: 00:11:25:91:48:8A
+gdx-160: 
+  mac_myri0: 00:60:DD:47:59:03
+  mac_eth0: 00:11:25:C4:4F:3A
+  mac_eth1: 00:11:25:C4:4F:3B
+  mac_bmc: 00:11:25:91:46:8D
+gdx-214: 
+  mac_eth0: 00:11:25:C4:4E:50
+  mac_myri0: 00:60:DD:47:B4:C4
+  mac_eth1: 00:11:25:C4:4E:51
+  mac_bmc: 00:11:25:91:47:C7
+gdx-241: 
+  mac_myri0: 00:60:DD:47:7C:D4
+  mac_eth0: 00:11:25:C4:3C:74
+  mac_eth1: 00:11:25:C4:3C:75
+  mac_bmc: 00:11:25:91:46:5D
+gdx-57: 
+  mac_myri0: 00:60:DD:47:88:43
+  mac_eth0: 00:11:25:C4:3C:24
+  mac_eth1: 00:11:25:C4:3C:25
+  mac_bmc: 00:11:25:91:49:50
+gdx-83: 
+  mac_myri0: 00:60:DD:47:5A:C8
+  mac_eth0: 00:11:25:C4:26:8A
+  mac_eth1: 00:11:25:C4:26:8B
+  mac_bmc: 00:11:25:91:46:03
+gdx-108: 
+  mac_myri0: 00:60:DD:47:68:12
+  mac_eth0: 00:11:25:C4:51:BC
+  mac_eth1: 00:11:25:C4:51:BD
+  mac_bmc: 00:11:25:91:47:DC
+gdx-134: 
+  mac_myri0: 00:60:DD:47:65:BE
+  mac_eth0: 00:11:25:C4:4F:4E
+  mac_eth1: 00:11:25:C4:4F:4F
+  mac_bmc: 00:11:25:91:48:1D
+gdx-161: 
+  mac_myri0: 00:60:DD:47:5A:72
+  mac_eth0: 00:11:25:C4:4F:8E
+  mac_eth1: 00:11:25:C4:4F:8F
+  mac_bmc: 00:11:25:91:48:B8
+gdx-215: 
+  mac_eth0: 00:11:25:C4:54:7E
+  mac_myri0: 00:60:DD:47:89:EC
+  mac_eth1: 00:11:25:C4:54:7F
+  mac_bmc: 00:11:25:91:46:83
+gdx-242: 
+  mac_myri0: 00:60:DD:47:7C:C8
+  mac_eth0: 00:11:25:C4:2B:FC
+  mac_eth1: 00:11:25:C4:2B:FD
+  mac_bmc: 00:11:25:91:48:AD
+gdx-58: 
+  mac_myri0: 00:60:DD:47:68:42
+  mac_eth0: 00:11:25:C4:39:3E
+  mac_eth1: 00:11:25:C4:39:3F
+  mac_bmc: 00:11:25:91:46:51
+gdx-84: 
+  mac_myri0: 00:60:DD:47:65:A6
+  mac_eth0: 00:11:25:C4:3A:86
+  mac_eth1: 00:11:25:C4:3A:87
+  mac_bmc: 00:11:25:91:46:1A
+gdx-109: 
+  mac_eth0: 00:11:25:C4:53:22
+  mac_myri0: 00:60:DD:47:59:7E
+  mac_eth1: 00:11:25:C4:53:23
+  mac_bmc: 00:11:25:91:45:F1
+gdx-135: 
+  mac_myri0: 00:60:DD:47:59:70
+  mac_eth0: 00:11:25:C4:53:E6
+  mac_eth1: 00:11:25:C4:53:E7
+  mac_bmc: 00:11:25:91:47:6B
+gdx-162: 
+  mac_myri0: 00:60:DD:47:5A:BA
+  mac_eth0: 00:11:25:C4:4E:B8
+  mac_eth1: 00:11:25:C4:4E:B9
+  mac_bmc: 00:11:25:91:45:FE
+gdx-216: 
+  mac_eth0: 00:11:25:C4:4D:1C
+  mac_myri0: 00:60:DD:47:89:76
+  mac_eth1: 00:11:25:C4:4D:1D
+  mac_bmc: 00:11:25:91:47:AF
+gdx-243: 
+  mac_myri0: 00:60:DD:47:7C:07
+  mac_eth0: 00:11:25:C4:2B:58
+  mac_eth1: 00:11:25:C4:2B:59
+  mac_bmc: 00:11:25:91:46:7A
+gdx-59: 
+  mac_myri0: 00:60:DD:47:67:89
+  mac_eth0: 00:11:25:C4:2E:30
+  mac_eth1: 00:11:25:C4:2E:31
+  mac_bmc: 00:11:25:91:49:03
+gdx-85: 
+  mac_myri0: 00:60:DD:47:59:72
+  mac_eth0: 00:11:25:C4:3B:44
+  mac_eth1: 00:11:25:C4:3B:45
+  mac_bmc: 00:11:25:91:48:93
+gdx-136: 
+  mac_myri0: 00:60:DD:47:65:BD
+  mac_eth0: 00:11:25:C4:4D:40
+  mac_eth1: 00:11:25:C4:4D:41
+  mac_bmc: 00:11:25:91:48:A0
+gdx-163: 
+  mac_eth0: 00:11:25:C4:50:86
+  mac_myri0: 00:60:DD:47:65:A7
+  mac_eth1: 00:11:25:C4:50:06
+  mac_bmc: 00:11:25:91:48:34
+gdx-217: 
+  mac_eth0: 00:11:25:C4:3B:7C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:7D
+  mac_bmc: 00:11:25:91:46:70
+gdx-270: 
+  mac_myri0: 00:60:DD:47:89:C4
+  mac_eth0: 00:11:25:C4:35:48
+  mac_eth1: 00:11:25:C4:35:49
+  mac_bmc: 00:11:25:91:46:CF
+gdx-86: 
+  mac_myri0: 00:60:DD:47:59:6C
+  mac_eth0: 00:11:25:C4:26:4C
+  mac_eth1: 00:11:25:C4:26:4D
+  mac_bmc: 00:11:25:91:49:47
+gdx-137: 
+  mac_myri0: 00:60:DD:47:5A:A5
+  mac_eth0: 00:11:25:C4:4F:E2
+  mac_eth1: 00:11:25:C4:4F:E3
+  mac_bmc: 00:11:25:91:45:C6
+gdx-164: 
+  mac_eth0: 00:11:25:C4:53:A0
+  mac_myri0: 00:60:DD:47:5A:C6
+  mac_eth1: 00:11:25:C4:53:A1
+  mac_bmc: 00:11:25:91:47:AE
+gdx-190: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4E:34
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:35
+  mac_bmc: 00:11:25:91:48:11
+gdx-218: 
+  mac_eth0: 00:11:25:C4:35:46
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:47
+  mac_bmc: 00:11:25:91:48:D2
+gdx-244: 
+  mac_myri0: 00:60:DD:47:89:07
+  mac_eth0: 00:11:25:C4:10:FA
+  mac_eth1: 00:11:25:C4:10:FB
+  mac_bmc: 00:11:25:91:46:A3
+gdx-271: 
+  mac_myri0: 00:60:DD:47:7C:CC
+  mac_eth0: 00:11:25:C4:31:92
+  mac_eth1: 00:11:25:C4:31:93
+  mac_bmc: 00:11:25:91:47:7D
+gdx-87: 
+  mac_myri0: 00:60:DD:47:68:81
+  mac_eth0: 00:11:25:C4:4D:F4
+  mac_eth1: 00:11:25:C4:4D:F5
+  mac_bmc: 00:11:25:91:48:B4
+gdx-138: 
+  mac_myri0: 00:60:DD:47:5A:76
+  mac_eth0: 00:11:25:C4:4D:4A
+  mac_eth1: 00:11:25:C4:4D:4B
+  mac_bmc: 00:11:25:91:46:22
+gdx-165: 
+  mac_eth0: 00:11:25:C4:4D:6A
+  mac_myri0: 00:60:DD:47:5A:C7
+  mac_eth1: 00:11:25:C4:4D:6B
+  mac_bmc: 00:11:25:91:45:D0
+gdx-191: 
+  mac_eth0: 00:11:25:C4:4E:3A
+  mac_myri0: 00:60:DD:47:86:53
+  mac_eth1: 00:11:25:C4:4E:3B
+  mac_bmc: 00:11:25:91:49:4D
+gdx-219: 
+  mac_eth0: 00:11:25:C4:39:A8
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:A9
+  mac_bmc: 00:11:25:91:48:AA
+gdx-245: 
+  mac_myri0: 00:60:DD:47:7B:FE
+  mac_eth0: 00:11:25:C4:3A:4E
+  mac_eth1: 00:11:25:C4:3A:4F
+  mac_bmc: 00:11:25:91:47:EA
+gdx-272: 
+  mac_myri0: 00:60:DD:47:89:CE
+  mac_eth0: 00:11:25:C4:2F:20
+  mac_eth1: 00:11:25:C4:2F:21
+  mac_bmc: 00:11:25:91:48:15
+gdx-88: 
+  mac_myri0: 00:60:DD:47:67:93
+  mac_eth0: 00:11:25:C4:4E:28
+  mac_eth1: 00:11:25:C4:4E:29
+  mac_bmc: 00:11:25:91:46:3A
+gdx-139: 
+  mac_myri0: 00:60:DD:47:65:AA
+  mac_eth0: 00:11:25:C4:38:DE
+  mac_eth1: 00:11:25:C4:38:DF
+  mac_bmc: 00:11:25:91:45:CF
+gdx-166: 
+  mac_eth0: 00:11:25:C4:04:DE
+  mac_myri0: 00:60:DD:47:59:FE
+  mac_eth1: 00:11:25:C4:3A:91
+  mac_bmc: 00:11:25:91:47:5C
+gdx-192: 
+  mac_eth0: 00:11:25:C4:4E:A8
+  mac_myri0: 00:60:DD:47:86:45
+  mac_eth1: 00:11:25:C4:4E:A9
+  mac_bmc: 00:11:25:91:47:56
+gdx-246: 
+  mac_myri0: 00:60:DD:47:86:58
+  mac_eth0: 00:11:25:C4:38:E2
+  mac_eth1: 00:11:25:C4:38:E3
+  mac_bmc: 00:11:25:91:46:0E
+gdx-273: 
+  mac_myri0: 00:60:DD:47:89:C8
+  mac_eth0: 00:11:25:C4:32:EE
+  mac_eth1: 00:11:25:C4:32:EF
+  mac_bmc: 00:11:25:91:46:99
+gdx-89: 
+  mac_myri0: 00:60:DD:47:68:79
+  mac_eth0: 00:11:25:C4:4E:5C
+  mac_eth1: 00:11:25:C4:4E:5D
+  mac_bmc: 00:11:25:91:45:CE
+gdx-193: 
+  mac_eth0: 00:11:25:C4:4E:14
+  mac_myri0: 00:60:DD:47:86:62
+  mac_eth1: 00:11:25:C4:4E:15
+  mac_bmc: 00:11:25:91:49:12
+gdx-247: 
+  mac_myri0: 00:60:DD:47:7B:FD
+  mac_eth0: 00:11:25:C4:32:76
+  mac_eth1: 00:11:25:C4:32:77
+  mac_bmc: 00:11:25:91:48:F4
+gdx-274: 
+  mac_myri0: 00:60:DD:47:89:D2
+  mac_eth0: 00:11:25:C4:35:C0
+  mac_eth1: 00:11:25:C4:35:C1
+  mac_bmc: 00:11:25:91:45:C9
+gdx-167: 
+  mac_eth0: 00:11:25:C4:50:02
+  mac_myri0: 00:60:DD:47:5A:BB
+  mac_eth1: 00:11:25:C4:50:03
+  mac_bmc: 00:11:25:91:46:9C
+gdx-194: 
+  mac_eth0: 00:11:25:C4:52:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:52:D1
+  mac_bmc: 00:11:25:91:47:74
+gdx-248: 
+  mac_myri0: 00:60:DD:47:7B:FC
+  mac_eth0: 00:11:25:C4:31:FA
+  mac_eth1: 00:11:25:C4:31:FB
+  mac_bmc: 00:11:25:91:48:3B
+gdx-275: 
+  mac_myri0: 00:60:DD:47:89:90
+  mac_eth0: 00:11:25:C4:11:38
+  mac_eth1: 00:11:25:C4:11:39
+  mac_bmc: 00:11:25:91:45:F0
+gdx-168: 
+  mac_eth0: 00:11:25:C4:54:4C
+  mac_myri0: 00:60:DD:47:5A:B2
+  mac_eth1: 00:11:25:C4:54:4D
+  mac_bmc: 00:11:25:91:49:17
+gdx-195: 
+  mac_eth0: 00:11:25:C4:38:D4
+  mac_myri0: 00:60:DD:47:5A:A3
+  mac_eth1: 00:11:25:C4:38:D5
+  mac_bmc: 00:11:25:91:47:F5
+gdx-249: 
+  mac_myri0: 00:60:DD:47:88:62
+  mac_eth0: 00:11:25:C4:33:40
+  mac_eth1: 00:11:25:C4:33:41
+  mac_bmc: 00:11:25:91:45:E9
+gdx-276: 
+  mac_myri0: 00:60:DD:47:89:0D
+  mac_eth0: 00:11:25:C4:35:B6
+  mac_eth1: 00:11:25:C4:35:B7
+  mac_bmc: 00:09:6B:5E:FB:10
+gdx-169: 
+  mac_eth0: 00:11:25:C4:45:B0
+  mac_myri0: 00:60:DD:47:5A:B3
+  mac_eth1: 00:11:25:C4:45:B1
+  mac_bmc: 00:11:25:91:48:F0
+gdx-196: 
+  mac_eth0: 00:11:25:C4:4F:E4
+  mac_myri0: 00:60:DD:47:7C:0F
+  mac_eth1: 00:11:25:C4:4F:E5
+  mac_bmc: 00:11:25:91:45:7B
+gdx-197: 
+  mac_eth0: 00:11:25:C4:51:72
+  mac_myri0: 00:60:DD:47:86:52
+  mac_eth1: 00:11:25:C4:51:73
+  mac_bmc: 00:11:25:91:45:F9
+gdx-277: 
+  mac_myri0: 00:60:DD:47:89:87
+  mac_eth0: 00:11:25:C4:34:58
+  mac_eth1: 00:11:25:C4:34:59
+  mac_bmc: 00:11:25:91:49:5E
+gdx-10: 
+  mac_myri0: 00:60:DD:47:59:65
+  mac_eth0: 00:11:25:C4:33:38
+  mac_eth1: 00:11:25:C4:33:39
+  mac_bmc: 00:11:25:91:47:58
+gdx-198: 
+  mac_eth0: 00:11:25:C4:4E:C8
+  mac_myri0: 00:60:DD:47:89:0B
+  mac_eth1: 00:11:25:C4:4E:C9
+  mac_bmc: 00:11:25:91:48:95
+gdx-278: 
+  mac_myri0: 00:60:DD:47:C7:3E
+  mac_eth0: 00:11:25:C4:34:46
+  mac_eth1: 00:11:25:C4:34:47
+  mac_bmc: 00:11:25:91:47:6C
+gdx-11: 
+  mac_myri0: 00:60:DD:47:5A:53
+  mac_eth0: 00:11:25:C4:34:3E
+  mac_eth1: 00:11:25:C4:34:3F
+  mac_bmc: 00:11:25:91:48:EE
+gdx-199: 
+  mac_eth0: 00:11:25:C4:4E:CC
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:CD
+  mac_bmc: 00:11:25:91:48:99
+gdx-279: 
+  mac_myri0: 00:60:DD:47:C7:FD
+  mac_eth0: 00:11:25:C4:33:96
+  mac_eth1: 00:11:25:C4:33:97
+  mac_bmc: 00:11:25:91:46:42
+gdx-12: 
+  mac_myri0: 00:60:DD:47:59:64
+  mac_eth0: 00:11:25:C4:35:42
+  mac_eth1: 00:11:25:C4:35:43
+  mac_bmc: 00:11:25:91:45:B8
+gdx-13: 
+  mac_myri0: 00:60:DD:47:5A:99
+  mac_eth0: 00:11:25:C4:34:48
+  mac_eth1: 00:11:25:C4:34:49
+  mac_bmc: 00:11:25:91:48:02
+gdx-14: 
+  mac_myri0: 00:60:DD:47:5A:5A
+  mac_eth0: 00:11:25:C4:34:3C
+  mac_eth1: 00:11:25:C4:34:3D
+  mac_bmc: 00:11:25:91:48:91
+gdx-40: 
+  mac_myri0: 00:60:DD:47:68:87
+  mac_eth0: 00:11:25:C4:33:66
+  mac_eth1: 00:11:25:C4:33:67
+  mac_bmc: 00:11:25:91:46:84
+gdx-15: 
+  mac_myri0: 00:60:DD:47:5A:58
+  mac_eth0: 00:11:25:C4:35:9B
+  mac_eth1: 00:11:25:C4:35:9C
+  mac_bmc: 00:11:25:91:48:A2
+gdx-41: 
+  mac_myri0: 00:60:DD:47:59:04
+  mac_eth0: 00:11:25:C4:34:86
+  mac_eth1: 00:11:25:C4:34:87
+  mac_bmc: 00:11:25:91:45:AB
+gdx-200: 
+  mac_eth0: 00:11:25:C4:50:D2
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:50:D3
+  mac_bmc: 00:11:25:91:47:C9
+gdx-16: 
+  mac_myri0: 00:60:DD:47:68:85
+  mac_eth0: 00:11:25:C4:2E:CE
+  mac_eth1: 00:11:25:C4:2E:CF
+  mac_bmc: 00:11:25:91:45:8E
+gdx-42: 
+  mac_myri0: 00:60:DD:47:67:94
+  mac_eth0: 00:11:25:C4:2B:F0
+  mac_eth1: 00:11:25:C4:2B:F1
+  mac_bmc: 00:11:25:91:49:2C
+gdx-120: 
+  mac_eth0: 00:11:25:C4:4F:D2
+  mac_myri0: 00:60:DD:47:5A:94
+  mac_eth1: 00:11:25:C4:4F:D3
+  mac_bmc: 00:11:25:91:48:19
+gdx-201: 
+  mac_eth0: 00:11:25:C4:51:B2
+  mac_myri0: 00:60:DD:47:86:51
+  mac_eth1: 00:11:25:C4:51:B3
+  mac_bmc: 00:11:25:91:47:A2
+gdx-17: 
+  mac_myri0: 00:60:DD:47:63:85
+  mac_eth0: 00:11:25:C4:34:56
+  mac_eth1: 00:11:25:C4:34:57
+  mac_bmc: 00:11:25:91:49:4A
+gdx-43: 
+  mac_myri0: 00:60:DD:47:59:05
+  mac_eth0: 00:11:25:C4:33:2A
+  mac_eth1: 00:11:25:C4:33:2B
+  mac_bmc: 00:11:25:91:45:BD
+gdx-121: 
+  mac_eth0: 00:11:25:C4:50:1A
+  mac_myri0: 00:60:DD:47:59:7D
+  mac_eth1: 00:11:25:C4:50:1B
+  mac_bmc: 00:11:25:91:48:88
+gdx-18: 
+  mac_myri0: 00:60:DD:47:59:6A
+  mac_eth0: 00:11:25:C4:35:7A
+  mac_eth1: 00:11:25:C4:35:7B
+  mac_bmc: 00:11:25:91:48:AF
+gdx-44: 
+  mac_myri0: 00:60:DD:47:59:00
+  mac_eth0: 00:11:25:C4:2F:50
+  mac_eth1: 00:11:25:C4:2F:51
+  mac_bmc: 00:11:25:91:48:EC
+gdx-70: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3C:4A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:4B
+  mac_bmc: 00:11:25:91:46:77
+gdx-122: 
+  mac_eth0: 00:11:25:C4:4D:84
+  mac_myri0: 00:60:DD:47:59:3F
+  mac_eth1: 00:11:25:C4:4D:85
+  mac_bmc: 00:11:25:91:46:29
+gdx-202: 
+  mac_eth0: 00:11:25:C4:53:F8
+  mac_myri0: 00:60:DD:47:86:49
+  mac_eth1: 00:11:25:C4:53:F9
+  mac_bmc: 00:11:25:91:47:A8
+gdx-230: 
+  mac_eth0: 00:11:25:C4:35:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:A7
+  mac_bmc: 00:11:25:91:45:B4
+gdx-310: 
+  mac_eth0: 00:11:25:C4:33:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:D1
+  mac_bmc: 00:11:25:91:47:A6
+gdx-19: 
+  mac_myri0: 00:60:DD:47:5A:54
+  mac_eth0: 00:11:25:C4:34:4C
+  mac_eth1: 00:11:25:C4:34:4D
+  mac_bmc: 00:11:25:91:49:55
+gdx-45: 
+  mac_myri0: 00:60:DD:47:59:A3
+  mac_eth0: 00:11:25:C4:35:18
+  mac_eth1: 00:11:25:C4:35:19
+  mac_bmc: 00:11:25:91:49:3F
+gdx-71: 
+  mac_myri0: 00:60:DD:47:68:7F
+  mac_eth0: 00:11:25:C4:35:78
+  mac_eth1: 00:11:25:C4:35:79
+  mac_bmc: 00:11:25:91:49:1F
+gdx-203: 
+  mac_eth0: 00:11:25:C4:4C:FC
+  mac_myri0: 00:60:DD:47:86:48
+  mac_eth1: 00:11:25:C4:4C:FD
+  mac_bmc: 00:11:25:91:45:F5
+gdx-46: 
+  mac_myri0: 00:60:DD:47:65:DB
+  mac_eth0: 00:11:25:C4:09:C6
+  mac_eth1: 00:11:25:C4:09:C7
+  mac_bmc: 00:11:25:91:76:3B
+gdx-72: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3E:3C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3E:3D
+  mac_bmc: 00:11:25:91:46:3D
+gdx-123: 
+  mac_eth0: 00:11:25:C4:4E:B0
+  mac_myri0: 00:60:DD:47:59:7A
+  mac_eth1: 00:11:25:C4:4E:B1
+  mac_bmc: 00:11:25:91:45:F2
+gdx-150: 
+  mac_myri0: 00:60:DD:47:5A:C3
+  mac_eth0: 00:11:25:C4:4F:02
+  mac_eth1: 00:11:25:C4:4F:03
+  mac_bmc: 00:11:25:91:47:B4
+gdx-204: 
+  mac_eth0: 00:11:25:C4:4F:04
+  mac_myri0: 00:60:DD:47:86:46
+  mac_eth1: 00:11:25:C4:4F:05
+  mac_bmc: 00:11:25:91:46:16
+gdx-231: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:3C:78
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:79
+  mac_bmc: 00:11:25:91:47:E5
+gdx-47: 
+  mac_myri0: 00:60:DD:47:58:F6
+  mac_eth0: 00:11:25:C4:35:99
+  mac_eth1: 00:11:25:C4:35:9A
+  mac_bmc: 00:11:25:91:48:52
+gdx-73: 
+  mac_myri0: 00:60:DD:47:59:6D
+  mac_eth0: 00:11:25:C4:35:9E
+  mac_eth1: 00:11:25:C4:35:9F
+  mac_bmc: 00:11:25:91:46:80
+gdx-124: 
+  mac_eth0: 00:11:25:C4:4D:C8
+  mac_myri0: 00:60:DD:47:66:00
+  mac_eth1: 00:11:25:C4:4D:C9
+  mac_bmc: 00:11:25:91:46:6D
+gdx-151: 
+  mac_myri0: 00:60:DD:47:5A:BD
+  mac_eth0: 00:11:25:C4:53:78
+  mac_eth1: 00:11:25:C4:53:79
+  mac_bmc: 00:11:25:91:45:9D
+gdx-205: 
+  mac_eth0: 00:11:25:C4:4F:14
+  mac_myri0: 00:60:DD:47:C4:3F
+  mac_eth1: 00:11:25:C4:4F:15
+  mac_bmc: 00:11:25:91:47:95
+gdx-232: 
+  mac_eth0: 00:11:25:C4:38:CA
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:CB
+  mac_bmc: 00:11:25:91:45:79
+gdx-48: 
+  mac_myri0: 00:60:DD:47:5A:85
+  mac_eth0: 00:11:25:C4:2D:6C
+  mac_eth1: 00:11:25:C4:2D:6D
+  mac_bmc: 00:11:25:91:46:06
+gdx-74: 
+  mac_myri0: 00:60:DD:47:59:73
+  mac_eth0: 00:11:25:C4:2D:0A
+  mac_eth1: 00:11:25:C4:2D:0B
+  mac_bmc: 00:11:25:91:48:46
+gdx-125: 
+  mac_eth0: 00:11:25:C4:51:F8
+  mac_myri0: 00:60:DD:47:5A:55
+  mac_eth1: 00:11:25:C4:51:F9
+  mac_bmc: 00:11:25:91:46:45
+gdx-152: 
+  mac_myri0: 00:60:DD:47:65:B3
+  mac_eth0: 00:11:25:C4:50:B6
+  mac_eth1: 00:11:25:C4:50:B7
+  mac_bmc: 00:11:25:91:49:23
+gdx-206: 
+  mac_eth0: 00:11:25:C4:52:64
+  mac_myri0: 00:60:DD:47:86:5E
+  mac_eth1: 00:11:25:C4:52:65
+  mac_bmc: 00:11:25:91:46:54
+gdx-49: 
+  mac_myri0: 00:60:DD:47:5A:80
+  mac_eth0: 00:11:25:C4:33:16
+  mac_eth1: 00:11:25:C4:33:17
+  mac_bmc: 00:11:25:91:49:11
+gdx-75: 
+  mac_myri0: 00:60:DD:47:59:07
+  mac_eth0: 00:11:25:C4:39:AE
+  mac_eth1: 00:11:25:C4:39:AF
+  mac_bmc: 00:11:25:91:49:00
+gdx-126: 
+  mac_eth0: 00:11:25:C4:53:0E
+  mac_myri0: 00:60:DD:47:88:FD
+  mac_eth1: 00:11:25:C4:53:0F
+  mac_bmc: 00:11:25:91:48:37
+gdx-153: 
+  mac_myri0: 00:60:DD:47:65:DA
+  mac_eth0: 00:11:25:C4:50:A8
+  mac_eth1: 00:11:25:C4:50:A9
+  mac_bmc: 00:11:25:91:46:07
+gdx-207: 
+  mac_eth0: 00:11:25:C4:4F:B4
+  mac_myri0: 00:60:DD:47:86:59
+  mac_eth1: 00:11:25:C4:4F:B5
+  mac_bmc: 00:11:25:91:48:D5
+gdx-233: 
+  mac_eth0: 00:11:25:C4:3C:20
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:21
+  mac_bmc: 00:11:25:91:45:96
+gdx-260: 
+  mac_myri0: 00:60:DD:47:7D:B0
+  mac_eth0: 00:11:25:C4:33:82
+  mac_eth1: 00:11:25:C4:33:83
+  mac_bmc: 00:11:25:91:45:D3
+gdx-76: 
+  mac_eth0: 00:11:25:C4:2B:2C
+  mac_myri0: 00:60:DD:47:59:30
+  mac_eth1: 00:11:25:C4:2B:2D
+  mac_bmc: 00:11:25:91:49:37
+gdx-127: 
+  mac_myri0: 00:60:DD:47:65:D9
+  mac_eth0: 00:11:25:C4:4D:94
+  mac_eth1: 00:11:25:C4:4D:95
+  mac_bmc: 00:11:25:91:46:88
+gdx-154: 
+  mac_myri0: 00:60:DD:47:5A:B5
+  mac_eth0: 00:11:25:C4:4D:2A
+  mac_eth1: 00:11:25:C4:4D:2B
+  mac_bmc: 00:11:25:91:46:DE
+gdx-180: 
+  mac_eth0: 00:11:25:C4:4F:E6
+  mac_myri0: 00:60:DD:47:59:31
+  mac_eth1: 00:11:25:C4:4F:E7
+  mac_bmc: 00:11:25:91:45:8F
+gdx-208: 
+  mac_eth0: 00:11:25:C4:4F:AE
+  mac_myri0: 00:60:DD:47:86:5A
+  mac_eth1: 00:11:25:C4:4F:AF
+  mac_bmc: 00:11:25:91:46:7D
+gdx-234: 
+  mac_eth0: 00:11:25:C4:3C:42
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:43
+  mac_bmc: 00:11:25:91:46:08
+gdx-261: 
+  mac_myri0: 00:60:DD:47:88:F8
+  mac_eth0: 00:11:25:C4:2D:72
+  mac_eth1: 00:11:25:C4:2D:73
+  mac_bmc: 00:11:25:91:48:7B
+gdx-77: 
+  mac_myri0: 00:60:DD:47:5A:7A
+  mac_eth0: 00:11:25:C4:38:94
+  mac_eth1: 00:11:25:C4:38:95
+  mac_bmc: 00:11:25:91:46:46
+gdx-128: 
+  mac_myri0: 00:60:DD:47:67:FC
+  mac_eth0: 00:11:25:C4:53:18
+  mac_eth1: 00:11:25:C4:53:19
+  mac_bmc: 00:11:25:91:46:02
+gdx-155: 
+  mac_myri0: 00:60:DD:47:5A:8E
+  mac_eth0: 00:11:25:C4:50:A2
+  mac_eth1: 00:11:25:C4:50:A3
+  mac_bmc: 00:11:25:91:48:BA
+gdx-181: 
+  mac_eth0: 00:11:25:C4:53:4A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:4B
+  mac_bmc: 00:11:25:91:45:DD
+gdx-209: 
+  mac_eth0: 00:11:25:C4:4E:C4
+  mac_myri0: 00:60:DD:47:89:84
+  mac_eth1: 00:11:25:C4:4E:C5
+  mac_bmc: 00:11:25:91:45:82
+gdx-235: 
+  mac_eth0: 00:11:25:C4:35:50
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:51
+  mac_bmc: 00:11:25:91:47:EB
+gdx-262: 
+  mac_myri0: 00:60:DD:47:7D:11
+  mac_eth0: 00:11:25:C4:34:E8
+  mac_eth1: 00:11:25:C4:34:E9
+  mac_bmc: 00:11:25:91:47:46
+gdx-78: 
+  mac_myri0: 00:60:DD:47:59:06
+  mac_eth0: 00:11:25:C4:26:56
+  mac_eth1: 00:11:25:C4:26:57
+  mac_bmc: 00:11:25:91:47:F1
+gdx-129: 
+  mac_myri0: 00:60:DD:47:59:32
+  mac_eth0: 00:11:25:C4:4D:80
+  mac_eth1: 00:11:25:C4:4D:81
+  mac_bmc: 00:11:25:91:45:FB
+gdx-182: 
+  mac_eth0: 00:11:25:C4:52:88
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:52:89
+  mac_bmc: 00:11:25:91:47:A0
+gdx-236: 
+  mac_myri0: 00:60:DD:47:89:D1
+  mac_eth0: 00:11:25:C4:39:AC
+  mac_eth1: 00:11:25:C4:39:AD
+  mac_bmc: 00:11:25:91:47:F7
+gdx-263: 
+  mac_myri0: 00:60:DD:47:89:C5
+  mac_eth0: 00:11:25:C4:35:88
+  mac_eth1: 00:11:25:C4:35:89
+  mac_bmc: 00:11:25:91:48:07
+gdx-79: 
+  mac_myri0: 00:60:DD:47:67:97
+  mac_eth0: 00:11:25:C4:35:76
+  mac_eth1: 00:11:25:C4:35:77
+  mac_bmc: 00:11:25:91:48:4D
+gdx-156: 
+  mac_myri0: 00:60:DD:47:5A:BC
+  mac_eth0: 00:11:25:C4:0B:06
+  mac_eth1: 00:11:25:C4:0B:07
+  mac_bmc: 00:11:25:91:48:76
+gdx-183: 
+  mac_eth0: 00:11:25:C4:4F:5E
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:5F
+  mac_bmc: 00:11:25:91:47:91
+gdx-237: 
+  mac_myri0: 00:60:DD:47:89:CF
+  mac_eth0: 00:11:25:C4:3C:80
+  mac_eth1: 00:11:25:C4:3C:81
+  mac_bmc: 00:11:25:91:48:45
+gdx-264: 
+  mac_myri0: 00:60:DD:47:89:CA
+  mac_eth0: 00:11:25:C4:33:5E
+  mac_eth1: 00:11:25:C4:33:5F
+  mac_bmc: 00:11:25:91:48:14
+gdx-290: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:33:7C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:7D
+  mac_bmc: 00:11:25:91:48:A4
+gdx-157: 
+  mac_myri0: 00:60:DD:47:5A:B8
+  mac_eth0: 00:11:25:C4:52:CA
+  mac_eth1: 00:11:25:C4:52:CB
+  mac_bmc: 00:11:25:91:47:71
+gdx-184: 
+  mac_eth0: 00:11:25:C4:4E:08
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:09
+  mac_bmc: 00:11:25:91:46:3B
+gdx-238: 
+  mac_myri0: 00:60:DD:47:7D:7D
+  mac_eth0: 00:11:25:C4:3C:7E
+  mac_eth1: 00:11:25:C4:3C:7F
+  mac_bmc: 00:11:25:91:48:CF
+gdx-265: 
+  mac_eth0: 00:11:25:C4:34:64
+  mac_myri0: 00:60:DD:47:5A:1F
+  mac_eth1: 00:11:25:C4:34:65
+  mac_bmc: 00:11:25:91:46:36
+gdx-291: 
+  mac_myri0: 00:60:DD:47:C7:FA
+  mac_eth0: 00:11:25:C4:33:1C
+  mac_eth1: 00:11:25:C4:33:1D
+  mac_bmc: 00:11:25:91:47:77
+gdx-158: 
+  mac_myri0: 00:60:DD:47:5A:C2
+  mac_eth0: 00:11:25:C4:54:46
+  mac_eth1: 00:11:25:C4:54:47
+  mac_bmc: 00:11:25:91:46:B3
+gdx-185: 
+  mac_eth0: 00:11:25:C4:53:B6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:B7
+  mac_bmc: 00:11:25:91:46:A0
+gdx-239: 
+  mac_myri0: 00:60:DD:47:7D:97
+  mac_eth0: 00:11:25:C4:3F:50
+  mac_eth1: 00:11:25:C4:3F:51
+  mac_bmc: 00:11:25:91:48:C1
+gdx-292: 
+  mac_myri0: 00:60:DD:47:C7:FF
+  mac_eth0: 00:11:25:C4:33:88
+  mac_eth1: 00:11:25:C4:33:89
+  mac_bmc: 00:11:25:91:46:19
+gdx-159: 
+  mac_myri0: 00:60:DD:47:5A:77
+  mac_eth0: 00:11:25:C4:4F:82
+  mac_eth1: 00:11:25:C4:4F:83
+  mac_bmc: 00:11:25:91:48:0D
+gdx-186: 
+  mac_eth0: 00:11:25:C4:4E:48
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:49
+  mac_bmc: 00:11:25:91:47:F6
+gdx-266: 
+  mac_myri0: 00:60:DD:47:89:8B
+  mac_eth0: 00:11:25:C4:34:8A
+  mac_eth1: 00:11:25:C4:34:8B
+  mac_bmc: 00:11:25:91:46:60
+gdx-293: 
+  mac_myri0: 00:60:DD:47:89:13
+  mac_eth0: 00:11:25:C4:33:4A
+  mac_eth1: 00:11:25:C4:33:4B
+  mac_bmc: 00:11:25:91:43:D8
+gdx-187: 
+  mac_eth0: 00:11:25:C4:4E:70
+  mac_myri0: 00:60:DD:47:86:54
+  mac_eth1: 00:11:25:C4:4E:71
+  mac_bmc: 00:11:25:91:48:58
+gdx-267: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:35:36
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:37
+  mac_bmc: 00:11:25:91:45:AE
+gdx-294: 
+  mac_myri0: 00:60:DD:47:89:78
+  mac_eth0: 00:11:25:C4:33:24
+  mac_eth1: 00:11:25:C4:33:25
+  mac_bmc: 00:11:25:91:47:EF
+gdx-188: 
+  mac_eth0: 00:11:25:C4:52:4E
+  mac_myri0: 00:60:DD:47:7C:63
+  mac_eth1: 00:11:25:C4:52:4F
+  mac_bmc: 00:11:25:91:47:30
+gdx-268: 
+  mac_myri0: 00:60:DD:47:89:C7
+  mac_eth0: 00:11:25:C4:34:4E
+  mac_eth1: 00:11:25:C4:34:4F
+  mac_bmc: 00:11:25:91:45:87
+gdx-295: 
+  mac_myri0: 00:60:DD:47:89:88
+  mac_eth0: 00:11:25:C4:33:7A
+  mac_eth1: 00:11:25:C4:33:7B
+  mac_bmc: 00:11:25:91:46:5A
+gdx-269: 
+  mac_myri0: 00:60:DD:47:89:C9
+  mac_eth0: 00:11:25:C4:33:0E
+  mac_eth1: 00:11:25:C4:33:0F
+  mac_bmc: 00:11:25:91:46:D0
+gdx-296: 
+  mac_myri0: 00:60:DD:47:89:B1
+  mac_eth0: 00:11:25:C4:20:06
+  mac_eth1: 00:11:25:C4:20:07
+  mac_bmc: 00:11:25:91:47:AB
+gdx-189: 
+  mac_eth0: 00:11:25:C4:52:46
+  mac_myri0: 00:60:DD:47:86:57
+  mac_eth1: 00:11:25:C4:52:47
+  mac_bmc: 00:11:25:91:48:5F
+gdx-297: 
+  mac_myri0: 00:60:DD:47:89:85
+  mac_eth0: 00:11:25:C4:33:3C
+  mac_eth1: 00:11:25:C4:33:3D
+  mac_bmc: 00:11:25:91:47:D2
+gdx-30: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_myri0: 00:60:DD:47:65:DE
+  mac_eth0: 00:11:25:C4:35:2C
+  mac_eth1: 00:11:25:C4:35:2D
+  mac_bmc: 00:11:25:91:46:61
+gdx-298: 
+  mac_myri0: 00:60:DD:47:89:95
+  mac_eth0: 00:11:25:C4:33:48
+  mac_eth1: 00:11:25:C4:33:49
+  mac_bmc: 00:11:25:91:46:8E
+gdx-31: 
+  mac_myri0: 00:60:DD:47:59:69
+  mac_eth0: 00:11:25:C4:35:24
+  mac_eth1: 00:11:25:C4:35:25
+  mac_bmc: 00:11:25:91:45:C5
+gdx-32: 
+  mac_myri0: 00:60:DD:47:65:B7
+  mac_eth0: 00:11:25:C4:35:08
+  mac_eth1: 00:11:25:C4:35:09
+  mac_bmc: 00:11:25:91:49:3D
+gdx-110: 
+  mac_eth0: 00:11:25:C4:51:A4
+  mac_myri0: 00:60:DD:47:5A:A7
+  mac_eth1: 00:11:25:C4:51:A5
+  mac_bmc: 00:11:25:91:45:DE
+gdx-299: 
+  mac_myri0: 00:60:DD:47:89:0E
+  mac_eth0: 00:11:25:C4:33:46
+  mac_eth1: 00:11:25:C4:33:47
+  mac_bmc: 00:11:25:91:47:0B
+gdx-33: 
+  mac_myri0: 00:60:DD:47:5A:20
+  mac_eth0: 00:11:25:C4:34:70
+  mac_eth1: 00:11:25:C4:34:71
+  mac_bmc: 00:11:25:91:45:EB
+gdx-111: 
+  mac_eth0: 00:11:25:C4:50:30
+  mac_myri0: 00:60:DD:47:65:C2
+  mac_eth1: 00:11:25:C4:50:31
+  mac_bmc: 00:11:25:91:46:7C
+gdx-34: 
+  mac_myri0: 00:60:DD:47:5A:91
+  mac_eth0: 00:11:25:C4:33:8E
+  mac_eth1: 00:11:25:C4:33:8F
+  mac_bmc: 00:11:25:91:49:34
+gdx-60: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3E:2C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3E:2D
+  mac_bmc: 00:11:25:91:46:57
+gdx-35: 
+  mac_myri0: 00:60:DD:47:65:BB
+  mac_eth0: 00:11:25:C4:34:7A
+  mac_eth1: 00:11:25:C4:34:7B
+  mac_bmc: 00:11:25:91:47:C5
+gdx-61: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4E:10
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:11
+  mac_bmc: 00:11:25:91:48:B3
+gdx-112: 
+  mac_eth0: 00:11:25:C4:4F:C6
+  mac_myri0: 00:60:DD:47:65:4F
+  mac_eth1: 00:11:25:C4:4F:C7
+  mac_bmc: 00:11:25:91:48:7F
+gdx-220: 
+  mac_eth0: 00:11:25:C4:3C:6A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:6B
+  mac_bmc: 00:11:25:91:48:39
+gdx-300: 
+  mac_myri0: 00:60:DD:47:89:1B
+  mac_eth0: 00:11:25:C4:33:14
+  mac_eth1: 00:11:25:C4:33:15
+  mac_bmc: 00:11:25:91:45:A9
+gdx-36: 
+  mac_myri0: 00:60:DD:47:5A:90
+  mac_eth0: 00:11:25:C4:33:56
+  mac_eth1: 00:11:25:C4:33:57
+  mac_bmc: 00:11:25:91:45:E7
+gdx-62: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3C:62
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:63
+  mac_bmc: 00:11:25:91:45:BB
+gdx-113: 
+  mac_eth0: 00:11:25:C4:51:48
+  mac_myri0: 00:60:DD:47:5A:56
+  mac_eth1: 00:11:25:C4:51:49
+  mac_bmc: 00:11:25:91:45:9C
+gdx-140: 
+  mac_myri0: 00:60:DD:47:59:62
+  mac_eth0: 00:11:25:C4:24:02
+  mac_eth1: 00:11:25:C4:24:03
+  mac_bmc: 00:11:25:91:48:32
+gdx-221: 
+  mac_eth0: 00:11:25:C4:3D:96
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3D:97
+  mac_bmc: 00:11:25:91:45:C3
+gdx-301: 
+  mac_myri0: 00:60:DD:47:89:93
+  mac_eth0: 00:11:25:C4:35:06
+  mac_eth1: 00:11:25:C4:35:07
+  mac_bmc: 00:11:25:91:45:C4
+gdx-63: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3B:B4
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:B5
+  mac_bmc: 00:11:25:91:45:B2
+gdx-114: 
+  mac_eth0: 00:11:25:C4:53:00
+  mac_myri0: 00:60:DD:47:66:01
+  mac_eth1: 00:11:25:C4:53:01
+  mac_bmc: 00:11:25:91:47:AA
+gdx-141: 
+  mac_myri0: 00:60:DD:47:5A:B7
+  mac_eth0: 00:11:25:C4:3F:A8
+  mac_eth1: 00:11:25:C4:3F:A9
+  mac_bmc: 00:11:25:91:48:63
+gdx-302: 
+  mac_myri0: 00:60:DD:47:89:83
+  mac_eth0: 00:11:25:C4:34:42
+  mac_eth1: 00:11:25:C4:34:43
+  mac_bmc: 00:11:25:91:46:64
+gdx-37: 
+  mac_myri0: 00:60:DD:47:59:AA
+  mac_eth0: 00:11:25:C4:31:66
+  mac_eth1: 00:11:25:C4:31:67
+  mac_bmc: 00:11:25:91:48:3C
+gdx-64: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:39:86
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:87
+  mac_bmc: 00:11:25:91:45:AF
+gdx-90: 
+  mac_myri0: 00:60:DD:47:59:02
+  mac_eth0: 00:11:25:C4:51:02
+  mac_eth1: 00:11:25:C4:51:03
+  mac_bmc: 00:11:25:91:49:5A
+gdx-115: 
+  mac_eth0: 00:11:25:C4:4E:44
+  mac_myri0: 00:60:DD:47:65:B9
+  mac_eth1: 00:11:25:C4:4E:45
+  mac_bmc: 00:11:25:91:48:5C
+gdx-142: 
+  mac_myri0: 00:60:DD:47:59:B6
+  mac_eth0: 00:11:25:C4:4F:D8
+  mac_eth1: 00:11:25:C4:4F:D9
+  mac_bmc: 00:11:25:91:46:41
+gdx-222: 
+  mac_eth0: 00:11:25:C4:39:54
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:55
+  mac_bmc: 00:11:25:91:48:16
+gdx-303: 
+  mac_myri0: 00:60:DD:47:89:7D
+  mac_eth0: 00:11:25:C4:0F:10
+  mac_eth1: 00:11:25:C4:0F:11
+  mac_bmc: 00:11:25:91:45:9A
+gdx-38: 
+  mac_myri0: 00:60:DD:47:59:B1
+  mac_eth0: 00:11:25:C4:34:6C
+  mac_eth1: 00:11:25:C4:34:6D
+  mac_bmc: 00:11:25:91:47:26
+gdx-91: 
+  mac_eth0: 00:11:25:C4:51:4C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:51:4D
+  mac_bmc: 00:11:25:91:46:1C
+gdx-116: 
+  mac_eth0: 00:11:25:C4:52:A2
+  mac_myri0: 00:60:DD:47:59:39
+  mac_eth1: 00:11:25:C4:52:A3
+  mac_bmc: 00:11:25:91:45:BA
+gdx-143: 
+  mac_myri0: 00:60:DD:47:5A:B9
+  mac_eth0: 00:11:25:C4:4F:AA
+  mac_eth1: 00:11:25:C4:4F:AB
+  mac_bmc: 00:11:25:91:48:33
+gdx-223: 
+  comments: "Stuck on the black screen with a blinking cursor on the screen top left corner."
+  mac_eth0: 00:11:25:C4:3C:14
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:15
+  mac_bmc: 00:11:25:91:48:A4
+gdx-250: 
+  mac_myri0: 00:60:DD:47:7B:FF
+  mac_eth0: 00:11:25:C4:3B:9A
+  mac_eth1: 00:11:25:C4:3B:9B
+  mac_bmc: 00:11:25:91:45:E8
+gdx-304: 
+  mac_myri0: 00:60:DD:47:89:8F
+  mac_eth0: 00:11:25:C4:33:58
+  mac_eth1: 00:11:25:C4:33:59
+  mac_bmc: 00:11:25:91:47:9C
+gdx-39: 
+  mac_myri0: 00:60:DD:47:59:71
+  mac_eth0: 00:11:25:C4:34:4A
+  mac_eth1: 00:11:25:C4:34:4B
+  mac_bmc: 00:11:25:91:45:A8
+gdx-65: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:3C:4C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:4D
+  mac_bmc: 00:11:25:91:46:C0
+gdx-66: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:3B:E0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:E1
+  mac_bmc: 00:11:25:91:46:E1
+gdx-305: 
+  mac_myri0: 00:60:DD:47:88:B0
+  mac_eth0: 00:11:25:C4:34:62
+  mac_eth1: 00:11:25:C4:34:63
+  mac_bmc: 00:11:25:91:46:5B
+gdx-251: 
+  mac_myri0: 00:60:DD:47:88:6E
+  mac_eth0: 00:11:25:C4:3F:90
+  mac_eth1: 00:11:25:C4:3F:91
+  mac_bmc: 00:11:25:91:47:40
+gdx-144: 
+  comments: "Keeps restarting every 3 seconds."
+  mac_myri0: 00:60:DD:47:5A:92
+  mac_eth0: 00:11:25:C4:50:0E
+  mac_eth1: 00:11:25:C4:50:0F
+  mac_bmc: 00:11:25:91:45:A6
+gdx-117: 
+  mac_eth0: 00:11:25:C4:52:EC
+  mac_myri0: 00:60:DD:47:65:BC
+  mac_eth1: 00:11:25:C4:52:ED
+  mac_bmc: 00:11:25:91:45:94
+gdx-92: 
+  mac_eth0: 00:11:25:C4:4D:82
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4D:83
+  mac_bmc: 00:11:25:91:46:4D
+gdx-170: 
+  mac_eth0: 00:11:25:C4:4D:00
+  mac_myri0: 00:60:DD:47:59:66
+  mac_eth1: 00:11:25:C4:4D:01
+  mac_bmc: 00:11:25:91:48:3D
+gdx-224: 
+  mac_eth0: 00:11:25:C4:39:00
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:01
+  mac_bmc: 00:11:25:91:46:7E
+gdx-93: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4F:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:A7
+  mac_bmc: 00:11:25:91:48:2F
+gdx-67: 
+  comments: "Unexisting or detroyed nodes"
+  mac_eth0: 00:11:25:C4:35:66
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:67
+  mac_bmc: 00:11:25:91:47:09
+gdx-306: 
+  mac_myri0: 00:60:DD:47:89:96
+  mac_eth0: 00:11:25:C4:41:5A
+  mac_eth1: 00:11:25:C4:41:5B
+  mac_bmc: 00:11:25:91:46:35
+gdx-252: 
+  mac_myri0: 00:60:DD:47:7C:65
+  mac_eth0: 00:11:25:C4:32:5A
+  mac_eth1: 00:11:25:C4:32:5B
+  mac_bmc: 00:11:25:91:48:28
+gdx-118: 
+  mac_eth0: 00:11:25:C4:53:EA
+  mac_myri0: 00:60:DD:47:66:1B
+  mac_eth1: 00:11:25:C4:53:EB
+  mac_bmc: 00:11:25:91:48:5B
+gdx-171: 
+  mac_eth0: 00:11:25:C4:4D:08
+  mac_myri0: 00:60:DD:47:65:A9
+  mac_eth1: 00:11:25:C4:4D:09
+  mac_bmc: 00:11:25:91:45:FC
+gdx-225: 
+  mac_eth0: 00:11:25:C4:38:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:D1
+  mac_bmc: 00:11:25:91:46:AE
+gdx-119: 
+  mac_eth0: 00:11:25:C4:51:AC
+  mac_myri0: 00:60:DD:47:65:C1
+  mac_eth1: 00:11:25:C4:51:AD
+  mac_bmc: 00:11:25:91:46:15
+gdx-94: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:53:FC
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:FD
+  mac_bmc: 00:11:25:91:48:05
+gdx-68: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:3C:18
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:19
+  mac_bmc: 00:11:25:91:48:9E
+gdx-253: 
+  mac_myri0: 00:60:DD:47:C7:FB
+  mac_eth0: 00:11:25:C4:34:68
+  mac_eth1: 00:11:25:C4:34:69
+  mac_bmc: 00:11:25:91:47:CC
+gdx-145: 
+  mac_myri0: 00:60:DD:47:68:7B
+  mac_eth0: 00:11:25:C4:50:20
+  mac_eth1: 00:11:25:C4:50:21
+  mac_bmc: 00:11:25:91:45:AD
+gdx-172: 
+  mac_eth0: 00:11:25:C4:54:18
+  mac_myri0: 00:60:DD:47:65:BF
+  mac_eth1: 00:11:25:C4:54:19
+  mac_bmc: 00:11:25:91:45:92
+gdx-226: 
+  mac_eth0: 00:11:25:C4:38:F6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:F7
+  mac_bmc: 00:11:25:91:48:35
+gdx-307: 
+  mac_eth0: 00:11:25:C4:33:4C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:4D
+  mac_bmc: 00:11:25:91:46:FE
+gdx-95: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4F:30
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:31
+  mac_bmc: 00:11:25:91:45:F7
+gdx-69: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:34:82
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:34:83
+  mac_bmc: 00:11:25:91:47:B3
+gdx-280: 
+  mac_myri0: 00:60:DD:47:C7:FC
+  mac_eth0: 00:11:25:C4:33:20
+  mac_eth1: 00:11:25:C4:33:21
+  mac_bmc: 00:11:25:91:46:92
+gdx-254: 
+  mac_myri0: 00:60:DD:47:C7:FE
+  mac_eth0: 00:11:25:C4:35:B8
+  mac_eth1: 00:11:25:C4:35:B9
+  mac_bmc: 00:11:25:91:46:C7
+gdx-146: 
+  mac_myri0: 00:60:DD:47:5A:73
+  mac_eth0: 00:11:25:C4:4D:4C
+  mac_eth1: 00:11:25:C4:4D:4D
+  mac_bmc: 00:11:25:91:46:B4
+gdx-173: 
+  mac_eth0: 00:11:25:C4:51:DA
+  mac_myri0: 00:60:DD:47:65:C3
+  mac_eth1: 00:11:25:C4:51:DB
+  mac_bmc: 00:11:25:91:45:EA
+gdx-227: 
+  mac_eth0: 00:11:25:C4:34:52
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:8F
+  mac_bmc: 00:14:5E:65:C6:4A
+gdx-308: 
+  comments: "Freezes on the very first boot screen. Not even possible to enter BIOS settings menu."
+  mac_eth0: 00:11:25:C4:32:6A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:32:6B
+  mac_bmc: 00:11:25:91:46:66
+gdx-147: 
+  mac_myri0: 00:60:DD:47:59:79
+  mac_eth0: 00:11:25:C4:4D:FE
+  mac_eth1: 00:11:25:C4:4D:FF
+  mac_bmc: 00:11:25:91:47:22
+gdx-96: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:50:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:50:A7
+  mac_bmc: 00:11:25:91:45:EE
+gdx-281: 
+  mac_myri0: 00:60:DD:47:C7:7D
+  mac_eth0: 00:11:25:C4:33:18
+  mac_eth1: 00:11:25:C4:33:19
+  mac_bmc: 00:11:25:91:45:7F
+gdx-174: 
+  mac_eth0: 00:11:25:C4:4F:46
+  mac_myri0: 00:60:DD:47:65:A8
+  mac_eth1: 00:11:25:C4:4F:47
+  mac_bmc: 00:11:25:91:45:FA
+gdx-228: 
+  mac_eth0: 00:11:25:C4:32:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:32:A7
+  mac_bmc: 00:11:25:91:46:0C
+gdx-309: 
+  mac_eth0: 00:11:25:C4:33:30
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:31
+  mac_bmc: 00:11:25:91:45:F6
+gdx-148: 
+  mac_myri0: 00:60:DD:47:5A:79
+  mac_eth0: 00:11:25:C4:51:06
+  mac_eth1: 00:11:25:C4:51:07
+  mac_bmc: 00:11:25:91:47:FC
+gdx-97: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4F:06
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:07
+  mac_bmc: 00:11:25:91:45:7A
+gdx-282: 
+  mac_myri0: 00:60:DD:47:89:1C
+  mac_eth0: 00:11:25:C4:31:44
+  mac_eth1: 00:11:25:C4:31:45
+  mac_bmc: 00:11:25:91:47:11
+gdx-255: 
+  mac_myri0: 00:60:DD:47:7C:E1
+  mac_eth0: 00:11:25:C4:09:86
+  mac_eth1: 00:11:25:C4:09:87
+  mac_bmc: 00:11:25:91:48:BC
+gdx-175: 
+  mac_eth0: 00:11:25:C4:4F:AC
+  mac_myri0: 00:60:DD:47:65:BA
+  mac_eth1: 00:11:25:C4:4F:AD
+  mac_bmc: 00:11:25:91:48:EB
+gdx-229: 
+  mac_eth0: 00:11:25:C4:3C:76
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:77
+  mac_bmc: 00:11:25:91:45:8A
+gdx-149: 
+  mac_myri0: 00:60:DD:47:5A:C1
+  mac_eth0: 00:11:25:C4:4F:C0
+  mac_eth1: 00:11:25:C4:4F:C1
+  mac_bmc: 00:11:25:91:46:2C
+gdx-98: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4E:1A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:1B
+  mac_bmc: 00:11:25:91:47:BB
+gdx-283: 
+  mac_myri0: 00:60:DD:47:89:86
+  mac_eth0: 00:11:25:C4:34:5E
+  mac_eth1: 00:11:25:C4:34:5F
+  mac_bmc: 00:11:25:91:45:9E
+gdx-256: 
+  mac_myri0: 00:60:DD:47:88:FA
+  mac_eth0: 00:11:25:C4:35:90
+  mac_eth1: 00:11:25:C4:35:91
+  mac_bmc: 00:11:25:91:47:F0
+gdx-176: 
+  mac_eth0: 00:11:25:C4:4F:CA
+  mac_myri0: 00:60:DD:47:66:03
+  mac_eth1: 00:11:25:C4:4F:CB
+  mac_bmc: 00:11:25:91:48:EA
+gdx-99: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:4F:3E
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:3F
+  mac_bmc: 00:11:25:91:45:C2
+gdx-257: 
+  mac_myri0: 00:60:DD:47:C7:F6
+  mac_eth0: 00:11:25:C4:35:62
+  mac_eth1: 00:11:25:C4:35:63
+  mac_bmc: 00:11:25:91:47:E2
+gdx-177: 
+  mac_eth0: 00:11:25:C4:4F:C4
+  mac_myri0: 00:60:DD:47:66:04
+  mac_eth1: 00:11:25:C4:4F:C5
+  mac_bmc: 00:11:25:91:47:8B
+gdx-284: 
+  mac_eth0: 00:11:25:C4:49:DE
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:49:DF
+  mac_bmc: 00:11:25:91:45:A2
+gdx-285: 
+  mac_myri0: 00:60:DD:47:89:CC
+  mac_eth0: 00:11:25:C4:35:BE
+  mac_eth1: 00:11:25:C4:35:BF
+  mac_bmc: 00:11:25:91:48:CE
+gdx-258: 
+  mac_myri0: 00:60:DD:47:7D:7F
+  mac_eth0: 00:11:25:C4:13:1A
+  mac_eth1: 00:11:25:C4:13:1B
+  mac_bmc: 00:11:25:91:47:7C
+gdx-286: 
+  mac_myri0: 00:60:DD:47:89:C2
+  mac_eth0: 00:11:25:C4:2A:C2
+  mac_eth1: 00:11:25:C4:2A:C3
+  mac_bmc: 00:11:25:91:45:DA
+gdx-259: 
+  mac_myri0: 00:60:DD:47:88:FF
+  mac_eth0: 00:11:25:C4:35:6A
+  mac_eth1: 00:11:25:C4:35:6B
+  mac_bmc: 00:11:25:91:49:15
+gdx-178: 
+  mac_eth0: 00:11:25:C4:50:0A
+  mac_myri0: 00:60:DD:47:65:D8
+  mac_eth1: 00:11:25:C4:50:0B
+  mac_bmc: 00:11:25:91:45:C7
+gdx-1: 
+  mac_myri0: 00:60:DD:47:5A:A4
+  mac_eth0: 00:11:25:C4:35:7E
+  mac_eth1: 00:11:25:C4:35:7F
+  mac_bmc: 00:11:25:91:47:F2
+gdx-287: 
+  mac_myri0: 00:60:DD:47:89:C6
+  mac_eth0: 00:11:25:C4:34:40
+  mac_eth1: 00:11:25:C4:34:41
+  mac_bmc: 00:11:25:91:46:33
+gdx-179: 
+  mac_eth0: 00:11:25:C4:50:76
+  mac_myri0: 00:60:DD:47:65:B4
+  mac_eth1: 00:11:25:C4:50:77
+  mac_bmc: 00:11:25:91:46:14
+gdx-20: 
+  mac_myri0: 00:60:DD:47:88:F7
+  mac_eth0: 00:11:25:C4:35:52
+  mac_eth1: 00:11:25:C4:35:53
+  mac_bmc: 00:11:25:91:45:7C
+gdx-21: 
+  mac_eth0: 00:11:25:C4:35:A8
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:A9
+  mac_bmc: 00:11:25:91:47:F8
+gdx-2: 
+  mac_myri0: 00:60:DD:47:59:75
+  mac_eth0: 00:11:25:C4:35:56
+  mac_eth1: 00:11:25:C4:35:57
+  mac_bmc: 00:11:25:91:48:A7
+gdx-288: 
+  mac_myri0: 00:60:DD:47:89:CD
+  mac_eth0: 00:11:25:C4:34:66
+  mac_eth1: 00:11:25:C4:34:67
+  mac_bmc: 00:11:25:91:46:58
+gdx-289: 
+  mac_myri0: 00:60:DD:47:89:1D
+  mac_eth0: 00:11:25:C4:33:68
+  mac_eth1: 00:11:25:C4:33:69
+  mac_bmc: 00:11:25:91:48:22
+gdx-100: 
+  mac_myri0: 00:60:DD:47:5A:8B
+  mac_eth0: 00:11:25:C4:4E:BE
+  mac_eth1: 00:11:25:C4:4E:BF
+  mac_bmc: 00:11:25:91:48:B7
+gdx-22: 
+  mac_myri0: 00:60:DD:47:5A:A2
+  mac_eth0: 00:11:25:C4:34:5A
+  mac_eth1: 00:11:25:C4:34:5B
+  mac_bmc: 00:11:25:91:49:2A
+gdx-3: 
+  mac_myri0: 00:60:DD:47:59:76
+  mac_eth0: 00:11:25:C4:35:3A
+  mac_eth1: 00:11:25:C4:35:3B
+  mac_bmc: 00:11:25:91:47:3B
+gdx-23: 
+  mac_myri0: 00:60:DD:47:5A:8F
+  mac_eth0: 00:11:25:C4:34:EA
+  mac_eth1: 00:11:25:C4:34:EB
+  mac_bmc: 00:11:25:91:46:B7
+gdx-4: 
+  mac_myri0: 00:60:DD:47:59:74
+  mac_eth0: 00:11:25:C4:35:40
+  mac_eth1: 00:11:25:C4:35:41
+  mac_bmc: 00:11:25:91:49:63
+gdx-101: 
+  mac_myri0: 00:60:DD:47:67:8C
+  mac_eth0: 00:11:25:C4:51:8C
+  mac_eth1: 00:11:25:C4:51:8D
+  mac_bmc: 00:11:25:91:45:DF
+gdx-50: 
+  mac_myri0: 00:60:DD:47:67:92
+  mac_eth0: 00:11:25:C4:33:92
+  mac_eth1: 00:11:25:C4:33:93
+  mac_bmc: 00:11:25:91:49:3C
+gdx-24: 
+  mac_myri0: 00:60:DD:47:5A:57
+  mac_eth0: 00:11:25:C4:34:50
+  mac_eth1: 00:11:25:C4:34:51
+  mac_bmc: 00:11:25:91:47:39
+gdx-5: 
+  mac_myri0: 00:60:DD:47:59:68
+  mac_eth0: 00:11:25:C4:33:52
+  mac_eth1: 00:11:25:C4:33:53
+  mac_bmc: 00:11:25:91:47:B0
+gdx-102: 
+  mac_myri0: 00:60:DD:47:68:44
+  mac_eth0: 00:11:25:C4:4E:DE
+  mac_eth1: 00:11:25:C4:4E:DF
+  mac_bmc: 00:11:25:91:49:61
+gdx-51: 
+  mac_myri0: 00:60:DD:47:5A:8D
+  mac_eth0: 00:11:25:C4:49:8E
+  mac_eth1: 00:11:25:C4:49:8F
+  mac_bmc: 00:11:25:91:45:C1
+gdx-25: 
+  mac_eth0: 00:11:25:C4:35:1C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:1D
+  mac_bmc: 00:11:25:91:47:A1
+gdx-6: 
+  mac_myri0: 00:60:DD:47:59:77
+  mac_eth0: 00:11:25:C4:35:1E
+  mac_eth1: 00:11:25:C4:35:1F
+  mac_bmc: 00:11:25:91:48:17
+gdx-210: 
+  mac_eth0: 00:11:25:C4:4E:94
+  mac_myri0: 00:60:DD:47:89:D0
+  mac_eth1: 00:11:25:C4:4E:95
+  mac_bmc: 00:11:25:91:45:AA
+gdx-130: 
+  mac_myri0: 00:60:DD:47:59:FD
+  mac_eth0: 00:11:25:C4:54:6A
+  mac_eth1: 00:11:25:C4:54:6B
+  mac_bmc: 00:11:25:91:45:A5
+gdx-103: 
+  mac_myri0: 00:60:DD:47:67:8B
+  mac_eth0: 00:11:25:C4:4E:FC
+  mac_eth1: 00:11:25:C4:4E:FD
+  mac_bmc: 00:11:25:91:46:1D
+gdx-52: 
+  mac_myri0: 00:60:DD:47:5A:7C
+  mac_eth0: 00:11:25:C4:35:97
+  mac_eth1: 00:11:25:C4:35:98
+  mac_bmc: 00:11:25:91:47:21
+gdx-26: 
+  mac_myri0: 00:60:DD:47:5A:59
+  mac_eth0: 00:11:25:C4:35:A4
+  mac_eth1: 00:11:25:C4:35:A5
+  mac_bmc: 00:11:25:91:48:A5
+gdx-7: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:35:92
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:93
+  mac_bmc: 00:11:25:91:46:05
+gdx-131: 
+  mac_myri0: 00:60:DD:47:59:6B
+  mac_eth0: 00:11:25:C4:54:86
+  mac_eth1: 00:11:25:C4:54:87
+  mac_bmc: 00:11:25:91:46:AA
+gdx-104: 
+  mac_myri0: 00:60:DD:47:67:8E
+  mac_eth0: 00:11:25:C4:52:4A
+  mac_eth1: 00:11:25:C4:52:4B
+  mac_bmc: 00:11:25:91:47:78
+gdx-53: 
+  comments: "Stuck on the black screen with a blinking cursor on the screen top left corner."
+  mac_eth0: 00:11:25:C4:3B:F6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:F7
+  mac_bmc: 00:11:25:91:47:B1
+gdx-27: 
+  mac_myri0: 00:60:DD:47:59:33
+  mac_eth0: 00:11:25:C4:31:4E
+  mac_eth1: 00:11:25:C4:31:4F
+  mac_bmc: 00:11:25:91:49:1C
+gdx-8: 
+  comments: "Hard disks not detected at boot, turned to dead."
+  mac_eth0: 00:11:25:C4:35:C2
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:C3
+  mac_bmc: 00:11:25:91:46:3F
+gdx-211: 
+  mac_eth0: 00:11:25:C4:4F:94
+  mac_myri0: 00:60:DD:47:86:5C
+  mac_eth1: 00:11:25:C4:4F:95
+  mac_bmc: 00:11:25:91:48:38
diff --git a/generators/input/orsay-gdx.rb b/generators/input/orsay-gdx.rb
index 312346b668adde77bb2ec9cefc0fae1a4a0d41f9..3bd1939f4c65544326247e8c60cb7e1162e66a1b 100644
--- a/generators/input/orsay-gdx.rb
+++ b/generators/input/orsay-gdx.rb
@@ -1,23 +1,24 @@
-require 'net/ssh'
 
-def switch_match_node(switch,id); switch != nil and (switch[:nodes][0] <= id and id <= switch[:nodes][1]); end
-def get_switch_for_node(switches,id)
-  switches.each{|k,v| 
-    arr = v.split(",").map{|s| s.to_i}
-    next if id < arr[0] or arr[1] < id
-    return lookup('orsay-network',k).merge({:nodes=>arr})
-  }
-  lookup('orsay-network',"switch-nil").merge({:nodes=>[0,0]})
-end
 
 site :orsay do |site_uid|
-  ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
+#  ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
   
   cluster :gdx do |cluster_uid|
     model "IBM eServer 326m"
     created_at nil
     misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
-    
+#    switches = Hash[["eth0","bmc","rsa","mx"].map{|iface| [iface,{"name"=>"switch"}]}]
+#    switches = Hash[["eth0","bmc","rsa","mx"].map{|iface| [iface,{}]}]
+
+    switches = {}
+    @clusters["gdx"].each.each_with_index {|ifaces, id|
+      ifaces.each{|iface,sw_name| update_switch switches, iface, sw_name }
+      
+      fail "switches = #{switches.inspect}"
+#      switch_eth0 = lookup('orsay-network',ifaces["eth0"])  unless switch_eth0["name"] == ifaces["eth0"]
+      
+    }
+    return
     # WARN: 2 nodes are missing (gdx-311 and gdx-312) and won't appear in the reference
     1.upto(180+132-2) do |i| 
       switch_eth0 = get_switch_for_node lookup("orsay-links","links-eth0","gdx"), i unless switch_match_node switch_eth0, i
diff --git a/generators/input/orsay-gdx.yaml b/generators/input/orsay-gdx.yaml
index 69c9243ff7a7d4d238939666866e47d9f9cdd523..2b612bfd2248b82b0cedd0f915071bf55ee1203d 100644
--- a/generators/input/orsay-gdx.yaml
+++ b/generators/input/orsay-gdx.yaml
@@ -1,1583 +1,3411 @@
 --- 
 gdx-9: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:34:6A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:34:6B
-  mac_bmc: 00:11:25:91:48:AC
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.9
+    ip: 00:11:25:C4:34:6A
+  eth1: 
+    mac: 172.24.128.9
+    ip: 00:11:25:C4:34:6B
 gdx-28: 
-  mac_myri0: 00:60:DD:47:5A:B6
-  mac_eth0: 00:11:25:C4:34:6E
-  mac_eth1: 00:11:25:C4:34:6F
-  mac_bmc: 00:11:25:91:49:01
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.28
+    ip: 00:11:25:C4:34:6E
+  eth1: 
+    mac: 172.24.130.28
+    ip: 00:11:25:C4:34:6F
 gdx-54: 
-  mac_myri0: 00:60:DD:47:5A:84
-  mac_eth0: 00:11:25:C4:35:BC
-  mac_eth1: 00:11:25:C4:35:BD
-  mac_bmc: 00:11:25:91:45:93
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.18
+    ip: 00:11:25:C4:35:BC
+  eth1: 
+    mac: 172.24.132.18
+    ip: 00:11:25:C4:35:BD
 gdx-80: 
-  mac_myri0: 00:60:DD:47:67:95
-  mac_eth0: 00:11:25:C4:3A:BE
-  mac_eth1: 00:11:25:C4:3A:BF
-  mac_bmc: 00:11:25:91:45:A3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.8
+    ip: 00:11:25:C4:3A:BE
+  eth1: 
+    mac: 172.24.134.8
+    ip: 00:11:25:C4:3A:BF
 gdx-105: 
-  mac_myri0: 00:60:DD:47:68:4A
-  mac_eth0: 00:11:25:C4:4F:0A
-  mac_eth1: 00:11:25:C4:4F:0B
-  mac_bmc: 00:11:25:91:49:14
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.33
+    ip: 00:11:25:C4:4F:0A
+  eth1: 
+    mac: 172.24.136.33
+    ip: 00:11:25:C4:4F:0B
 gdx-132: 
-  mac_myri0: 00:60:DD:47:5A:BF
-  mac_eth0: 00:11:25:C4:4E:58
-  mac_eth1: 00:11:25:C4:4E:59
-  mac_bmc: 00:11:25:91:47:E3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.24
+    ip: 00:11:25:C4:4E:58
+  eth1: 
+    mac: 172.24.138.24
+    ip: 00:11:25:C4:4E:59
 gdx-212: 
-  mac_eth0: 00:11:25:C4:4F:BA
-  mac_myri0: 00:60:DD:47:B5:EF
-  mac_eth1: 00:11:25:C4:4F:BB
-  mac_bmc: 00:11:25:91:47:C3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.32
+    ip: 00:11:25:C4:4F:BA
+  eth1: 
+    mac: 172.24.145.32
+    ip: 00:11:25:C4:4F:BB
+gdx-240: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.24
+    ip: 00:11:25:C4:3E:34
+  eth1: 
+    mac: 172.24.147.24
+    ip: 00:11:25:C4:3E:35
 gdx-29: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:05:0C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:34:53
-  mac_bmc: 00:14:5E:65:C6:29
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: 00:11:25:C4:34:52
+  eth1: 
+    mac: 172.24.130.29
+    ip: 00:11:25:C4:34:53
 gdx-55: 
-  mac_myri0: 00:60:DD:47:59:6F
-  mac_eth0: 00:11:25:C4:3B:BC
-  mac_eth1: 00:11:25:C4:3B:BD
-  mac_bmc: 00:11:25:91:49:0B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.19
+    ip: 00:11:25:C4:3B:BC
+  eth1: 
+    mac: 172.24.132.19
+    ip: 00:11:25:C4:3B:BD
 gdx-81: 
-  mac_eth0: 00:11:25:C4:26:50
-  mac_myri0: 00:11:25:C4:26:51
-  mac_eth1: 00:11:25:C4:26:51
-  mac_bmc: 00:11:25:91:46:0A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.9
+    ip: 00:11:25:C4:26:50
+  eth1: 
+    mac: 172.24.134.9
+    ip: 00:11:25:C4:26:51
 gdx-106: 
-  mac_myri0: 00:60:DD:47:67:88
-  mac_eth0: 00:11:25:C4:4E:C2
-  mac_eth1: 00:11:25:C4:4E:C3
-  mac_bmc: 00:11:25:91:47:6A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.34
+    ip: 00:11:25:C4:4E:C2
+  eth1: 
+    mac: 172.24.136.34
+    ip: 00:11:25:C4:4E:C3
 gdx-133: 
-  mac_myri0: 00:60:DD:47:59:B7
-  mac_eth0: 00:11:25:C4:4E:82
-  mac_eth1: 00:11:25:C4:4E:83
-  mac_bmc: 00:11:25:91:47:93
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.25
+    ip: 00:11:25:C4:4E:82
+  eth1: 
+    mac: 172.24.139.25
+    ip: 00:11:25:C4:4E:83
 gdx-213: 
-  mac_eth0: 00:11:25:C4:54:50
-  mac_myri0: 00:60:DD:47:86:5D
-  mac_eth1: 00:11:25:C4:54:51
-  mac_bmc: 00:11:25:91:47:EE
-gdx-240: 
-  mac_myri0: 00:60:DD:47:7D:7C
-  mac_eth0: 00:11:25:C4:3E:34
-  mac_eth1: 00:11:25:C4:3E:35
-  mac_bmc: 00:11:25:91:46:09
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.33
+    ip: 00:11:25:C4:54:50
+  eth1: 
+    mac: 172.24.145.33
+    ip: 00:11:25:C4:54:51
+gdx-241: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.25
+    ip: 00:11:25:C4:3C:74
+  eth1: 
+    mac: 172.24.148.25
+    ip: 00:11:25:C4:3C:75
 gdx-56: 
-  mac_myri0: 00:60:DD:47:59:40
-  mac_eth0: 00:11:25:C4:3C:7C
-  mac_eth1: 00:11:25:C4:3C:7D
-  mac_bmc: 00:11:25:91:47:96
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.20
+    ip: 00:11:25:C4:3C:7C
+  eth1: 
+    mac: 172.24.132.20
+    ip: 00:11:25:C4:3C:7D
 gdx-82: 
-  mac_myri0: 00:60:DD:47:59:A0
-  mac_eth0: 00:11:25:C4:24:04
-  mac_eth1: 00:11:25:C4:24:05
-  mac_bmc: 00:11:25:91:45:D5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.10
+    ip: 00:11:25:C4:24:04
+  eth1: 
+    mac: 172.24.134.10
+    ip: 00:11:25:C4:24:05
 gdx-107: 
-  mac_myri0: 00:60:DD:47:68:19
-  mac_eth0: 00:11:25:C4:4E:D2
-  mac_eth1: 00:11:25:C4:4E:D3
-  mac_bmc: 00:11:25:91:48:8A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.35
+    ip: 00:11:25:C4:4E:D2
+  eth1: 
+    mac: 172.24.136.35
+    ip: 00:11:25:C4:4E:D3
 gdx-160: 
-  mac_myri0: 00:60:DD:47:59:03
-  mac_eth0: 00:11:25:C4:4F:3A
-  mac_eth1: 00:11:25:C4:4F:3B
-  mac_bmc: 00:11:25:91:46:8D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.16
+    ip: 00:11:25:C4:4F:3A
+  eth1: 
+    mac: 172.24.141.16
+    ip: 00:11:25:C4:4F:3B
 gdx-214: 
-  mac_eth0: 00:11:25:C4:4E:50
-  mac_myri0: 00:60:DD:47:B4:C4
-  mac_eth1: 00:11:25:C4:4E:51
-  mac_bmc: 00:11:25:91:47:C7
-gdx-241: 
-  mac_myri0: 00:60:DD:47:7C:D4
-  mac_eth0: 00:11:25:C4:3C:74
-  mac_eth1: 00:11:25:C4:3C:75
-  mac_bmc: 00:11:25:91:46:5D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.34
+    ip: 00:11:25:C4:4E:50
+  eth1: 
+    mac: 172.24.145.34
+    ip: 00:11:25:C4:4E:51
+gdx-242: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.26
+    ip: 00:11:25:C4:2B:FC
+  eth1: 
+    mac: 172.24.148.26
+    ip: 00:11:25:C4:2B:FD
 gdx-57: 
-  mac_myri0: 00:60:DD:47:88:43
-  mac_eth0: 00:11:25:C4:3C:24
-  mac_eth1: 00:11:25:C4:3C:25
-  mac_bmc: 00:11:25:91:49:50
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.21
+    ip: 00:11:25:C4:3C:24
+  eth1: 
+    mac: 172.24.132.21
+    ip: 00:11:25:C4:3C:25
 gdx-83: 
-  mac_myri0: 00:60:DD:47:5A:C8
-  mac_eth0: 00:11:25:C4:26:8A
-  mac_eth1: 00:11:25:C4:26:8B
-  mac_bmc: 00:11:25:91:46:03
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.11
+    ip: 00:11:25:C4:26:8A
+  eth1: 
+    mac: 172.24.134.11
+    ip: 00:11:25:C4:26:8B
 gdx-108: 
-  mac_myri0: 00:60:DD:47:68:12
-  mac_eth0: 00:11:25:C4:51:BC
-  mac_eth1: 00:11:25:C4:51:BD
-  mac_bmc: 00:11:25:91:47:DC
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.36
+    ip: 00:11:25:C4:51:BC
+  eth1: 
+    mac: 172.24.136.36
+    ip: 00:11:25:C4:51:BD
 gdx-134: 
-  mac_myri0: 00:60:DD:47:65:BE
-  mac_eth0: 00:11:25:C4:4F:4E
-  mac_eth1: 00:11:25:C4:4F:4F
-  mac_bmc: 00:11:25:91:48:1D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.26
+    ip: 00:11:25:C4:4F:4E
+  eth1: 
+    mac: 172.24.139.26
+    ip: 00:11:25:C4:4F:4F
 gdx-161: 
-  mac_myri0: 00:60:DD:47:5A:72
-  mac_eth0: 00:11:25:C4:4F:8E
-  mac_eth1: 00:11:25:C4:4F:8F
-  mac_bmc: 00:11:25:91:48:B8
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.17
+    ip: 00:11:25:C4:4F:8E
+  eth1: 
+    mac: 172.24.141.17
+    ip: 00:11:25:C4:4F:8F
 gdx-215: 
-  mac_eth0: 00:11:25:C4:54:7E
-  mac_myri0: 00:60:DD:47:89:EC
-  mac_eth1: 00:11:25:C4:54:7F
-  mac_bmc: 00:11:25:91:46:83
-gdx-242: 
-  mac_myri0: 00:60:DD:47:7C:C8
-  mac_eth0: 00:11:25:C4:2B:FC
-  mac_eth1: 00:11:25:C4:2B:FD
-  mac_bmc: 00:11:25:91:48:AD
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.35
+    ip: 00:11:25:C4:54:7E
+  eth1: 
+    mac: 172.24.145.35
+    ip: 00:11:25:C4:54:7F
+gdx-243: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.27
+    ip: 00:11:25:C4:2B:58
+  eth1: 
+    mac: 172.24.148.27
+    ip: 00:11:25:C4:2B:59
 gdx-58: 
-  mac_myri0: 00:60:DD:47:68:42
-  mac_eth0: 00:11:25:C4:39:3E
-  mac_eth1: 00:11:25:C4:39:3F
-  mac_bmc: 00:11:25:91:46:51
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.22
+    ip: 00:11:25:C4:39:3E
+  eth1: 
+    mac: 172.24.132.22
+    ip: 00:11:25:C4:39:3F
 gdx-84: 
-  mac_myri0: 00:60:DD:47:65:A6
-  mac_eth0: 00:11:25:C4:3A:86
-  mac_eth1: 00:11:25:C4:3A:87
-  mac_bmc: 00:11:25:91:46:1A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.12
+    ip: 00:11:25:C4:3A:86
+  eth1: 
+    mac: 172.24.134.12
+    ip: 00:11:25:C4:3A:87
 gdx-109: 
-  mac_eth0: 00:11:25:C4:53:22
-  mac_myri0: 00:60:DD:47:59:7E
-  mac_eth1: 00:11:25:C4:53:23
-  mac_bmc: 00:11:25:91:45:F1
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.1
+    ip: 00:11:25:C4:53:22
+  eth1: 
+    mac: 172.24.137.1
+    ip: 00:11:25:C4:53:23
 gdx-135: 
-  mac_myri0: 00:60:DD:47:59:70
-  mac_eth0: 00:11:25:C4:53:E6
-  mac_eth1: 00:11:25:C4:53:E7
-  mac_bmc: 00:11:25:91:47:6B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.27
+    ip: 00:11:25:C4:53:E6
+  eth1: 
+    mac: 172.24.139.27
+    ip: 00:11:25:C4:53:E7
 gdx-162: 
-  mac_myri0: 00:60:DD:47:5A:BA
-  mac_eth0: 00:11:25:C4:4E:B8
-  mac_eth1: 00:11:25:C4:4E:B9
-  mac_bmc: 00:11:25:91:45:FE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.18
+    ip: 00:11:25:C4:4E:B8
+  eth1: 
+    mac: 172.24.141.18
+    ip: 00:11:25:C4:4E:B9
 gdx-216: 
-  mac_eth0: 00:11:25:C4:4D:1C
-  mac_myri0: 00:60:DD:47:89:76
-  mac_eth1: 00:11:25:C4:4D:1D
-  mac_bmc: 00:11:25:91:47:AF
-gdx-243: 
-  mac_myri0: 00:60:DD:47:7C:07
-  mac_eth0: 00:11:25:C4:2B:58
-  mac_eth1: 00:11:25:C4:2B:59
-  mac_bmc: 00:11:25:91:46:7A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.36
+    ip: 00:11:25:C4:4D:1C
+  eth1: 
+    mac: 172.24.145.36
+    ip: 00:11:25:C4:4D:1D
+gdx-270: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.18
+    ip: 00:11:25:C4:35:48
+  eth1: 
+    mac: 172.24.150.18
+    ip: 00:11:25:C4:35:49
 gdx-59: 
-  mac_myri0: 00:60:DD:47:67:89
-  mac_eth0: 00:11:25:C4:2E:30
-  mac_eth1: 00:11:25:C4:2E:31
-  mac_bmc: 00:11:25:91:49:03
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.23
+    ip: 00:11:25:C4:2E:30
+  eth1: 
+    mac: 172.24.132.23
+    ip: 00:11:25:C4:2E:31
 gdx-85: 
-  mac_myri0: 00:60:DD:47:59:72
-  mac_eth0: 00:11:25:C4:3B:44
-  mac_eth1: 00:11:25:C4:3B:45
-  mac_bmc: 00:11:25:91:48:93
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.13
+    ip: 00:11:25:C4:3B:44
+  eth1: 
+    mac: 172.24.135.13
+    ip: 00:11:25:C4:3B:45
 gdx-136: 
-  mac_myri0: 00:60:DD:47:65:BD
-  mac_eth0: 00:11:25:C4:4D:40
-  mac_eth1: 00:11:25:C4:4D:41
-  mac_bmc: 00:11:25:91:48:A0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.28
+    ip: 00:11:25:C4:4D:40
+  eth1: 
+    mac: 172.24.139.28
+    ip: 00:11:25:C4:4D:41
 gdx-163: 
-  mac_eth0: 00:11:25:C4:50:86
-  mac_myri0: 00:60:DD:47:65:A7
-  mac_eth1: 00:11:25:C4:50:06
-  mac_bmc: 00:11:25:91:48:34
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.19
+    ip: 00:11:25:c4:50:86
+  eth1: 
+    mac: 172.24.141.19
+    ip: 00:11:25:c4:50:06
 gdx-217: 
-  mac_eth0: 00:11:25:C4:3B:7C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3B:7D
-  mac_bmc: 00:11:25:91:46:70
-gdx-270: 
-  mac_myri0: 00:60:DD:47:89:C4
-  mac_eth0: 00:11:25:C4:35:48
-  mac_eth1: 00:11:25:C4:35:49
-  mac_bmc: 00:11:25:91:46:CF
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.1
+    ip: 00:11:25:C4:3B:7C
+  eth1: 
+    mac: 172.24.146.1
+    ip: 00:11:25:C4:3B:7D
+gdx-271: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.19
+    ip: 00:11:25:C4:31:92
+  eth1: 
+    mac: 172.24.150.19
+    ip: 00:11:25:C4:31:93
+gdx-244: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: "chang\xC3\xA9e"
+  eth1: 
+    mac: 172.24.148.28
+    ip: 00:11:25:C4:3B:ED
 gdx-86: 
-  mac_myri0: 00:60:DD:47:59:6C
-  mac_eth0: 00:11:25:C4:26:4C
-  mac_eth1: 00:11:25:C4:26:4D
-  mac_bmc: 00:11:25:91:49:47
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.14
+    ip: 00:11:25:C4:26:4C
+  eth1: 
+    mac: 172.24.135.14
+    ip: 00:11:25:C4:26:4D
 gdx-137: 
-  mac_myri0: 00:60:DD:47:5A:A5
-  mac_eth0: 00:11:25:C4:4F:E2
-  mac_eth1: 00:11:25:C4:4F:E3
-  mac_bmc: 00:11:25:91:45:C6
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.29
+    ip: 00:11:25:C4:4F:E2
+  eth1: 
+    mac: 172.24.139.29
+    ip: 00:11:25:C4:4F:E3
 gdx-164: 
-  mac_eth0: 00:11:25:C4:53:A0
-  mac_myri0: 00:60:DD:47:5A:C6
-  mac_eth1: 00:11:25:C4:53:A1
-  mac_bmc: 00:11:25:91:47:AE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.20
+    ip: 00:11:25:C4:53:A0
+  eth1: 
+    mac: 172.24.141.20
+    ip: 00:11:25:C4:53:A1
 gdx-190: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4E:34
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:35
-  mac_bmc: 00:11:25:91:48:11
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.10
+    ip: 00:11:25:C4:4E:34
+  eth1: 
+    mac: 172.24.143.10
+    ip: 00:11:25:C4:4E:35
 gdx-218: 
-  mac_eth0: 00:11:25:C4:35:46
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:47
-  mac_bmc: 00:11:25:91:48:D2
-gdx-244: 
-  mac_myri0: 00:60:DD:47:89:07
-  mac_eth0: 00:11:25:C4:10:FA
-  mac_eth1: 00:11:25:C4:10:FB
-  mac_bmc: 00:11:25:91:46:A3
-gdx-271: 
-  mac_myri0: 00:60:DD:47:7C:CC
-  mac_eth0: 00:11:25:C4:31:92
-  mac_eth1: 00:11:25:C4:31:93
-  mac_bmc: 00:11:25:91:47:7D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.2
+    ip: 00:11:25:C4:35:46
+  eth1: 
+    mac: 172.24.146.2
+    ip: 00:11:25:C4:35:47
+gdx-272: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.20
+    ip: 00:11:25:C4:2F:20
+  eth1: 
+    mac: 172.24.150.20
+    ip: 00:11:25:C4:2F:21
+gdx-245: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.29
+    ip: 00:11:25:C4:3A:4E
+  eth1: 
+    mac: 172.24.148.29
+    ip: 00:11:25:C4:3A:4F
 gdx-87: 
-  mac_myri0: 00:60:DD:47:68:81
-  mac_eth0: 00:11:25:C4:4D:F4
-  mac_eth1: 00:11:25:C4:4D:F5
-  mac_bmc: 00:11:25:91:48:B4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.15
+    ip: 00:11:25:C4:4D:F4
+  eth1: 
+    mac: 172.24.135.15
+    ip: 00:11:25:C4:4D:F5
 gdx-138: 
-  mac_myri0: 00:60:DD:47:5A:76
-  mac_eth0: 00:11:25:C4:4D:4A
-  mac_eth1: 00:11:25:C4:4D:4B
-  mac_bmc: 00:11:25:91:46:22
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.30
+    ip: 00:11:25:C4:4D:4A
+  eth1: 
+    mac: 172.24.139.30
+    ip: 00:11:25:C4:4D:4B
 gdx-165: 
-  mac_eth0: 00:11:25:C4:4D:6A
-  mac_myri0: 00:60:DD:47:5A:C7
-  mac_eth1: 00:11:25:C4:4D:6B
-  mac_bmc: 00:11:25:91:45:D0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.21
+    ip: 00:11:25:C4:4D:6A
+  eth1: 
+    mac: 172.24.141.21
+    ip: 00:11:25:C4:4D:6B
 gdx-191: 
-  mac_eth0: 00:11:25:C4:4E:3A
-  mac_myri0: 00:60:DD:47:86:53
-  mac_eth1: 00:11:25:C4:4E:3B
-  mac_bmc: 00:11:25:91:49:4D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.11
+    ip: 00:11:25:C4:4E:3A
+  eth1: 
+    mac: 172.24.143.11
+    ip: 00:11:25:C4:4E:3B
 gdx-219: 
-  mac_eth0: 00:11:25:C4:39:A8
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:39:A9
-  mac_bmc: 00:11:25:91:48:AA
-gdx-245: 
-  mac_myri0: 00:60:DD:47:7B:FE
-  mac_eth0: 00:11:25:C4:3A:4E
-  mac_eth1: 00:11:25:C4:3A:4F
-  mac_bmc: 00:11:25:91:47:EA
-gdx-272: 
-  mac_myri0: 00:60:DD:47:89:CE
-  mac_eth0: 00:11:25:C4:2F:20
-  mac_eth1: 00:11:25:C4:2F:21
-  mac_bmc: 00:11:25:91:48:15
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.3
+    ip: 00:11:25:C4:39:A8
+  eth1: 
+    mac: 172.24.146.3
+    ip: 00:11:25:C4:39:A9
+gdx-273: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.21
+    ip: 00:11:25:C4:32:EE
+  eth1: 
+    mac: 172.24.150.21
+    ip: 00:11:25:C4:32:EF
+gdx-246: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.30
+    ip: 00:11:25:C4:38:E2
+  eth1: 
+    mac: 172.24.148.30
+    ip: 00:11:25:C4:38:E3
 gdx-88: 
-  mac_myri0: 00:60:DD:47:67:93
-  mac_eth0: 00:11:25:C4:4E:28
-  mac_eth1: 00:11:25:C4:4E:29
-  mac_bmc: 00:11:25:91:46:3A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.16
+    ip: 00:11:25:C4:4E:28
+  eth1: 
+    mac: 172.24.135.16
+    ip: 00:11:25:C4:4E:29
 gdx-139: 
-  mac_myri0: 00:60:DD:47:65:AA
-  mac_eth0: 00:11:25:C4:38:DE
-  mac_eth1: 00:11:25:C4:38:DF
-  mac_bmc: 00:11:25:91:45:CF
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.31
+    ip: 00:11:25:C4:38:DE
+  eth1: 
+    mac: 172.24.139.31
+    ip: 00:11:25:C4:38:DF
 gdx-166: 
-  mac_eth0: 00:11:25:C4:04:DE
-  mac_myri0: 00:60:DD:47:59:FE
-  mac_eth1: 00:11:25:C4:3A:91
-  mac_bmc: 00:11:25:91:47:5C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: "chang\xC3\xA9e"
+  eth1: 
+    mac: 172.24.141.22
+    ip: 00:11:25:C4:3A:91
 gdx-192: 
-  mac_eth0: 00:11:25:C4:4E:A8
-  mac_myri0: 00:60:DD:47:86:45
-  mac_eth1: 00:11:25:C4:4E:A9
-  mac_bmc: 00:11:25:91:47:56
-gdx-246: 
-  mac_myri0: 00:60:DD:47:86:58
-  mac_eth0: 00:11:25:C4:38:E2
-  mac_eth1: 00:11:25:C4:38:E3
-  mac_bmc: 00:11:25:91:46:0E
-gdx-273: 
-  mac_myri0: 00:60:DD:47:89:C8
-  mac_eth0: 00:11:25:C4:32:EE
-  mac_eth1: 00:11:25:C4:32:EF
-  mac_bmc: 00:11:25:91:46:99
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.12
+    ip: 00:11:25:C4:4E:A8
+  eth1: 
+    mac: 172.24.143.12
+    ip: 00:11:25:C4:4E:A9
+gdx-274: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.22
+    ip: 00:11:25:C4:35:C0
+  eth1: 
+    mac: 172.24.150.22
+    ip: 00:11:25:C4:35:C1
+gdx-247: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.31
+    ip: 00:11:25:C4:32:76
+  eth1: 
+    mac: 172.24.148.31
+    ip: 00:11:25:C4:32:77
 gdx-89: 
-  mac_myri0: 00:60:DD:47:68:79
-  mac_eth0: 00:11:25:C4:4E:5C
-  mac_eth1: 00:11:25:C4:4E:5D
-  mac_bmc: 00:11:25:91:45:CE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.17
+    ip: 00:11:25:C4:4E:5C
+  eth1: 
+    mac: 172.24.135.17
+    ip: 00:11:25:C4:4E:5D
 gdx-193: 
-  mac_eth0: 00:11:25:C4:4E:14
-  mac_myri0: 00:60:DD:47:86:62
-  mac_eth1: 00:11:25:C4:4E:15
-  mac_bmc: 00:11:25:91:49:12
-gdx-247: 
-  mac_myri0: 00:60:DD:47:7B:FD
-  mac_eth0: 00:11:25:C4:32:76
-  mac_eth1: 00:11:25:C4:32:77
-  mac_bmc: 00:11:25:91:48:F4
-gdx-274: 
-  mac_myri0: 00:60:DD:47:89:D2
-  mac_eth0: 00:11:25:C4:35:C0
-  mac_eth1: 00:11:25:C4:35:C1
-  mac_bmc: 00:11:25:91:45:C9
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.13
+    ip: 00:11:25:C4:4E:14
+  eth1: 
+    mac: 172.24.144.13
+    ip: 00:11:25:C4:4E:15
+gdx-275: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.23
+    ip: 00:11:25:C4:11:38
+  eth1: 
+    mac: 172.24.150.23
+    ip: 00:11:25:C4:11:39
+gdx-248: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.32
+    ip: 00:11:25:C4:31:FA
+  eth1: 
+    mac: 172.24.148.32
+    ip: 00:11:25:C4:31:FB
 gdx-167: 
-  mac_eth0: 00:11:25:C4:50:02
-  mac_myri0: 00:60:DD:47:5A:BB
-  mac_eth1: 00:11:25:C4:50:03
-  mac_bmc: 00:11:25:91:46:9C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.23
+    ip: 00:11:25:C4:50:02
+  eth1: 
+    mac: 172.24.141.23
+    ip: 00:11:25:C4:50:03
 gdx-194: 
-  mac_eth0: 00:11:25:C4:52:D0
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:52:D1
-  mac_bmc: 00:11:25:91:47:74
-gdx-248: 
-  mac_myri0: 00:60:DD:47:7B:FC
-  mac_eth0: 00:11:25:C4:31:FA
-  mac_eth1: 00:11:25:C4:31:FB
-  mac_bmc: 00:11:25:91:48:3B
-gdx-275: 
-  mac_myri0: 00:60:DD:47:89:90
-  mac_eth0: 00:11:25:C4:11:38
-  mac_eth1: 00:11:25:C4:11:39
-  mac_bmc: 00:11:25:91:45:F0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.14
+    ip: 00:11:25:C4:52:D0
+  eth1: 
+    mac: 172.24.144.14
+    ip: 00:11:25:C4:52:D1
+gdx-276: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.24
+    ip: 00:11:25:C4:35:B6
+  eth1: 
+    mac: 172.24.150.24
+    ip: 00:11:25:C4:35:B7
+gdx-249: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.33
+    ip: 00:11:25:C4:33:40
+  eth1: 
+    mac: 172.24.148.33
+    ip: 00:11:25:C4:33:41
 gdx-168: 
-  mac_eth0: 00:11:25:C4:54:4C
-  mac_myri0: 00:60:DD:47:5A:B2
-  mac_eth1: 00:11:25:C4:54:4D
-  mac_bmc: 00:11:25:91:49:17
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.24
+    ip: 00:11:25:C4:54:4C
+  eth1: 
+    mac: 172.24.141.24
+    ip: 00:11:25:C4:54:4D
 gdx-195: 
-  mac_eth0: 00:11:25:C4:38:D4
-  mac_myri0: 00:60:DD:47:5A:A3
-  mac_eth1: 00:11:25:C4:38:D5
-  mac_bmc: 00:11:25:91:47:F5
-gdx-249: 
-  mac_myri0: 00:60:DD:47:88:62
-  mac_eth0: 00:11:25:C4:33:40
-  mac_eth1: 00:11:25:C4:33:41
-  mac_bmc: 00:11:25:91:45:E9
-gdx-276: 
-  mac_myri0: 00:60:DD:47:89:0D
-  mac_eth0: 00:11:25:C4:35:B6
-  mac_eth1: 00:11:25:C4:35:B7
-  mac_bmc: 00:09:6B:5E:FB:10
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.15
+    ip: 00:11:25:C4:38:D4
+  eth1: 
+    mac: 172.24.144.15
+    ip: 00:11:25:C4:38:D5
 gdx-169: 
-  mac_eth0: 00:11:25:C4:45:B0
-  mac_myri0: 00:60:DD:47:5A:B3
-  mac_eth1: 00:11:25:C4:45:B1
-  mac_bmc: 00:11:25:91:48:F0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.25
+    ip: 00:11:25:C4:45:B0
+  eth1: 
+    mac: 172.24.142.25
+    ip: 00:11:25:C4:45:B1
 gdx-196: 
-  mac_eth0: 00:11:25:C4:4F:E4
-  mac_myri0: 00:60:DD:47:7C:0F
-  mac_eth1: 00:11:25:C4:4F:E5
-  mac_bmc: 00:11:25:91:45:7B
-gdx-197: 
-  mac_eth0: 00:11:25:C4:51:72
-  mac_myri0: 00:60:DD:47:86:52
-  mac_eth1: 00:11:25:C4:51:73
-  mac_bmc: 00:11:25:91:45:F9
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.16
+    ip: 00:11:25:C4:4F:E4
+  eth1: 
+    mac: 172.24.144.16
+    ip: 00:11:25:C4:4F:E5
 gdx-277: 
-  mac_myri0: 00:60:DD:47:89:87
-  mac_eth0: 00:11:25:C4:34:58
-  mac_eth1: 00:11:25:C4:34:59
-  mac_bmc: 00:11:25:91:49:5E
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.25
+    ip: 00:11:25:C4:34:58
+  eth1: 
+    mac: 172.24.151.25
+    ip: 00:11:25:C4:34:59
+gdx-197: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.17
+    ip: 00:11:25:C4:51:72
+  eth1: 
+    mac: 172.24.144.17
+    ip: 00:11:25:C4:51:73
 gdx-10: 
-  mac_myri0: 00:60:DD:47:59:65
-  mac_eth0: 00:11:25:C4:33:38
-  mac_eth1: 00:11:25:C4:33:39
-  mac_bmc: 00:11:25:91:47:58
-gdx-198: 
-  mac_eth0: 00:11:25:C4:4E:C8
-  mac_myri0: 00:60:DD:47:89:0B
-  mac_eth1: 00:11:25:C4:4E:C9
-  mac_bmc: 00:11:25:91:48:95
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.10
+    ip: 00:11:25:C4:33:38
+  eth1: 
+    mac: 172.24.128.10
+    ip: 00:11:25:C4:33:39
 gdx-278: 
-  mac_myri0: 00:60:DD:47:C7:3E
-  mac_eth0: 00:11:25:C4:34:46
-  mac_eth1: 00:11:25:C4:34:47
-  mac_bmc: 00:11:25:91:47:6C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.26
+    ip: 00:11:25:C4:34:46
+  eth1: 
+    mac: 172.24.151.26
+    ip: 00:11:25:C4:34:47
+gdx-198: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.18
+    ip: 00:11:25:C4:4E:C8
+  eth1: 
+    mac: 172.24.144.18
+    ip: 00:11:25:C4:4E:C9
 gdx-11: 
-  mac_myri0: 00:60:DD:47:5A:53
-  mac_eth0: 00:11:25:C4:34:3E
-  mac_eth1: 00:11:25:C4:34:3F
-  mac_bmc: 00:11:25:91:48:EE
-gdx-199: 
-  mac_eth0: 00:11:25:C4:4E:CC
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:CD
-  mac_bmc: 00:11:25:91:48:99
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.11
+    ip: 00:11:25:C4:34:3E
+  eth1: 
+    mac: 172.24.128.11
+    ip: 00:11:25:C4:34:3F
 gdx-279: 
-  mac_myri0: 00:60:DD:47:C7:FD
-  mac_eth0: 00:11:25:C4:33:96
-  mac_eth1: 00:11:25:C4:33:97
-  mac_bmc: 00:11:25:91:46:42
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.27
+    ip: 00:11:25:C4:33:96
+  eth1: 
+    mac: 172.24.151.27
+    ip: 00:11:25:C4:33:97
+gdx-199: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.19
+    ip: 00:11:25:C4:4E:CC
+  eth1: 
+    mac: 172.24.144.19
+    ip: 00:11:25:C4:4E:CD
 gdx-12: 
-  mac_myri0: 00:60:DD:47:59:64
-  mac_eth0: 00:11:25:C4:35:42
-  mac_eth1: 00:11:25:C4:35:43
-  mac_bmc: 00:11:25:91:45:B8
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.12
+    ip: 00:11:25:C4:35:42
+  eth1: 
+    mac: 172.24.128.12
+    ip: 00:11:25:C4:35:43
 gdx-13: 
-  mac_myri0: 00:60:DD:47:5A:99
-  mac_eth0: 00:11:25:C4:34:48
-  mac_eth1: 00:11:25:C4:34:49
-  mac_bmc: 00:11:25:91:48:02
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.13
+    ip: 00:11:25:C4:34:48
+  eth1: 
+    mac: 172.24.129.13
+    ip: 00:11:25:C4:34:49
 gdx-14: 
-  mac_myri0: 00:60:DD:47:5A:5A
-  mac_eth0: 00:11:25:C4:34:3C
-  mac_eth1: 00:11:25:C4:34:3D
-  mac_bmc: 00:11:25:91:48:91
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.14
+    ip: 00:11:25:C4:34:3C
+  eth1: 
+    mac: 172.24.129.14
+    ip: 00:11:25:C4:34:3D
 gdx-40: 
-  mac_myri0: 00:60:DD:47:68:87
-  mac_eth0: 00:11:25:C4:33:66
-  mac_eth1: 00:11:25:C4:33:67
-  mac_bmc: 00:11:25:91:46:84
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.4
+    ip: 00:11:25:C4:33:66
+  eth1: 
+    mac: 172.24.131.4
+    ip: 00:11:25:C4:33:67
 gdx-15: 
-  mac_myri0: 00:60:DD:47:5A:58
-  mac_eth0: 00:11:25:C4:35:9B
-  mac_eth1: 00:11:25:C4:35:9C
-  mac_bmc: 00:11:25:91:48:A2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.15
+    ip: 00:11:25:C4:35:9B
+  eth1: 
+    mac: 172.24.129.15
+    ip: 00:11:25:C4:35:9C
 gdx-41: 
-  mac_myri0: 00:60:DD:47:59:04
-  mac_eth0: 00:11:25:C4:34:86
-  mac_eth1: 00:11:25:C4:34:87
-  mac_bmc: 00:11:25:91:45:AB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.5
+    ip: 00:11:25:C4:34:86
+  eth1: 
+    mac: 172.24.131.5
+    ip: 00:11:25:C4:34:87
 gdx-200: 
-  mac_eth0: 00:11:25:C4:50:D2
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:50:D3
-  mac_bmc: 00:11:25:91:47:C9
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.20
+    ip: 00:11:25:C4:50:D2
+  eth1: 
+    mac: 172.24.144.20
+    ip: 00:11:25:C4:50:D3
 gdx-16: 
-  mac_myri0: 00:60:DD:47:68:85
-  mac_eth0: 00:11:25:C4:2E:CE
-  mac_eth1: 00:11:25:C4:2E:CF
-  mac_bmc: 00:11:25:91:45:8E
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.16
+    ip: 00:11:25:C4:2E:CE
+  eth1: 
+    mac: 172.24.129.16
+    ip: 00:11:25:C4:2E:CF
 gdx-42: 
-  mac_myri0: 00:60:DD:47:67:94
-  mac_eth0: 00:11:25:C4:2B:F0
-  mac_eth1: 00:11:25:C4:2B:F1
-  mac_bmc: 00:11:25:91:49:2C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.6
+    ip: 00:11:25:C4:2B:F0
+  eth1: 
+    mac: 172.24.131.6
+    ip: 00:11:25:C4:2B:F1
 gdx-120: 
-  mac_eth0: 00:11:25:C4:4F:D2
-  mac_myri0: 00:60:DD:47:5A:94
-  mac_eth1: 00:11:25:C4:4F:D3
-  mac_bmc: 00:11:25:91:48:19
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.12
+    ip: 00:11:25:C4:4F:D2
+  eth1: 
+    mac: 172.24.137.12
+    ip: 00:11:25:C4:4F:D3
 gdx-201: 
-  mac_eth0: 00:11:25:C4:51:B2
-  mac_myri0: 00:60:DD:47:86:51
-  mac_eth1: 00:11:25:C4:51:B3
-  mac_bmc: 00:11:25:91:47:A2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.21
+    ip: 00:11:25:C4:51:B2
+  eth1: 
+    mac: 172.24.144.21
+    ip: 00:11:25:C4:51:B3
 gdx-17: 
-  mac_myri0: 00:60:DD:47:63:85
-  mac_eth0: 00:11:25:C4:34:56
-  mac_eth1: 00:11:25:C4:34:57
-  mac_bmc: 00:11:25:91:49:4A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.17
+    ip: 00:11:25:C4:34:56
+  eth1: 
+    mac: 172.24.129.17
+    ip: 00:11:25:C4:34:57
 gdx-43: 
-  mac_myri0: 00:60:DD:47:59:05
-  mac_eth0: 00:11:25:C4:33:2A
-  mac_eth1: 00:11:25:C4:33:2B
-  mac_bmc: 00:11:25:91:45:BD
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.7
+    ip: 00:11:25:C4:33:2A
+  eth1: 
+    mac: 172.24.131.7
+    ip: 00:11:25:C4:33:2B
 gdx-121: 
-  mac_eth0: 00:11:25:C4:50:1A
-  mac_myri0: 00:60:DD:47:59:7D
-  mac_eth1: 00:11:25:C4:50:1B
-  mac_bmc: 00:11:25:91:48:88
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.13
+    ip: 00:11:25:C4:50:1A
+  eth1: 
+    mac: 172.24.138.13
+    ip: 00:11:25:C4:50:1B
 gdx-18: 
-  mac_myri0: 00:60:DD:47:59:6A
-  mac_eth0: 00:11:25:C4:35:7A
-  mac_eth1: 00:11:25:C4:35:7B
-  mac_bmc: 00:11:25:91:48:AF
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.18
+    ip: 00:11:25:C4:35:7A
+  eth1: 
+    mac: 172.24.129.18
+    ip: 00:11:25:C4:35:7B
 gdx-44: 
-  mac_myri0: 00:60:DD:47:59:00
-  mac_eth0: 00:11:25:C4:2F:50
-  mac_eth1: 00:11:25:C4:2F:51
-  mac_bmc: 00:11:25:91:48:EC
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.8
+    ip: 00:11:25:C4:2F:50
+  eth1: 
+    mac: 172.24.131.8
+    ip: 00:11:25:C4:2F:51
 gdx-70: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3C:4A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:4B
-  mac_bmc: 00:11:25:91:46:77
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.34
+    ip: 00:11:25:C4:3C:4A
+  eth1: 
+    mac: 172.24.133.34
+    ip: 00:11:25:C4:3C:4B
 gdx-122: 
-  mac_eth0: 00:11:25:C4:4D:84
-  mac_myri0: 00:60:DD:47:59:3F
-  mac_eth1: 00:11:25:C4:4D:85
-  mac_bmc: 00:11:25:91:46:29
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.14
+    ip: 00:11:25:C4:4D:84
+  eth1: 
+    mac: 172.24.138.14
+    ip: 00:11:25:C4:4D:85
 gdx-202: 
-  mac_eth0: 00:11:25:C4:53:F8
-  mac_myri0: 00:60:DD:47:86:49
-  mac_eth1: 00:11:25:C4:53:F9
-  mac_bmc: 00:11:25:91:47:A8
-gdx-230: 
-  mac_eth0: 00:11:25:C4:35:A6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:A7
-  mac_bmc: 00:11:25:91:45:B4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.22
+    ip: 00:11:25:C4:53:F8
+  eth1: 
+    mac: 172.24.144.22
+    ip: 00:11:25:C4:53:F9
 gdx-310: 
-  mac_eth0: 00:11:25:C4:33:D0
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:33:D1
-  mac_bmc: 00:11:25:91:47:A6
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.22
+    ip: 00:11:25:C4:33:D0
+  eth1: 
+    mac: 172.24.153.22
+    ip: 00:11:25:C4:33:D1
+gdx-230: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.14
+    ip: 00:11:25:C4:35:A6
+  eth1: 
+    mac: 172.24.147.14
+    ip: 00:11:25:C4:35:A7
 gdx-19: 
-  mac_myri0: 00:60:DD:47:5A:54
-  mac_eth0: 00:11:25:C4:34:4C
-  mac_eth1: 00:11:25:C4:34:4D
-  mac_bmc: 00:11:25:91:49:55
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.19
+    ip: 00:11:25:C4:34:4C
+  eth1: 
+    mac: 172.24.129.19
+    ip: 00:11:25:C4:34:4D
 gdx-45: 
-  mac_myri0: 00:60:DD:47:59:A3
-  mac_eth0: 00:11:25:C4:35:18
-  mac_eth1: 00:11:25:C4:35:19
-  mac_bmc: 00:11:25:91:49:3F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.9
+    ip: 00:11:25:C4:35:18
+  eth1: 
+    mac: 172.24.131.9
+    ip: 00:11:25:C4:35:19
 gdx-71: 
-  mac_myri0: 00:60:DD:47:68:7F
-  mac_eth0: 00:11:25:C4:35:78
-  mac_eth1: 00:11:25:C4:35:79
-  mac_bmc: 00:11:25:91:49:1F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.35
+    ip: 00:11:25:C4:35:78
+  eth1: 
+    mac: 172.24.133.35
+    ip: 00:11:25:C4:35:79
 gdx-203: 
-  mac_eth0: 00:11:25:C4:4C:FC
-  mac_myri0: 00:60:DD:47:86:48
-  mac_eth1: 00:11:25:C4:4C:FD
-  mac_bmc: 00:11:25:91:45:F5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.23
+    ip: 00:11:25:C4:4C:FC
+  eth1: 
+    mac: 172.24.144.23
+    ip: 00:11:25:C4:4C:FD
+gdx-231: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.15
+    ip: 00:11:25:C4:3C:78
+  eth1: 
+    mac: 172.24.147.15
+    ip: 00:11:25:C4:3C:79
 gdx-46: 
-  mac_myri0: 00:60:DD:47:65:DB
-  mac_eth0: 00:11:25:C4:09:C6
-  mac_eth1: 00:11:25:C4:09:C7
-  mac_bmc: 00:11:25:91:76:3B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: "chang\xC3\xA9e"
+  eth1: 
+    mac: 172.24.131.10
+    ip: 00:11:25:C4:35:21
 gdx-72: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3E:3C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3E:3D
-  mac_bmc: 00:11:25:91:46:3D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.36
+    ip: 00:11:25:C4:3E:3C
+  eth1: 
+    mac: 172.24.133.36
+    ip: 00:11:25:C4:3E:3D
 gdx-123: 
-  mac_eth0: 00:11:25:C4:4E:B0
-  mac_myri0: 00:60:DD:47:59:7A
-  mac_eth1: 00:11:25:C4:4E:B1
-  mac_bmc: 00:11:25:91:45:F2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.15
+    ip: 00:11:25:C4:4E:B0
+  eth1: 
+    mac: 172.24.138.15
+    ip: 00:11:25:C4:4E:B1
 gdx-150: 
-  mac_myri0: 00:60:DD:47:5A:C3
-  mac_eth0: 00:11:25:C4:4F:02
-  mac_eth1: 00:11:25:C4:4F:03
-  mac_bmc: 00:11:25:91:47:B4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.6
+    ip: 00:11:25:C4:4F:02
+  eth1: 
+    mac: 172.24.140.6
+    ip: 00:11:25:C4:4F:03
 gdx-204: 
-  mac_eth0: 00:11:25:C4:4F:04
-  mac_myri0: 00:60:DD:47:86:46
-  mac_eth1: 00:11:25:C4:4F:05
-  mac_bmc: 00:11:25:91:46:16
-gdx-231: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:3C:78
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:79
-  mac_bmc: 00:11:25:91:47:E5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.17.24
+    ip: 00:11:25:C4:4F:04
+  eth1: 
+    mac: 172.24.144.24
+    ip: 00:11:25:C4:4F:05
+gdx-232: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.16
+    ip: 00:11:25:C4:38:CA
+  eth1: 
+    mac: 172.24.147.16
+    ip: 00:11:25:C4:38:CB
 gdx-47: 
-  mac_myri0: 00:60:DD:47:58:F6
-  mac_eth0: 00:11:25:C4:35:99
-  mac_eth1: 00:11:25:C4:35:9A
-  mac_bmc: 00:11:25:91:48:52
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.11
+    ip: 00:11:25:C4:35:99
+  eth1: 
+    mac: 172.24.131.11
+    ip: 00:11:25:C4:35:9A
 gdx-73: 
-  mac_myri0: 00:60:DD:47:59:6D
-  mac_eth0: 00:11:25:C4:35:9E
-  mac_eth1: 00:11:25:C4:35:9F
-  mac_bmc: 00:11:25:91:46:80
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.1
+    ip: 00:11:25:C4:35:9E
+  eth1: 
+    mac: 172.24.134.1
+    ip: 00:11:25:C4:35:9F
 gdx-124: 
-  mac_eth0: 00:11:25:C4:4D:C8
-  mac_myri0: 00:60:DD:47:66:00
-  mac_eth1: 00:11:25:C4:4D:C9
-  mac_bmc: 00:11:25:91:46:6D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.16
+    ip: 00:11:25:C4:4D:C8
+  eth1: 
+    mac: 172.24.138.16
+    ip: 00:11:25:C4:4D:C9
 gdx-151: 
-  mac_myri0: 00:60:DD:47:5A:BD
-  mac_eth0: 00:11:25:C4:53:78
-  mac_eth1: 00:11:25:C4:53:79
-  mac_bmc: 00:11:25:91:45:9D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.7
+    ip: 00:11:25:C4:53:78
+  eth1: 
+    mac: 172.24.140.7
+    ip: 00:11:25:C4:53:79
 gdx-205: 
-  mac_eth0: 00:11:25:C4:4F:14
-  mac_myri0: 00:60:DD:47:C4:3F
-  mac_eth1: 00:11:25:C4:4F:15
-  mac_bmc: 00:11:25:91:47:95
-gdx-232: 
-  mac_eth0: 00:11:25:C4:38:CA
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:38:CB
-  mac_bmc: 00:11:25:91:45:79
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.25
+    ip: 00:11:25:C4:4F:14
+  eth1: 
+    mac: 172.24.145.25
+    ip: 00:11:25:C4:4F:15
 gdx-48: 
-  mac_myri0: 00:60:DD:47:5A:85
-  mac_eth0: 00:11:25:C4:2D:6C
-  mac_eth1: 00:11:25:C4:2D:6D
-  mac_bmc: 00:11:25:91:46:06
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.12
+    ip: 00:11:25:C4:2D:6C
+  eth1: 
+    mac: 172.24.131.12
+    ip: 00:11:25:C4:2D:6D
 gdx-74: 
-  mac_myri0: 00:60:DD:47:59:73
-  mac_eth0: 00:11:25:C4:2D:0A
-  mac_eth1: 00:11:25:C4:2D:0B
-  mac_bmc: 00:11:25:91:48:46
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.2
+    ip: 00:11:25:C4:2D:0A
+  eth1: 
+    mac: 172.24.134.2
+    ip: 00:11:25:C4:2D:0B
 gdx-125: 
-  mac_eth0: 00:11:25:C4:51:F8
-  mac_myri0: 00:60:DD:47:5A:55
-  mac_eth1: 00:11:25:C4:51:F9
-  mac_bmc: 00:11:25:91:46:45
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.17
+    ip: 00:11:25:C4:51:F8
+  eth1: 
+    mac: 172.24.138.17
+    ip: 00:11:25:C4:51:F9
 gdx-152: 
-  mac_myri0: 00:60:DD:47:65:B3
-  mac_eth0: 00:11:25:C4:50:B6
-  mac_eth1: 00:11:25:C4:50:B7
-  mac_bmc: 00:11:25:91:49:23
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.8
+    ip: 00:11:25:C4:50:B6
+  eth1: 
+    mac: 172.24.140.8
+    ip: 00:11:25:C4:50:B7
 gdx-206: 
-  mac_eth0: 00:11:25:C4:52:64
-  mac_myri0: 00:60:DD:47:86:5E
-  mac_eth1: 00:11:25:C4:52:65
-  mac_bmc: 00:11:25:91:46:54
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.26
+    ip: 00:11:25:C4:52:64
+  eth1: 
+    mac: 172.24.145.26
+    ip: 00:11:25:C4:52:65
+gdx-260: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.8
+    ip: 00:11:25:C4:33:82
+  eth1: 
+    mac: 172.24.149.8
+    ip: 00:11:25:C4:33:83
+gdx-233: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.17
+    ip: 00:11:25:C4:3C:20
+  eth1: 
+    mac: 172.24.147.17
+    ip: 00:11:25:C4:3C:21
 gdx-49: 
-  mac_myri0: 00:60:DD:47:5A:80
-  mac_eth0: 00:11:25:C4:33:16
-  mac_eth1: 00:11:25:C4:33:17
-  mac_bmc: 00:11:25:91:49:11
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.13
+    ip: 00:11:25:C4:33:16
+  eth1: 
+    mac: 172.24.132.13
+    ip: 00:11:25:C4:33:17
 gdx-75: 
-  mac_myri0: 00:60:DD:47:59:07
-  mac_eth0: 00:11:25:C4:39:AE
-  mac_eth1: 00:11:25:C4:39:AF
-  mac_bmc: 00:11:25:91:49:00
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.3
+    ip: 00:11:25:C4:39:AE
+  eth1: 
+    mac: 172.24.134.3
+    ip: 00:11:25:C4:39:AF
 gdx-126: 
-  mac_eth0: 00:11:25:C4:53:0E
-  mac_myri0: 00:60:DD:47:88:FD
-  mac_eth1: 00:11:25:C4:53:0F
-  mac_bmc: 00:11:25:91:48:37
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.18
+    ip: 00:11:25:C4:53:0E
+  eth1: 
+    mac: 172.24.138.18
+    ip: 00:11:25:C4:53:0F
 gdx-153: 
-  mac_myri0: 00:60:DD:47:65:DA
-  mac_eth0: 00:11:25:C4:50:A8
-  mac_eth1: 00:11:25:C4:50:A9
-  mac_bmc: 00:11:25:91:46:07
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.9
+    ip: 00:11:25:C4:50:A8
+  eth1: 
+    mac: 172.24.140.9
+    ip: 00:11:25:C4:50:A9
 gdx-207: 
-  mac_eth0: 00:11:25:C4:4F:B4
-  mac_myri0: 00:60:DD:47:86:59
-  mac_eth1: 00:11:25:C4:4F:B5
-  mac_bmc: 00:11:25:91:48:D5
-gdx-233: 
-  mac_eth0: 00:11:25:C4:3C:20
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:21
-  mac_bmc: 00:11:25:91:45:96
-gdx-260: 
-  mac_myri0: 00:60:DD:47:7D:B0
-  mac_eth0: 00:11:25:C4:33:82
-  mac_eth1: 00:11:25:C4:33:83
-  mac_bmc: 00:11:25:91:45:D3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.27
+    ip: 00:11:25:C4:4F:B4
+  eth1: 
+    mac: 172.24.145.27
+    ip: 00:11:25:C4:4F:B5
+gdx-261: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.9
+    ip: 00:11:25:C4:2D:72
+  eth1: 
+    mac: 172.24.149.9
+    ip: 00:11:25:C4:2D:73
+gdx-234: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.18
+    ip: 00:11:25:C4:3C:42
+  eth1: 
+    mac: 172.24.147.18
+    ip: 00:11:25:C4:3C:43
 gdx-76: 
-  mac_eth0: 00:11:25:C4:2B:2C
-  mac_myri0: 00:60:DD:47:59:30
-  mac_eth1: 00:11:25:C4:2B:2D
-  mac_bmc: 00:11:25:91:49:37
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.4
+    ip: 00:11:25:C4:2B:2C
+  eth1: 
+    mac: 172.24.134.4
+    ip: 00:11:25:C4:2B:2D
 gdx-127: 
-  mac_myri0: 00:60:DD:47:65:D9
-  mac_eth0: 00:11:25:C4:4D:94
-  mac_eth1: 00:11:25:C4:4D:95
-  mac_bmc: 00:11:25:91:46:88
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.19
+    ip: 00:11:25:C4:4D:94
+  eth1: 
+    mac: 172.24.138.19
+    ip: 00:11:25:C4:4D:95
 gdx-154: 
-  mac_myri0: 00:60:DD:47:5A:B5
-  mac_eth0: 00:11:25:C4:4D:2A
-  mac_eth1: 00:11:25:C4:4D:2B
-  mac_bmc: 00:11:25:91:46:DE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.10
+    ip: 00:11:25:C4:4D:2A
+  eth1: 
+    mac: 172.24.140.10
+    ip: 00:11:25:C4:4D:2B
 gdx-180: 
-  mac_eth0: 00:11:25:C4:4F:E6
-  mac_myri0: 00:60:DD:47:59:31
-  mac_eth1: 00:11:25:C4:4F:E7
-  mac_bmc: 00:11:25:91:45:8F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.36
+    ip: 00:11:25:C4:4F:E6
+  eth1: 
+    mac: 172.24.142.36
+    ip: 00:11:25:C4:4F:E7
 gdx-208: 
-  mac_eth0: 00:11:25:C4:4F:AE
-  mac_myri0: 00:60:DD:47:86:5A
-  mac_eth1: 00:11:25:C4:4F:AF
-  mac_bmc: 00:11:25:91:46:7D
-gdx-234: 
-  mac_eth0: 00:11:25:C4:3C:42
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:43
-  mac_bmc: 00:11:25:91:46:08
-gdx-261: 
-  mac_myri0: 00:60:DD:47:88:F8
-  mac_eth0: 00:11:25:C4:2D:72
-  mac_eth1: 00:11:25:C4:2D:73
-  mac_bmc: 00:11:25:91:48:7B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.28
+    ip: 00:11:25:C4:4F:AE
+  eth1: 
+    mac: 172.24.145.28
+    ip: 00:11:25:C4:4F:AF
+gdx-262: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.10
+    ip: 00:11:25:C4:34:E8
+  eth1: 
+    mac: 172.24.149.10
+    ip: 00:11:25:C4:34:E9
+gdx-235: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.19
+    ip: 00:11:25:C4:35:50
+  eth1: 
+    mac: 172.24.147.19
+    ip: 00:11:25:C4:35:51
 gdx-77: 
-  mac_myri0: 00:60:DD:47:5A:7A
-  mac_eth0: 00:11:25:C4:38:94
-  mac_eth1: 00:11:25:C4:38:95
-  mac_bmc: 00:11:25:91:46:46
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.5
+    ip: 00:11:25:C4:38:94
+  eth1: 
+    mac: 172.24.134.5
+    ip: 00:11:25:C4:38:95
 gdx-128: 
-  mac_myri0: 00:60:DD:47:67:FC
-  mac_eth0: 00:11:25:C4:53:18
-  mac_eth1: 00:11:25:C4:53:19
-  mac_bmc: 00:11:25:91:46:02
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.20
+    ip: 00:11:25:C4:53:18
+  eth1: 
+    mac: 172.24.138.20
+    ip: 00:11:25:C4:53:19
 gdx-155: 
-  mac_myri0: 00:60:DD:47:5A:8E
-  mac_eth0: 00:11:25:C4:50:A2
-  mac_eth1: 00:11:25:C4:50:A3
-  mac_bmc: 00:11:25:91:48:BA
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.11
+    ip: 00:11:25:C4:50:A2
+  eth1: 
+    mac: 172.24.140.11
+    ip: 00:11:25:C4:50:A3
 gdx-181: 
-  mac_eth0: 00:11:25:C4:53:4A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:53:4B
-  mac_bmc: 00:11:25:91:45:DD
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.1
+    ip: 00:11:25:C4:53:4A
+  eth1: 
+    mac: 172.24.143.1
+    ip: 00:11:25:C4:53:4B
 gdx-209: 
-  mac_eth0: 00:11:25:C4:4E:C4
-  mac_myri0: 00:60:DD:47:89:84
-  mac_eth1: 00:11:25:C4:4E:C5
-  mac_bmc: 00:11:25:91:45:82
-gdx-235: 
-  mac_eth0: 00:11:25:C4:35:50
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:51
-  mac_bmc: 00:11:25:91:47:EB
-gdx-262: 
-  mac_myri0: 00:60:DD:47:7D:11
-  mac_eth0: 00:11:25:C4:34:E8
-  mac_eth1: 00:11:25:C4:34:E9
-  mac_bmc: 00:11:25:91:47:46
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.29
+    ip: 00:11:25:C4:4E:C4
+  eth1: 
+    mac: 172.24.145.29
+    ip: 00:11:25:C4:4E:C5
+gdx-263: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.11
+    ip: 00:11:25:C4:35:88
+  eth1: 
+    mac: 172.24.149.11
+    ip: 00:11:25:C4:35:89
+gdx-236: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.20
+    ip: 00:11:25:C4:39:AC
+  eth1: 
+    mac: 172.24.147.20
+    ip: 00:11:25:C4:39:AD
 gdx-78: 
-  mac_myri0: 00:60:DD:47:59:06
-  mac_eth0: 00:11:25:C4:26:56
-  mac_eth1: 00:11:25:C4:26:57
-  mac_bmc: 00:11:25:91:47:F1
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.6
+    ip: 00:11:25:C4:26:56
+  eth1: 
+    mac: 172.24.134.6
+    ip: 00:11:25:C4:26:57
 gdx-129: 
-  mac_myri0: 00:60:DD:47:59:32
-  mac_eth0: 00:11:25:C4:4D:80
-  mac_eth1: 00:11:25:C4:4D:81
-  mac_bmc: 00:11:25:91:45:FB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.21
+    ip: 00:11:25:C4:4D:80
+  eth1: 
+    mac: 172.24.138.21
+    ip: 00:11:25:C4:4D:81
 gdx-182: 
-  mac_eth0: 00:11:25:C4:52:88
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:52:89
-  mac_bmc: 00:11:25:91:47:A0
-gdx-236: 
-  mac_myri0: 00:60:DD:47:89:D1
-  mac_eth0: 00:11:25:C4:39:AC
-  mac_eth1: 00:11:25:C4:39:AD
-  mac_bmc: 00:11:25:91:47:F7
-gdx-263: 
-  mac_myri0: 00:60:DD:47:89:C5
-  mac_eth0: 00:11:25:C4:35:88
-  mac_eth1: 00:11:25:C4:35:89
-  mac_bmc: 00:11:25:91:48:07
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.2
+    ip: 00:11:25:C4:52:88
+  eth1: 
+    mac: 172.24.143.2
+    ip: 00:11:25:C4:52:89
+gdx-290: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.2
+    ip: 00:11:25:C4:33:7C
+  eth1: 
+    mac: 172.24.152.2
+    ip: 00:11:25:C4:33:7D
+gdx-264: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.12
+    ip: 00:11:25:C4:33:5E
+  eth1: 
+    mac: 172.24.149.12
+    ip: 00:11:25:C4:33:5F
+gdx-237: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.21
+    ip: 00:11:25:C4:3C:80
+  eth1: 
+    mac: 172.24.147.21
+    ip: 00:11:25:C4:3C:81
 gdx-79: 
-  mac_myri0: 00:60:DD:47:67:97
-  mac_eth0: 00:11:25:C4:35:76
-  mac_eth1: 00:11:25:C4:35:77
-  mac_bmc: 00:11:25:91:48:4D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.7.7
+    ip: 00:11:25:C4:35:76
+  eth1: 
+    mac: 172.24.134.7
+    ip: 00:11:25:C4:35:77
 gdx-156: 
-  mac_myri0: 00:60:DD:47:5A:BC
-  mac_eth0: 00:11:25:C4:0B:06
-  mac_eth1: 00:11:25:C4:0B:07
-  mac_bmc: 00:11:25:91:48:76
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.12
+    ip: 00:11:25:C4:0B:06
+  eth1: 
+    mac: 172.24.140.12
+    ip: 00:11:25:C4:0B:07
 gdx-183: 
-  mac_eth0: 00:11:25:C4:4F:5E
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4F:5F
-  mac_bmc: 00:11:25:91:47:91
-gdx-237: 
-  mac_myri0: 00:60:DD:47:89:CF
-  mac_eth0: 00:11:25:C4:3C:80
-  mac_eth1: 00:11:25:C4:3C:81
-  mac_bmc: 00:11:25:91:48:45
-gdx-264: 
-  mac_myri0: 00:60:DD:47:89:CA
-  mac_eth0: 00:11:25:C4:33:5E
-  mac_eth1: 00:11:25:C4:33:5F
-  mac_bmc: 00:11:25:91:48:14
-gdx-290: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:33:7C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:33:7D
-  mac_bmc: 00:11:25:91:48:A4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.3
+    ip: 00:11:25:C4:4F:5E
+  eth1: 
+    mac: 172.24.143.3
+    ip: 00:11:25:C4:4F:5F
+gdx-291: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.3
+    ip: 00:11:25:C4:33:1C
+  eth1: 
+    mac: 172.24.152.3
+    ip: 00:11:25:C4:33:1D
+gdx-265: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.13
+    ip: 00:11:25:C4:34:64
+  eth1: 
+    mac: 172.24.150.13
+    ip: 00:11:25:C4:34:65
+gdx-238: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.22
+    ip: 00:11:25:C4:3C:7E
+  eth1: 
+    mac: 172.24.147.22
+    ip: 00:11:25:C4:3C:7F
 gdx-157: 
-  mac_myri0: 00:60:DD:47:5A:B8
-  mac_eth0: 00:11:25:C4:52:CA
-  mac_eth1: 00:11:25:C4:52:CB
-  mac_bmc: 00:11:25:91:47:71
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.13
+    ip: 00:11:25:C4:52:CA
+  eth1: 
+    mac: 172.24.141.13
+    ip: 00:11:25:C4:52:CB
 gdx-184: 
-  mac_eth0: 00:11:25:C4:4E:08
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:09
-  mac_bmc: 00:11:25:91:46:3B
-gdx-238: 
-  mac_myri0: 00:60:DD:47:7D:7D
-  mac_eth0: 00:11:25:C4:3C:7E
-  mac_eth1: 00:11:25:C4:3C:7F
-  mac_bmc: 00:11:25:91:48:CF
-gdx-265: 
-  mac_eth0: 00:11:25:C4:34:64
-  mac_myri0: 00:60:DD:47:5A:1F
-  mac_eth1: 00:11:25:C4:34:65
-  mac_bmc: 00:11:25:91:46:36
-gdx-291: 
-  mac_myri0: 00:60:DD:47:C7:FA
-  mac_eth0: 00:11:25:C4:33:1C
-  mac_eth1: 00:11:25:C4:33:1D
-  mac_bmc: 00:11:25:91:47:77
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.4
+    ip: 00:11:25:C4:4E:08
+  eth1: 
+    mac: 172.24.143.4
+    ip: 00:11:25:C4:4E:09
+gdx-292: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.4
+    ip: 00:11:25:C4:33:88
+  eth1: 
+    mac: 172.24.152.4
+    ip: 00:11:25:C4:33:89
+gdx-239: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.23
+    ip: 00:11:25:C4:3F:50
+  eth1: 
+    mac: 172.24.147.23
+    ip: 00:11:25:C4:3F:51
 gdx-158: 
-  mac_myri0: 00:60:DD:47:5A:C2
-  mac_eth0: 00:11:25:C4:54:46
-  mac_eth1: 00:11:25:C4:54:47
-  mac_bmc: 00:11:25:91:46:B3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.14
+    ip: 00:11:25:C4:54:46
+  eth1: 
+    mac: 172.24.141.14
+    ip: 00:11:25:C4:54:47
 gdx-185: 
-  mac_eth0: 00:11:25:C4:53:B6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:53:B7
-  mac_bmc: 00:11:25:91:46:A0
-gdx-239: 
-  mac_myri0: 00:60:DD:47:7D:97
-  mac_eth0: 00:11:25:C4:3F:50
-  mac_eth1: 00:11:25:C4:3F:51
-  mac_bmc: 00:11:25:91:48:C1
-gdx-292: 
-  mac_myri0: 00:60:DD:47:C7:FF
-  mac_eth0: 00:11:25:C4:33:88
-  mac_eth1: 00:11:25:C4:33:89
-  mac_bmc: 00:11:25:91:46:19
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.5
+    ip: 00:11:25:C4:53:B6
+  eth1: 
+    mac: 172.24.143.5
+    ip: 00:11:25:C4:53:B7
+gdx-293: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.5
+    ip: 00:11:25:C4:33:4A
+  eth1: 
+    mac: 172.24.152.5
+    ip: 00:11:25:C4:33:4B
+gdx-266: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.14
+    ip: 00:11:25:C4:34:8A
+  eth1: 
+    mac: 172.24.150.14
+    ip: 00:11:25:C4:34:8B
 gdx-159: 
-  mac_myri0: 00:60:DD:47:5A:77
-  mac_eth0: 00:11:25:C4:4F:82
-  mac_eth1: 00:11:25:C4:4F:83
-  mac_bmc: 00:11:25:91:48:0D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.14.15
+    ip: 00:11:25:C4:4F:82
+  eth1: 
+    mac: 172.24.141.15
+    ip: 00:11:25:C4:4F:83
 gdx-186: 
-  mac_eth0: 00:11:25:C4:4E:48
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:49
-  mac_bmc: 00:11:25:91:47:F6
-gdx-266: 
-  mac_myri0: 00:60:DD:47:89:8B
-  mac_eth0: 00:11:25:C4:34:8A
-  mac_eth1: 00:11:25:C4:34:8B
-  mac_bmc: 00:11:25:91:46:60
-gdx-293: 
-  mac_myri0: 00:60:DD:47:89:13
-  mac_eth0: 00:11:25:C4:33:4A
-  mac_eth1: 00:11:25:C4:33:4B
-  mac_bmc: 00:11:25:91:43:D8
-gdx-187: 
-  mac_eth0: 00:11:25:C4:4E:70
-  mac_myri0: 00:60:DD:47:86:54
-  mac_eth1: 00:11:25:C4:4E:71
-  mac_bmc: 00:11:25:91:48:58
-gdx-267: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:35:36
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:37
-  mac_bmc: 00:11:25:91:45:AE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.6
+    ip: 00:11:25:C4:4E:48
+  eth1: 
+    mac: 172.24.143.6
+    ip: 00:11:25:C4:4E:49
 gdx-294: 
-  mac_myri0: 00:60:DD:47:89:78
-  mac_eth0: 00:11:25:C4:33:24
-  mac_eth1: 00:11:25:C4:33:25
-  mac_bmc: 00:11:25:91:47:EF
-gdx-188: 
-  mac_eth0: 00:11:25:C4:52:4E
-  mac_myri0: 00:60:DD:47:7C:63
-  mac_eth1: 00:11:25:C4:52:4F
-  mac_bmc: 00:11:25:91:47:30
-gdx-268: 
-  mac_myri0: 00:60:DD:47:89:C7
-  mac_eth0: 00:11:25:C4:34:4E
-  mac_eth1: 00:11:25:C4:34:4F
-  mac_bmc: 00:11:25:91:45:87
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.6
+    ip: 00:11:25:C4:33:24
+  eth1: 
+    mac: 172.24.152.6
+    ip: 00:11:25:C4:33:25
+gdx-267: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.15
+    ip: 00:11:25:C4:35:36
+  eth1: 
+    mac: 172.24.150.15
+    ip: 00:11:25:C4:35:37
+gdx-187: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.7
+    ip: 00:11:25:C4:4E:70
+  eth1: 
+    mac: 172.24.143.7
+    ip: 00:11:25:C4:4E:71
 gdx-295: 
-  mac_myri0: 00:60:DD:47:89:88
-  mac_eth0: 00:11:25:C4:33:7A
-  mac_eth1: 00:11:25:C4:33:7B
-  mac_bmc: 00:11:25:91:46:5A
-gdx-269: 
-  mac_myri0: 00:60:DD:47:89:C9
-  mac_eth0: 00:11:25:C4:33:0E
-  mac_eth1: 00:11:25:C4:33:0F
-  mac_bmc: 00:11:25:91:46:D0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.7
+    ip: 00:11:25:C4:33:7A
+  eth1: 
+    mac: 172.24.152.7
+    ip: 00:11:25:C4:33:7B
+gdx-268: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.16
+    ip: 00:11:25:C4:34:4E
+  eth1: 
+    mac: 172.24.150.16
+    ip: 00:11:25:C4:34:4F
+gdx-188: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.8
+    ip: 00:11:25:C4:52:4E
+  eth1: 
+    mac: 172.24.143.8
+    ip: 00:11:25:C4:52:4F
 gdx-296: 
-  mac_myri0: 00:60:DD:47:89:B1
-  mac_eth0: 00:11:25:C4:20:06
-  mac_eth1: 00:11:25:C4:20:07
-  mac_bmc: 00:11:25:91:47:AB
-gdx-189: 
-  mac_eth0: 00:11:25:C4:52:46
-  mac_myri0: 00:60:DD:47:86:57
-  mac_eth1: 00:11:25:C4:52:47
-  mac_bmc: 00:11:25:91:48:5F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.8
+    ip: 00:11:25:C4:20:06
+  eth1: 
+    mac: 172.24.152.8
+    ip: 00:11:25:C4:20:07
+gdx-269: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.23.17
+    ip: 00:11:25:C4:33:0E
+  eth1: 
+    mac: 172.24.150.17
+    ip: 00:11:25:C4:33:0F
 gdx-297: 
-  mac_myri0: 00:60:DD:47:89:85
-  mac_eth0: 00:11:25:C4:33:3C
-  mac_eth1: 00:11:25:C4:33:3D
-  mac_bmc: 00:11:25:91:47:D2
-gdx-30: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_myri0: 00:60:DD:47:65:DE
-  mac_eth0: 00:11:25:C4:35:2C
-  mac_eth1: 00:11:25:C4:35:2D
-  mac_bmc: 00:11:25:91:46:61
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.9
+    ip: 00:11:25:C4:33:3C
+  eth1: 
+    mac: 172.24.152.9
+    ip: 00:11:25:C4:33:3D
+gdx-189: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.16.9
+    ip: 00:11:25:C4:52:46
+  eth1: 
+    mac: 172.24.143.9
+    ip: 00:11:25:C4:52:47
 gdx-298: 
-  mac_myri0: 00:60:DD:47:89:95
-  mac_eth0: 00:11:25:C4:33:48
-  mac_eth1: 00:11:25:C4:33:49
-  mac_bmc: 00:11:25:91:46:8E
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.10
+    ip: 00:11:25:C4:33:48
+  eth1: 
+    mac: 172.24.152.10
+    ip: 00:11:25:C4:33:49
+gdx-30: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.30
+    ip: 00:11:25:C4:35:2C
+  eth1: 
+    mac: 172.24.130.30
+    ip: 00:11:25:C4:35:2D
 gdx-31: 
-  mac_myri0: 00:60:DD:47:59:69
-  mac_eth0: 00:11:25:C4:35:24
-  mac_eth1: 00:11:25:C4:35:25
-  mac_bmc: 00:11:25:91:45:C5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.31
+    ip: 00:11:25:C4:35:24
+  eth1: 
+    mac: 172.24.130.31
+    ip: 00:11:25:C4:35:25
+gdx-299: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.11
+    ip: 00:11:25:C4:33:46
+  eth1: 
+    mac: 172.24.152.11
+    ip: 00:11:25:C4:33:47
 gdx-32: 
-  mac_myri0: 00:60:DD:47:65:B7
-  mac_eth0: 00:11:25:C4:35:08
-  mac_eth1: 00:11:25:C4:35:09
-  mac_bmc: 00:11:25:91:49:3D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.32
+    ip: 00:11:25:C4:35:08
+  eth1: 
+    mac: 172.24.130.32
+    ip: 00:11:25:C4:35:09
 gdx-110: 
-  mac_eth0: 00:11:25:C4:51:A4
-  mac_myri0: 00:60:DD:47:5A:A7
-  mac_eth1: 00:11:25:C4:51:A5
-  mac_bmc: 00:11:25:91:45:DE
-gdx-299: 
-  mac_myri0: 00:60:DD:47:89:0E
-  mac_eth0: 00:11:25:C4:33:46
-  mac_eth1: 00:11:25:C4:33:47
-  mac_bmc: 00:11:25:91:47:0B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.2
+    ip: 00:11:25:C4:51:A4
+  eth1: 
+    mac: 172.24.137.2
+    ip: 00:11:25:C4:51:A5
 gdx-33: 
-  mac_myri0: 00:60:DD:47:5A:20
-  mac_eth0: 00:11:25:C4:34:70
-  mac_eth1: 00:11:25:C4:34:71
-  mac_bmc: 00:11:25:91:45:EB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.33
+    ip: 00:11:25:C4:34:70
+  eth1: 
+    mac: 172.24.130.33
+    ip: 00:11:25:C4:34:71
 gdx-111: 
-  mac_eth0: 00:11:25:C4:50:30
-  mac_myri0: 00:60:DD:47:65:C2
-  mac_eth1: 00:11:25:C4:50:31
-  mac_bmc: 00:11:25:91:46:7C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.3
+    ip: 00:11:25:C4:50:30
+  eth1: 
+    mac: 172.24.137.3
+    ip: 00:11:25:C4:50:31
 gdx-34: 
-  mac_myri0: 00:60:DD:47:5A:91
-  mac_eth0: 00:11:25:C4:33:8E
-  mac_eth1: 00:11:25:C4:33:8F
-  mac_bmc: 00:11:25:91:49:34
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.34
+    ip: 00:11:25:C4:33:8E
+  eth1: 
+    mac: 172.24.130.34
+    ip: 00:11:25:C4:33:8F
 gdx-60: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3E:2C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3E:2D
-  mac_bmc: 00:11:25:91:46:57
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.24
+    ip: 00:11:25:C4:3E:2C
+  eth1: 
+    mac: 172.24.132.24
+    ip: 00:11:25:C4:3E:2D
+gdx-300: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.12
+    ip: 00:11:25:C4:33:14
+  eth1: 
+    mac: 172.24.152.12
+    ip: 00:11:25:C4:33:15
 gdx-35: 
-  mac_myri0: 00:60:DD:47:65:BB
-  mac_eth0: 00:11:25:C4:34:7A
-  mac_eth1: 00:11:25:C4:34:7B
-  mac_bmc: 00:11:25:91:47:C5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.35
+    ip: 00:11:25:C4:34:7A
+  eth1: 
+    mac: 172.24.130.35
+    ip: 00:11:25:C4:34:7B
 gdx-61: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4E:10
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:11
-  mac_bmc: 00:11:25:91:48:B3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.25
+    ip: 00:11:25:C4:4E:10
+  eth1: 
+    mac: 172.24.133.25
+    ip: 00:11:25:C4:4E:11
 gdx-112: 
-  mac_eth0: 00:11:25:C4:4F:C6
-  mac_myri0: 00:60:DD:47:65:4F
-  mac_eth1: 00:11:25:C4:4F:C7
-  mac_bmc: 00:11:25:91:48:7F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.4
+    ip: 00:11:25:C4:4F:C6
+  eth1: 
+    mac: 172.24.137.4
+    ip: 00:11:25:C4:4F:C7
 gdx-220: 
-  mac_eth0: 00:11:25:C4:3C:6A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:6B
-  mac_bmc: 00:11:25:91:48:39
-gdx-300: 
-  mac_myri0: 00:60:DD:47:89:1B
-  mac_eth0: 00:11:25:C4:33:14
-  mac_eth1: 00:11:25:C4:33:15
-  mac_bmc: 00:11:25:91:45:A9
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.4
+    ip: 00:11:25:C4:3C:6A
+  eth1: 
+    mac: 172.24.146.4
+    ip: 00:11:25:C4:3C:6B
+gdx-301: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.13
+    ip: 00:11:25:C4:35:06
+  eth1: 
+    mac: 172.24.153.13
+    ip: 00:11:25:C4:35:07
 gdx-36: 
-  mac_myri0: 00:60:DD:47:5A:90
-  mac_eth0: 00:11:25:C4:33:56
-  mac_eth1: 00:11:25:C4:33:57
-  mac_bmc: 00:11:25:91:45:E7
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.36
+    ip: 00:11:25:C4:33:56
+  eth1: 
+    mac: 172.24.130.36
+    ip: 00:11:25:C4:33:57
 gdx-62: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3C:62
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:63
-  mac_bmc: 00:11:25:91:45:BB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.26
+    ip: 00:11:25:C4:3C:62
+  eth1: 
+    mac: 172.24.133.26
+    ip: 00:11:25:C4:3C:63
 gdx-113: 
-  mac_eth0: 00:11:25:C4:51:48
-  mac_myri0: 00:60:DD:47:5A:56
-  mac_eth1: 00:11:25:C4:51:49
-  mac_bmc: 00:11:25:91:45:9C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.5
+    ip: 00:11:25:C4:51:48
+  eth1: 
+    mac: 172.24.137.5
+    ip: 00:11:25:C4:51:49
 gdx-140: 
-  mac_myri0: 00:60:DD:47:59:62
-  mac_eth0: 00:11:25:C4:24:02
-  mac_eth1: 00:11:25:C4:24:03
-  mac_bmc: 00:11:25:91:48:32
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.32
+    ip: 00:11:25:C4:24:02
+  eth1: 
+    mac: 172.24.139.32
+    ip: 00:11:25:C4:24:03
 gdx-221: 
-  mac_eth0: 00:11:25:C4:3D:96
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3D:97
-  mac_bmc: 00:11:25:91:45:C3
-gdx-301: 
-  mac_myri0: 00:60:DD:47:89:93
-  mac_eth0: 00:11:25:C4:35:06
-  mac_eth1: 00:11:25:C4:35:07
-  mac_bmc: 00:11:25:91:45:C4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.5
+    ip: 00:11:25:C4:3D:96
+  eth1: 
+    mac: 172.24.146.5
+    ip: 00:11:25:C4:3D:97
+gdx-302: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.14
+    ip: 00:11:25:C4:34:42
+  eth1: 
+    mac: 172.24.153.14
+    ip: 00:11:25:C4:34:43
 gdx-63: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3B:B4
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3B:B5
-  mac_bmc: 00:11:25:91:45:B2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.27
+    ip: 00:11:25:C4:3B:B4
+  eth1: 
+    mac: 172.24.133.27
+    ip: 00:11:25:C4:3B:B5
 gdx-114: 
-  mac_eth0: 00:11:25:C4:53:00
-  mac_myri0: 00:60:DD:47:66:01
-  mac_eth1: 00:11:25:C4:53:01
-  mac_bmc: 00:11:25:91:47:AA
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.6
+    ip: 00:11:25:C4:53:00
+  eth1: 
+    mac: 172.24.137.6
+    ip: 00:11:25:C4:53:01
 gdx-141: 
-  mac_myri0: 00:60:DD:47:5A:B7
-  mac_eth0: 00:11:25:C4:3F:A8
-  mac_eth1: 00:11:25:C4:3F:A9
-  mac_bmc: 00:11:25:91:48:63
-gdx-302: 
-  mac_myri0: 00:60:DD:47:89:83
-  mac_eth0: 00:11:25:C4:34:42
-  mac_eth1: 00:11:25:C4:34:43
-  mac_bmc: 00:11:25:91:46:64
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.33
+    ip: 00:11:25:C4:3F:A8
+  eth1: 
+    mac: 172.24.139.33
+    ip: 00:11:25:C4:3F:A9
 gdx-37: 
-  mac_myri0: 00:60:DD:47:59:AA
-  mac_eth0: 00:11:25:C4:31:66
-  mac_eth1: 00:11:25:C4:31:67
-  mac_bmc: 00:11:25:91:48:3C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.1
+    ip: 00:11:25:C4:31:66
+  eth1: 
+    mac: 172.24.131.1
+    ip: 00:11:25:C4:31:67
+gdx-303: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.15
+    ip: 00:11:25:C4:0F:10
+  eth1: 
+    mac: 172.24.153.15
+    ip: 00:11:25:C4:0F:11
 gdx-64: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:39:86
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:39:87
-  mac_bmc: 00:11:25:91:45:AF
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.28
+    ip: 00:11:25:C4:39:86
+  eth1: 
+    mac: 172.24.133.28
+    ip: 00:11:25:C4:39:87
 gdx-90: 
-  mac_myri0: 00:60:DD:47:59:02
-  mac_eth0: 00:11:25:C4:51:02
-  mac_eth1: 00:11:25:C4:51:03
-  mac_bmc: 00:11:25:91:49:5A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.18
+    ip: 00:11:25:C4:51:02
+  eth1: 
+    mac: 172.24.135.18
+    ip: 00:11:25:C4:51:03
 gdx-115: 
-  mac_eth0: 00:11:25:C4:4E:44
-  mac_myri0: 00:60:DD:47:65:B9
-  mac_eth1: 00:11:25:C4:4E:45
-  mac_bmc: 00:11:25:91:48:5C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.7
+    ip: 00:11:25:C4:4E:44
+  eth1: 
+    mac: 172.24.137.7
+    ip: 00:11:25:C4:4E:45
 gdx-142: 
-  mac_myri0: 00:60:DD:47:59:B6
-  mac_eth0: 00:11:25:C4:4F:D8
-  mac_eth1: 00:11:25:C4:4F:D9
-  mac_bmc: 00:11:25:91:46:41
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.34
+    ip: 00:11:25:C4:4F:D8
+  eth1: 
+    mac: 172.24.139.34
+    ip: 00:11:25:C4:4F:D9
 gdx-222: 
-  mac_eth0: 00:11:25:C4:39:54
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:39:55
-  mac_bmc: 00:11:25:91:48:16
-gdx-303: 
-  mac_myri0: 00:60:DD:47:89:7D
-  mac_eth0: 00:11:25:C4:0F:10
-  mac_eth1: 00:11:25:C4:0F:11
-  mac_bmc: 00:11:25:91:45:9A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.6
+    ip: 00:11:25:C4:39:54
+  eth1: 
+    mac: 172.24.146.6
+    ip: 00:11:25:C4:39:55
 gdx-38: 
-  mac_myri0: 00:60:DD:47:59:B1
-  mac_eth0: 00:11:25:C4:34:6C
-  mac_eth1: 00:11:25:C4:34:6D
-  mac_bmc: 00:11:25:91:47:26
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.2
+    ip: 00:11:25:C4:34:6C
+  eth1: 
+    mac: 172.24.131.2
+    ip: 00:11:25:C4:34:6D
+gdx-304: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.16
+    ip: 00:11:25:C4:33:58
+  eth1: 
+    mac: 172.24.153.16
+    ip: 00:11:25:C4:33:59
+gdx-250: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.34
+    ip: 00:11:25:C4:3B:9A
+  eth1: 
+    mac: 172.24.148.34
+    ip: 00:11:25:C4:3B:9B
+gdx-223: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.7
+    ip: 00:11:25:C4:3C:14
+  eth1: 
+    mac: 172.24.146.7
+    ip: 00:11:25:C4:3C:15
 gdx-91: 
-  mac_eth0: 00:11:25:C4:51:4C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:51:4D
-  mac_bmc: 00:11:25:91:46:1C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.19
+    ip: 00:11:25:C4:51:4C
+  eth1: 
+    mac: 172.24.135.19
+    ip: 00:11:25:C4:51:4D
 gdx-116: 
-  mac_eth0: 00:11:25:C4:52:A2
-  mac_myri0: 00:60:DD:47:59:39
-  mac_eth1: 00:11:25:C4:52:A3
-  mac_bmc: 00:11:25:91:45:BA
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.8
+    ip: 00:11:25:C4:52:A2
+  eth1: 
+    mac: 172.24.137.8
+    ip: 00:11:25:C4:52:A3
 gdx-143: 
-  mac_myri0: 00:60:DD:47:5A:B9
-  mac_eth0: 00:11:25:C4:4F:AA
-  mac_eth1: 00:11:25:C4:4F:AB
-  mac_bmc: 00:11:25:91:48:33
-gdx-223: 
-  comments: "Stuck on the black screen with a blinking cursor on the screen top left corner."
-  mac_eth0: 00:11:25:C4:3C:14
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:15
-  mac_bmc: 00:11:25:91:48:A4
-gdx-250: 
-  mac_myri0: 00:60:DD:47:7B:FF
-  mac_eth0: 00:11:25:C4:3B:9A
-  mac_eth1: 00:11:25:C4:3B:9B
-  mac_bmc: 00:11:25:91:45:E8
-gdx-304: 
-  mac_myri0: 00:60:DD:47:89:8F
-  mac_eth0: 00:11:25:C4:33:58
-  mac_eth1: 00:11:25:C4:33:59
-  mac_bmc: 00:11:25:91:47:9C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.35
+    ip: 00:11:25:C4:4F:AA
+  eth1: 
+    mac: 172.24.139.35
+    ip: 00:11:25:C4:4F:AB
 gdx-39: 
-  mac_myri0: 00:60:DD:47:59:71
-  mac_eth0: 00:11:25:C4:34:4A
-  mac_eth1: 00:11:25:C4:34:4B
-  mac_bmc: 00:11:25:91:45:A8
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.4.3
+    ip: 00:11:25:C4:34:4A
+  eth1: 
+    mac: 172.24.131.3
+    ip: 00:11:25:C4:34:4B
 gdx-65: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:3C:4C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:4D
-  mac_bmc: 00:11:25:91:46:C0
-gdx-66: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:3B:E0
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3B:E1
-  mac_bmc: 00:11:25:91:46:E1
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.29
+    ip: 00:11:25:C4:3C:4C
+  eth1: 
+    mac: 172.24.133.29
+    ip: 00:11:25:C4:3C:4D
 gdx-305: 
-  mac_myri0: 00:60:DD:47:88:B0
-  mac_eth0: 00:11:25:C4:34:62
-  mac_eth1: 00:11:25:C4:34:63
-  mac_bmc: 00:11:25:91:46:5B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.17
+    ip: 00:11:25:C4:34:62
+  eth1: 
+    mac: 172.24.153.17
+    ip: 00:11:25:C4:34:63
 gdx-251: 
-  mac_myri0: 00:60:DD:47:88:6E
-  mac_eth0: 00:11:25:C4:3F:90
-  mac_eth1: 00:11:25:C4:3F:91
-  mac_bmc: 00:11:25:91:47:40
-gdx-144: 
-  comments: "Keeps restarting every 3 seconds."
-  mac_myri0: 00:60:DD:47:5A:92
-  mac_eth0: 00:11:25:C4:50:0E
-  mac_eth1: 00:11:25:C4:50:0F
-  mac_bmc: 00:11:25:91:45:A6
-gdx-117: 
-  mac_eth0: 00:11:25:C4:52:EC
-  mac_myri0: 00:60:DD:47:65:BC
-  mac_eth1: 00:11:25:C4:52:ED
-  mac_bmc: 00:11:25:91:45:94
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.35
+    ip: 00:11:25:C4:3F:90
+  eth1: 
+    mac: 172.24.148.35
+    ip: 00:11:25:C4:3F:91
+gdx-224: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.8
+    ip: 00:11:25:C4:39:00
+  eth1: 
+    mac: 172.24.146.8
+    ip: 00:11:25:C4:39:01
 gdx-92: 
-  mac_eth0: 00:11:25:C4:4D:82
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4D:83
-  mac_bmc: 00:11:25:91:46:4D
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.20
+    ip: 00:11:25:C4:4D:82
+  eth1: 
+    mac: 172.24.135.20
+    ip: 00:11:25:C4:4D:83
+gdx-117: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.9
+    ip: 00:11:25:C4:52:EC
+  eth1: 
+    mac: 172.24.137.9
+    ip: 00:11:25:C4:52:ED
+gdx-144: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.12.36
+    ip: 00:11:25:C4:50:0E
+  eth1: 
+    mac: 172.24.139.36
+    ip: 00:11:25:C4:50:0F
 gdx-170: 
-  mac_eth0: 00:11:25:C4:4D:00
-  mac_myri0: 00:60:DD:47:59:66
-  mac_eth1: 00:11:25:C4:4D:01
-  mac_bmc: 00:11:25:91:48:3D
-gdx-224: 
-  mac_eth0: 00:11:25:C4:39:00
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:39:01
-  mac_bmc: 00:11:25:91:46:7E
-gdx-93: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4F:A6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4F:A7
-  mac_bmc: 00:11:25:91:48:2F
-gdx-67: 
-  comments: "Unexisting or detroyed nodes"
-  mac_eth0: 00:11:25:C4:35:66
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:67
-  mac_bmc: 00:11:25:91:47:09
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.26
+    ip: 00:11:25:C4:4D:00
+  eth1: 
+    mac: 172.24.142.26
+    ip: 00:11:25:C4:4D:01
+gdx-66: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.30
+    ip: 00:11:25:C4:3B:E0
+  eth1: 
+    mac: 172.24.133.30
+    ip: 00:11:25:C4:3B:E1
 gdx-306: 
-  mac_myri0: 00:60:DD:47:89:96
-  mac_eth0: 00:11:25:C4:41:5A
-  mac_eth1: 00:11:25:C4:41:5B
-  mac_bmc: 00:11:25:91:46:35
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.18
+    ip: 00:11:25:C4:41:5A
+  eth1: 
+    mac: 172.24.153.18
+    ip: 00:11:25:C4:41:5B
 gdx-252: 
-  mac_myri0: 00:60:DD:47:7C:65
-  mac_eth0: 00:11:25:C4:32:5A
-  mac_eth1: 00:11:25:C4:32:5B
-  mac_bmc: 00:11:25:91:48:28
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.21.36
+    ip: 00:11:25:C4:32:5A
+  eth1: 
+    mac: 172.24.148.36
+    ip: 00:11:25:C4:32:5B
+gdx-225: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.9
+    ip: 00:11:25:C4:38:D0
+  eth1: 
+    mac: 172.24.146.9
+    ip: 00:11:25:C4:38:D1
 gdx-118: 
-  mac_eth0: 00:11:25:C4:53:EA
-  mac_myri0: 00:60:DD:47:66:1B
-  mac_eth1: 00:11:25:C4:53:EB
-  mac_bmc: 00:11:25:91:48:5B
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.10
+    ip: 00:11:25:C4:53:EA
+  eth1: 
+    mac: 172.24.137.10
+    ip: 00:11:25:C4:53:EB
 gdx-171: 
-  mac_eth0: 00:11:25:C4:4D:08
-  mac_myri0: 00:60:DD:47:65:A9
-  mac_eth1: 00:11:25:C4:4D:09
-  mac_bmc: 00:11:25:91:45:FC
-gdx-225: 
-  mac_eth0: 00:11:25:C4:38:D0
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:38:D1
-  mac_bmc: 00:11:25:91:46:AE
-gdx-119: 
-  mac_eth0: 00:11:25:C4:51:AC
-  mac_myri0: 00:60:DD:47:65:C1
-  mac_eth1: 00:11:25:C4:51:AD
-  mac_bmc: 00:11:25:91:46:15
-gdx-94: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:53:FC
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:53:FD
-  mac_bmc: 00:11:25:91:48:05
-gdx-68: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:3C:18
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:19
-  mac_bmc: 00:11:25:91:48:9E
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.27
+    ip: 00:11:25:C4:4D:08
+  eth1: 
+    mac: 172.24.142.27
+    ip: 00:11:25:C4:4D:09
+gdx-67: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.31
+    ip: 00:11:25:C4:35:66
+  eth1: 
+    mac: 172.24.133.31
+    ip: 00:11:25:C4:35:67
+gdx-93: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.21
+    ip: 00:11:25:C4:4F:A6
+  eth1: 
+    mac: 172.24.135.21
+    ip: 00:11:25:C4:4F:A7
+gdx-307: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.19
+    ip: 00:11:25:C4:33:4C
+  eth1: 
+    mac: 172.24.153.19
+    ip: 00:11:25:C4:33:4D
 gdx-253: 
-  mac_myri0: 00:60:DD:47:C7:FB
-  mac_eth0: 00:11:25:C4:34:68
-  mac_eth1: 00:11:25:C4:34:69
-  mac_bmc: 00:11:25:91:47:CC
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.1
+    ip: 00:11:25:C4:34:68
+  eth1: 
+    mac: 172.24.149.1
+    ip: 00:11:25:C4:34:69
+gdx-226: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.10
+    ip: 00:11:25:C4:38:F6
+  eth1: 
+    mac: 172.24.146.10
+    ip: 00:11:25:C4:38:F7
 gdx-145: 
-  mac_myri0: 00:60:DD:47:68:7B
-  mac_eth0: 00:11:25:C4:50:20
-  mac_eth1: 00:11:25:C4:50:21
-  mac_bmc: 00:11:25:91:45:AD
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.1
+    ip: 00:11:25:C4:50:20
+  eth1: 
+    mac: 172.24.140.1
+    ip: 00:11:25:C4:50:21
 gdx-172: 
-  mac_eth0: 00:11:25:C4:54:18
-  mac_myri0: 00:60:DD:47:65:BF
-  mac_eth1: 00:11:25:C4:54:19
-  mac_bmc: 00:11:25:91:45:92
-gdx-226: 
-  mac_eth0: 00:11:25:C4:38:F6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:38:F7
-  mac_bmc: 00:11:25:91:48:35
-gdx-307: 
-  mac_eth0: 00:11:25:C4:33:4C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:33:4D
-  mac_bmc: 00:11:25:91:46:FE
-gdx-95: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4F:30
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4F:31
-  mac_bmc: 00:11:25:91:45:F7
-gdx-69: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:34:82
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:34:83
-  mac_bmc: 00:11:25:91:47:B3
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.28
+    ip: 00:11:25:C4:54:18
+  eth1: 
+    mac: 172.24.142.28
+    ip: 00:11:25:C4:54:19
+gdx-68: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.32
+    ip: 00:11:25:C4:3C:18
+  eth1: 
+    mac: 172.24.133.32
+    ip: 00:11:25:C4:3C:19
+gdx-94: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.22
+    ip: 00:11:25:C4:53:FC
+  eth1: 
+    mac: 172.24.135.22
+    ip: 00:11:25:C4:53:FD
+gdx-119: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.10.11
+    ip: 00:11:25:C4:51:AC
+  eth1: 
+    mac: 172.24.137.11
+    ip: 00:11:25:C4:51:AD
+gdx-308: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.20
+    ip: 00:11:25:C4:32:6A
+  eth1: 
+    mac: 172.24.153.20
+    ip: 00:11:25:C4:32:6B
 gdx-280: 
-  mac_myri0: 00:60:DD:47:C7:FC
-  mac_eth0: 00:11:25:C4:33:20
-  mac_eth1: 00:11:25:C4:33:21
-  mac_bmc: 00:11:25:91:46:92
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.28
+    ip: 00:11:25:C4:33:20
+  eth1: 
+    mac: 172.24.151.28
+    ip: 00:11:25:C4:33:21
 gdx-254: 
-  mac_myri0: 00:60:DD:47:C7:FE
-  mac_eth0: 00:11:25:C4:35:B8
-  mac_eth1: 00:11:25:C4:35:B9
-  mac_bmc: 00:11:25:91:46:C7
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.2
+    ip: 00:11:25:C4:35:B8
+  eth1: 
+    mac: 172.24.149.2
+    ip: 00:11:25:C4:35:B9
+gdx-227: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: "chang\xC3\xA9e"
+  eth1: 
+    mac: 172.24.146.11
+    ip: 00:11:25:C4:39:8F
 gdx-146: 
-  mac_myri0: 00:60:DD:47:5A:73
-  mac_eth0: 00:11:25:C4:4D:4C
-  mac_eth1: 00:11:25:C4:4D:4D
-  mac_bmc: 00:11:25:91:46:B4
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.2
+    ip: 00:11:25:C4:4D:4C
+  eth1: 
+    mac: 172.24.140.2
+    ip: 00:11:25:C4:4D:4D
 gdx-173: 
-  mac_eth0: 00:11:25:C4:51:DA
-  mac_myri0: 00:60:DD:47:65:C3
-  mac_eth1: 00:11:25:C4:51:DB
-  mac_bmc: 00:11:25:91:45:EA
-gdx-227: 
-  mac_eth0: 00:11:25:C4:34:52
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:39:8F
-  mac_bmc: 00:14:5E:65:C6:4A
-gdx-308: 
-  comments: "Freezes on the very first boot screen. Not even possible to enter BIOS settings menu."
-  mac_eth0: 00:11:25:C4:32:6A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:32:6B
-  mac_bmc: 00:11:25:91:46:66
-gdx-147: 
-  mac_myri0: 00:60:DD:47:59:79
-  mac_eth0: 00:11:25:C4:4D:FE
-  mac_eth1: 00:11:25:C4:4D:FF
-  mac_bmc: 00:11:25:91:47:22
-gdx-96: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:50:A6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:50:A7
-  mac_bmc: 00:11:25:91:45:EE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.29
+    ip: 00:11:25:C4:51:DA
+  eth1: 
+    mac: 172.24.142.29
+    ip: 00:11:25:C4:51:DB
+gdx-69: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.6.33
+    ip: 00:11:25:C4:34:82
+  eth1: 
+    mac: 172.24.133.33
+    ip: 00:11:25:C4:34:83
+gdx-95: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.23
+    ip: 00:11:25:C4:4F:30
+  eth1: 
+    mac: 172.24.135.23
+    ip: 00:11:25:C4:4F:31
+gdx-309: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.26.21
+    ip: 00:11:25:C4:33:30
+  eth1: 
+    mac: 172.24.153.21
+    ip: 00:11:25:C4:33:31
 gdx-281: 
-  mac_myri0: 00:60:DD:47:C7:7D
-  mac_eth0: 00:11:25:C4:33:18
-  mac_eth1: 00:11:25:C4:33:19
-  mac_bmc: 00:11:25:91:45:7F
-gdx-174: 
-  mac_eth0: 00:11:25:C4:4F:46
-  mac_myri0: 00:60:DD:47:65:A8
-  mac_eth1: 00:11:25:C4:4F:47
-  mac_bmc: 00:11:25:91:45:FA
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.29
+    ip: 00:11:25:C4:33:18
+  eth1: 
+    mac: 172.24.151.29
+    ip: 00:11:25:C4:33:19
 gdx-228: 
-  mac_eth0: 00:11:25:C4:32:A6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:32:A7
-  mac_bmc: 00:11:25:91:46:0C
-gdx-309: 
-  mac_eth0: 00:11:25:C4:33:30
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:33:31
-  mac_bmc: 00:11:25:91:45:F6
-gdx-148: 
-  mac_myri0: 00:60:DD:47:5A:79
-  mac_eth0: 00:11:25:C4:51:06
-  mac_eth1: 00:11:25:C4:51:07
-  mac_bmc: 00:11:25:91:47:FC
-gdx-97: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4F:06
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4F:07
-  mac_bmc: 00:11:25:91:45:7A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.19.12
+    ip: 00:11:25:C4:32:A6
+  eth1: 
+    mac: 172.24.146.12
+    ip: 00:11:25:C4:32:A7
+gdx-174: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.30
+    ip: 00:11:25:C4:4F:46
+  eth1: 
+    mac: 172.24.142.30
+    ip: 00:11:25:C4:4F:47
+gdx-96: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.8.24
+    ip: 00:11:25:C4:50:A6
+  eth1: 
+    mac: 172.24.135.24
+    ip: 00:11:25:C4:50:A7
+gdx-147: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.3
+    ip: 00:11:25:C4:4D:FE
+  eth1: 
+    mac: 172.24.140.3
+    ip: 00:11:25:C4:4D:FF
 gdx-282: 
-  mac_myri0: 00:60:DD:47:89:1C
-  mac_eth0: 00:11:25:C4:31:44
-  mac_eth1: 00:11:25:C4:31:45
-  mac_bmc: 00:11:25:91:47:11
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.30
+    ip: 00:11:25:C4:31:44
+  eth1: 
+    mac: 172.24.151.30
+    ip: 00:11:25:C4:31:45
 gdx-255: 
-  mac_myri0: 00:60:DD:47:7C:E1
-  mac_eth0: 00:11:25:C4:09:86
-  mac_eth1: 00:11:25:C4:09:87
-  mac_bmc: 00:11:25:91:48:BC
-gdx-175: 
-  mac_eth0: 00:11:25:C4:4F:AC
-  mac_myri0: 00:60:DD:47:65:BA
-  mac_eth1: 00:11:25:C4:4F:AD
-  mac_bmc: 00:11:25:91:48:EB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: "{"
+    ip: "chang\xC3\xA9e"
+  eth1: 
+    mac: 172.24.149.3
+    ip: 00:11:25:C4:33:05
 gdx-229: 
-  mac_eth0: 00:11:25:C4:3C:76
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3C:77
-  mac_bmc: 00:11:25:91:45:8A
-gdx-149: 
-  mac_myri0: 00:60:DD:47:5A:C1
-  mac_eth0: 00:11:25:C4:4F:C0
-  mac_eth1: 00:11:25:C4:4F:C1
-  mac_bmc: 00:11:25:91:46:2C
-gdx-98: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4E:1A
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4E:1B
-  mac_bmc: 00:11:25:91:47:BB
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.20.13
+    ip: 00:11:25:C4:3C:76
+  eth1: 
+    mac: 172.24.147.13
+    ip: 00:11:25:C4:3C:77
+gdx-175: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.31
+    ip: 00:11:25:C4:4F:AC
+  eth1: 
+    mac: 172.24.142.31
+    ip: 00:11:25:C4:4F:AD
+gdx-97: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.25
+    ip: 00:11:25:C4:4F:06
+  eth1: 
+    mac: 172.24.136.25
+    ip: 00:11:25:C4:4F:07
+gdx-148: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.4
+    ip: 00:11:25:C4:51:06
+  eth1: 
+    mac: 172.24.140.4
+    ip: 00:11:25:C4:51:07
 gdx-283: 
-  mac_myri0: 00:60:DD:47:89:86
-  mac_eth0: 00:11:25:C4:34:5E
-  mac_eth1: 00:11:25:C4:34:5F
-  mac_bmc: 00:11:25:91:45:9E
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.31
+    ip: 00:11:25:C4:34:5E
+  eth1: 
+    mac: 172.24.151.31
+    ip: 00:11:25:C4:34:5F
 gdx-256: 
-  mac_myri0: 00:60:DD:47:88:FA
-  mac_eth0: 00:11:25:C4:35:90
-  mac_eth1: 00:11:25:C4:35:91
-  mac_bmc: 00:11:25:91:47:F0
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.4
+    ip: 00:11:25:C4:35:90
+  eth1: 
+    mac: 172.24.149.4
+    ip: 00:11:25:C4:35:91
+gdx-98: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.26
+    ip: 00:11:25:C4:4E:1A
+  eth1: 
+    mac: 172.24.136.26
+    ip: 00:11:25:C4:4E:1B
+gdx-149: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.13.5
+    ip: 00:11:25:C4:4F:C0
+  eth1: 
+    mac: 172.24.140.5
+    ip: 00:11:25:C4:4F:C1
 gdx-176: 
-  mac_eth0: 00:11:25:C4:4F:CA
-  mac_myri0: 00:60:DD:47:66:03
-  mac_eth1: 00:11:25:C4:4F:CB
-  mac_bmc: 00:11:25:91:48:EA
-gdx-99: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:4F:3E
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:4F:3F
-  mac_bmc: 00:11:25:91:45:C2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.32
+    ip: 00:11:25:C4:4F:CA
+  eth1: 
+    mac: 172.24.142.32
+    ip: 00:11:25:C4:4F:CB
+gdx-284: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.32
+    ip: 00:11:25:C4:49:DE
+  eth1: 
+    mac: 172.24.151.32
+    ip: 00:11:25:C4:49:DF
 gdx-257: 
-  mac_myri0: 00:60:DD:47:C7:F6
-  mac_eth0: 00:11:25:C4:35:62
-  mac_eth1: 00:11:25:C4:35:63
-  mac_bmc: 00:11:25:91:47:E2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.5
+    ip: 00:11:25:C4:35:62
+  eth1: 
+    mac: 172.24.149.5
+    ip: 00:11:25:C4:35:63
+gdx-99: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.27
+    ip: 00:11:25:C4:4F:3E
+  eth1: 
+    mac: 172.24.136.27
+    ip: 00:11:25:C4:4F:3F
 gdx-177: 
-  mac_eth0: 00:11:25:C4:4F:C4
-  mac_myri0: 00:60:DD:47:66:04
-  mac_eth1: 00:11:25:C4:4F:C5
-  mac_bmc: 00:11:25:91:47:8B
-gdx-284: 
-  mac_eth0: 00:11:25:C4:49:DE
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:49:DF
-  mac_bmc: 00:11:25:91:45:A2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.33
+    ip: 00:11:25:C4:4F:C4
+  eth1: 
+    mac: 172.24.142.33
+    ip: 00:11:25:C4:4F:C5
 gdx-285: 
-  mac_myri0: 00:60:DD:47:89:CC
-  mac_eth0: 00:11:25:C4:35:BE
-  mac_eth1: 00:11:25:C4:35:BF
-  mac_bmc: 00:11:25:91:48:CE
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.33
+    ip: 00:11:25:C4:35:BE
+  eth1: 
+    mac: 172.24.151.33
+    ip: 00:11:25:C4:35:BF
 gdx-258: 
-  mac_myri0: 00:60:DD:47:7D:7F
-  mac_eth0: 00:11:25:C4:13:1A
-  mac_eth1: 00:11:25:C4:13:1B
-  mac_bmc: 00:11:25:91:47:7C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.6
+    ip: 00:11:25:C4:13:1A
+  eth1: 
+    mac: 172.24.149.6
+    ip: 00:11:25:C4:13:1B
 gdx-286: 
-  mac_myri0: 00:60:DD:47:89:C2
-  mac_eth0: 00:11:25:C4:2A:C2
-  mac_eth1: 00:11:25:C4:2A:C3
-  mac_bmc: 00:11:25:91:45:DA
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.34
+    ip: 00:11:25:C4:2A:C2
+  eth1: 
+    mac: 172.24.151.34
+    ip: 00:11:25:C4:2A:C3
 gdx-259: 
-  mac_myri0: 00:60:DD:47:88:FF
-  mac_eth0: 00:11:25:C4:35:6A
-  mac_eth1: 00:11:25:C4:35:6B
-  mac_bmc: 00:11:25:91:49:15
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.22.7
+    ip: 00:11:25:C4:35:6A
+  eth1: 
+    mac: 172.24.149.7
+    ip: 00:11:25:C4:35:6B
 gdx-178: 
-  mac_eth0: 00:11:25:C4:50:0A
-  mac_myri0: 00:60:DD:47:65:D8
-  mac_eth1: 00:11:25:C4:50:0B
-  mac_bmc: 00:11:25:91:45:C7
-gdx-1: 
-  mac_myri0: 00:60:DD:47:5A:A4
-  mac_eth0: 00:11:25:C4:35:7E
-  mac_eth1: 00:11:25:C4:35:7F
-  mac_bmc: 00:11:25:91:47:F2
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.34
+    ip: 00:11:25:C4:50:0A
+  eth1: 
+    mac: 172.24.142.34
+    ip: 00:11:25:C4:50:0B
 gdx-287: 
-  mac_myri0: 00:60:DD:47:89:C6
-  mac_eth0: 00:11:25:C4:34:40
-  mac_eth1: 00:11:25:C4:34:41
-  mac_bmc: 00:11:25:91:46:33
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.35
+    ip: 00:11:25:C4:34:40
+  eth1: 
+    mac: 172.24.151.35
+    ip: 00:11:25:C4:34:41
+gdx-1: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.1
+    ip: 00:11:25:C4:35:7E
+  eth1: 
+    mac: 172.24.128.1
+    ip: 00:11:25:C4:35:7F
 gdx-179: 
-  mac_eth0: 00:11:25:C4:50:76
-  mac_myri0: 00:60:DD:47:65:B4
-  mac_eth1: 00:11:25:C4:50:77
-  mac_bmc: 00:11:25:91:46:14
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.15.35
+    ip: 00:11:25:C4:50:76
+  eth1: 
+    mac: 172.24.142.35
+    ip: 00:11:25:C4:50:77
 gdx-20: 
-  mac_myri0: 00:60:DD:47:88:F7
-  mac_eth0: 00:11:25:C4:35:52
-  mac_eth1: 00:11:25:C4:35:53
-  mac_bmc: 00:11:25:91:45:7C
-gdx-21: 
-  mac_eth0: 00:11:25:C4:35:A8
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:A9
-  mac_bmc: 00:11:25:91:47:F8
-gdx-2: 
-  mac_myri0: 00:60:DD:47:59:75
-  mac_eth0: 00:11:25:C4:35:56
-  mac_eth1: 00:11:25:C4:35:57
-  mac_bmc: 00:11:25:91:48:A7
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.20
+    ip: 00:11:25:C4:35:52
+  eth1: 
+    mac: 172.24.129.20
+    ip: 00:11:25:C4:35:53
 gdx-288: 
-  mac_myri0: 00:60:DD:47:89:CD
-  mac_eth0: 00:11:25:C4:34:66
-  mac_eth1: 00:11:25:C4:34:67
-  mac_bmc: 00:11:25:91:46:58
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.24.36
+    ip: 00:11:25:C4:34:66
+  eth1: 
+    mac: 172.24.151.36
+    ip: 00:11:25:C4:34:67
+gdx-2: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.2
+    ip: 00:11:25:C4:35:56
+  eth1: 
+    mac: 172.24.128.2
+    ip: 00:11:25:C4:35:57
+gdx-21: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.21
+    ip: 00:11:25:C4:35:A8
+  eth1: 
+    mac: 172.24.129.21
+    ip: 00:11:25:C4:35:A9
 gdx-289: 
-  mac_myri0: 00:60:DD:47:89:1D
-  mac_eth0: 00:11:25:C4:33:68
-  mac_eth1: 00:11:25:C4:33:69
-  mac_bmc: 00:11:25:91:48:22
-gdx-100: 
-  mac_myri0: 00:60:DD:47:5A:8B
-  mac_eth0: 00:11:25:C4:4E:BE
-  mac_eth1: 00:11:25:C4:4E:BF
-  mac_bmc: 00:11:25:91:48:B7
-gdx-22: 
-  mac_myri0: 00:60:DD:47:5A:A2
-  mac_eth0: 00:11:25:C4:34:5A
-  mac_eth1: 00:11:25:C4:34:5B
-  mac_bmc: 00:11:25:91:49:2A
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.25.1
+    ip: 00:11:25:C4:33:68
+  eth1: 
+    mac: 172.24.152.1
+    ip: 00:11:25:C4:33:69
 gdx-3: 
-  mac_myri0: 00:60:DD:47:59:76
-  mac_eth0: 00:11:25:C4:35:3A
-  mac_eth1: 00:11:25:C4:35:3B
-  mac_bmc: 00:11:25:91:47:3B
-gdx-23: 
-  mac_myri0: 00:60:DD:47:5A:8F
-  mac_eth0: 00:11:25:C4:34:EA
-  mac_eth1: 00:11:25:C4:34:EB
-  mac_bmc: 00:11:25:91:46:B7
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.3
+    ip: 00:11:25:C4:35:3A
+  eth1: 
+    mac: 172.24.128.3
+    ip: 00:11:25:C4:35:3B
+gdx-22: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.22
+    ip: 00:11:25:C4:34:5A
+  eth1: 
+    mac: 172.24.129.22
+    ip: 00:11:25:C4:34:5B
+gdx-100: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.28
+    ip: 00:11:25:C4:4E:BE
+  eth1: 
+    mac: 172.24.136.28
+    ip: 00:11:25:C4:4E:BF
 gdx-4: 
-  mac_myri0: 00:60:DD:47:59:74
-  mac_eth0: 00:11:25:C4:35:40
-  mac_eth1: 00:11:25:C4:35:41
-  mac_bmc: 00:11:25:91:49:63
-gdx-101: 
-  mac_myri0: 00:60:DD:47:67:8C
-  mac_eth0: 00:11:25:C4:51:8C
-  mac_eth1: 00:11:25:C4:51:8D
-  mac_bmc: 00:11:25:91:45:DF
-gdx-50: 
-  mac_myri0: 00:60:DD:47:67:92
-  mac_eth0: 00:11:25:C4:33:92
-  mac_eth1: 00:11:25:C4:33:93
-  mac_bmc: 00:11:25:91:49:3C
-gdx-24: 
-  mac_myri0: 00:60:DD:47:5A:57
-  mac_eth0: 00:11:25:C4:34:50
-  mac_eth1: 00:11:25:C4:34:51
-  mac_bmc: 00:11:25:91:47:39
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.4
+    ip: 00:11:25:C4:35:40
+  eth1: 
+    mac: 172.24.128.4
+    ip: 00:11:25:C4:35:41
+gdx-23: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.23
+    ip: 00:11:25:C4:34:EA
+  eth1: 
+    mac: 172.24.129.23
+    ip: 00:11:25:C4:34:EB
 gdx-5: 
-  mac_myri0: 00:60:DD:47:59:68
-  mac_eth0: 00:11:25:C4:33:52
-  mac_eth1: 00:11:25:C4:33:53
-  mac_bmc: 00:11:25:91:47:B0
-gdx-102: 
-  mac_myri0: 00:60:DD:47:68:44
-  mac_eth0: 00:11:25:C4:4E:DE
-  mac_eth1: 00:11:25:C4:4E:DF
-  mac_bmc: 00:11:25:91:49:61
-gdx-51: 
-  mac_myri0: 00:60:DD:47:5A:8D
-  mac_eth0: 00:11:25:C4:49:8E
-  mac_eth1: 00:11:25:C4:49:8F
-  mac_bmc: 00:11:25:91:45:C1
-gdx-25: 
-  mac_eth0: 00:11:25:C4:35:1C
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:1D
-  mac_bmc: 00:11:25:91:47:A1
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.5
+    ip: 00:11:25:C4:33:52
+  eth1: 
+    mac: 172.24.128.5
+    ip: 00:11:25:C4:33:53
+gdx-24: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.2.24
+    ip: 00:11:25:C4:34:50
+  eth1: 
+    mac: 172.24.129.24
+    ip: 00:11:25:C4:34:51
+gdx-50: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.14
+    ip: 00:11:25:C4:33:92
+  eth1: 
+    mac: 172.24.132.14
+    ip: 00:11:25:C4:33:93
+gdx-101: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.29
+    ip: 00:11:25:C4:51:8C
+  eth1: 
+    mac: 172.24.136.29
+    ip: 00:11:25:C4:51:8D
 gdx-6: 
-  mac_myri0: 00:60:DD:47:59:77
-  mac_eth0: 00:11:25:C4:35:1E
-  mac_eth1: 00:11:25:C4:35:1F
-  mac_bmc: 00:11:25:91:48:17
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.6
+    ip: 00:11:25:C4:35:1E
+  eth1: 
+    mac: 172.24.128.6
+    ip: 00:11:25:C4:35:1F
+gdx-25: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.25
+    ip: 00:11:25:C4:35:1C
+  eth1: 
+    mac: 172.24.130.25
+    ip: 00:11:25:C4:35:1D
+gdx-51: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.15
+    ip: 00:11:25:C4:49:8E
+  eth1: 
+    mac: 172.24.132.15
+    ip: 00:11:25:C4:49:8F
+gdx-102: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.30
+    ip: 00:11:25:C4:4E:DE
+  eth1: 
+    mac: 172.24.136.30
+    ip: 00:11:25:C4:4E:DF
 gdx-210: 
-  mac_eth0: 00:11:25:C4:4E:94
-  mac_myri0: 00:60:DD:47:89:D0
-  mac_eth1: 00:11:25:C4:4E:95
-  mac_bmc: 00:11:25:91:45:AA
-gdx-130: 
-  mac_myri0: 00:60:DD:47:59:FD
-  mac_eth0: 00:11:25:C4:54:6A
-  mac_eth1: 00:11:25:C4:54:6B
-  mac_bmc: 00:11:25:91:45:A5
-gdx-103: 
-  mac_myri0: 00:60:DD:47:67:8B
-  mac_eth0: 00:11:25:C4:4E:FC
-  mac_eth1: 00:11:25:C4:4E:FD
-  mac_bmc: 00:11:25:91:46:1D
-gdx-52: 
-  mac_myri0: 00:60:DD:47:5A:7C
-  mac_eth0: 00:11:25:C4:35:97
-  mac_eth1: 00:11:25:C4:35:98
-  mac_bmc: 00:11:25:91:47:21
-gdx-26: 
-  mac_myri0: 00:60:DD:47:5A:59
-  mac_eth0: 00:11:25:C4:35:A4
-  mac_eth1: 00:11:25:C4:35:A5
-  mac_bmc: 00:11:25:91:48:A5
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.30
+    ip: 00:11:25:C4:4E:94
+  eth1: 
+    mac: 172.24.145.30
+    ip: 00:11:25:C4:4E:95
 gdx-7: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:35:92
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:93
-  mac_bmc: 00:11:25:91:46:05
-gdx-131: 
-  mac_myri0: 00:60:DD:47:59:6B
-  mac_eth0: 00:11:25:C4:54:86
-  mac_eth1: 00:11:25:C4:54:87
-  mac_bmc: 00:11:25:91:46:AA
-gdx-104: 
-  mac_myri0: 00:60:DD:47:67:8E
-  mac_eth0: 00:11:25:C4:52:4A
-  mac_eth1: 00:11:25:C4:52:4B
-  mac_bmc: 00:11:25:91:47:78
-gdx-53: 
-  comments: "Stuck on the black screen with a blinking cursor on the screen top left corner."
-  mac_eth0: 00:11:25:C4:3B:F6
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:3B:F7
-  mac_bmc: 00:11:25:91:47:B1
-gdx-27: 
-  mac_myri0: 00:60:DD:47:59:33
-  mac_eth0: 00:11:25:C4:31:4E
-  mac_eth1: 00:11:25:C4:31:4F
-  mac_bmc: 00:11:25:91:49:1C
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.7
+    ip: 00:11:25:C4:35:92
+  eth1: 
+    mac: 172.24.128.7
+    ip: 00:11:25:C4:35:93
+gdx-26: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.26
+    ip: 00:11:25:C4:35:A4
+  eth1: 
+    mac: 172.24.130.26
+    ip: 00:11:25:C4:35:A5
+gdx-52: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.16
+    ip: 00:11:25:C4:35:97
+  eth1: 
+    mac: 172.24.132.16
+    ip: 00:11:25:C4:35:98
+gdx-103: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.31
+    ip: 00:11:25:C4:4E:FC
+  eth1: 
+    mac: 172.24.136.31
+    ip: 00:11:25:C4:4E:FD
+gdx-130: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.22
+    ip: 00:11:25:C4:54:6A
+  eth1: 
+    mac: 172.24.138.22
+    ip: 00:11:25:C4:54:6B
 gdx-8: 
-  comments: "Hard disks not detected at boot, turned to dead."
-  mac_eth0: 00:11:25:C4:35:C2
-  mac_myri0: nil
-  mac_eth1: 00:11:25:C4:35:C3
-  mac_bmc: 00:11:25:91:46:3F
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.1.8
+    ip: 00:11:25:C4:35:C2
+  eth1: 
+    mac: 172.24.128.8
+    ip: 00:11:25:C4:35:C3
+gdx-27: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.3.27
+    ip: 00:11:25:C4:31:4E
+  eth1: 
+    mac: 172.24.130.27
+    ip: 00:11:25:C4:31:4F
+gdx-53: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.5.17
+    ip: 00:11:25:C4:3B:F6
+  eth1: 
+    mac: 172.24.132.17
+    ip: 00:11:25:C4:3B:F7
+gdx-104: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.9.32
+    ip: 00:11:25:C4:52:4A
+  eth1: 
+    mac: 172.24.136.32
+    ip: 00:11:25:C4:52:4B
+gdx-131: 
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.11.23
+    ip: 00:11:25:C4:54:86
+  eth1: 
+    mac: 172.24.138.23
+    ip: 00:11:25:C4:54:87
 gdx-211: 
-  mac_eth0: 00:11:25:C4:4F:94
-  mac_myri0: 00:60:DD:47:86:5C
-  mac_eth1: 00:11:25:C4:4F:95
-  mac_bmc: 00:11:25:91:48:38
+  myri0: {}
+
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.18.31
+    ip: 00:11:25:C4:4F:94
+  eth1: 
+    mac: 172.24.145.31
+    ip: 00:11:25:C4:4F:95
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
index 0ad32ce8c78b8bbebb16ba74ab615efd067be862..5171bc153e5a732c6ad3c374d47891e3acc7889f 100644
--- a/generators/input/orsay-links.yaml
+++ b/generators/input/orsay-links.yaml
@@ -1,61 +1,196 @@
 --- 
-links-eth0: 
+nodes-eth0-switch: 
   gdx:
-    switch-eth0-0: "1,18"
-    switch-eth0-1: "19,36"
-    switch-eth0-2: "37,54"
-    switch-eth0-3: "55,72"
-    switch-eth0-4: "73,90"
-    switch-eth0-5: "91,108"
-    switch-eth0-6: "109,126"
-    switch-eth0-7: "127,144"
-    switch-eth0-8: "145,162"
-    switch-eth0-9: "163,180"
-    switch-eth0-10: "181,198"
-    switch-eth0-11: "199,216"
-    switch-eth0-12: "217,234"
-    switch-eth0-13: "235,252"
-    switch-eth0-14: "253,270"
-    switch-eth0-15: "271,288"
-    switch-eth0-16: "289,306"
-    switch-eth0-17: "307,310"
+    switch11: "1,18"
+    switch12: "19,36"
+    switch09: "37,54"
+    switch08: "55,72"
+    switch06: "73,90"
+    switch05: "91,108"
+    switch02: "109,126"
+    switch03: "127,144"
+    switch07: "145,162"
+    switch13: "163,180"
+    switch15: "181,198"
+    switch14: "199,216"
+    switch16: "217,234"
+    switch10: "235,252"
+    procurve17: "253,270"
+    procurve18: "271,288"
+    procurve-04-07: "289,310"
   netgdx:
-    switch-gw: "1,30"
-links-eth1: 
+    gw: "1,30"
+nodes-eth1-switch: 
   netgdx:
-    switch-gw: "1,30"
-links-eth2: 
+    gw: "1,30"
+nodes-eth2-switch: 
   netgdx:
-    switch-gw: "1,30"
-links-bmc:
+    gw: "1,30"
+nodes-bmc-switch:
   gdx:
-    switch-bmc-0: "1,36"
-    switch-bmc-1: "37,72"
-    switch-bmc-2: "73,108"
-    switch-bmc-3: "109,144"
-    switch-bmc-4: "145,180"
-    switch-eth0-10: "181,186"
-    switch-eth0-11: "187,192"
-    switch-bmc-5: "193,216"
-    switch-bmc-6: "217,252"
-    switch-bmc-7: "253,288"
-    switch-bmc-8: "289,310"
+    netgear01: "1,36"
+    netgear02: "37,72"
+    netgear03: "73,108"
+    netgear04: "109,144"
+    netgear05: "145,180"
+    netgear06: "181,216"
+    netgear07: "217,252"
+    procurve-bmc-06: "253,271"
+    procurve-bmc-09: "272,288"
+    procurve-04-07: "289,310"
   netgdx:
-    switch-bmc-9: "1,30"
-links-rsa:
+    gw: "1,30"
+nodes-rsa-switch:
   gdx:
-    switch-rsa-0: "1,36"
-    switch-rsa-1: "37,72"
-    switch-rsa-2: "73,108"
-    switch-rsa-3: "109,144"
-    switch-rsa-4: "145,180"
-    switch-rsa-5: "181,216"
-    switch-rsa-6: "217,252"
-    switch-rsa-7: "253,288"
-    switch-rsa-8: "289,310"
+    mrv01: "1,36"
+    mrv02: "37,72"
+    mrv03: "73,108"
+    mrv04: "109,144"
+    mrv05: "145,180"
+    mrv06: "181,216"
+    mrv07: "217,252"
+    mrv08: "253,288"
+    mrv09: "289,310"
   netgdx:
-    switch-rsa-9: "1,30"
-links-mx:
+    mrv00: "1,30"
+nodes-mx-switch:
   gdx:
     switch-mx: "1,310"
+switch-to-switch: 
+  switch-nil: 
+    nodes: "gdx-1,310-eth1"
+  gw:
+    nodes : 
+      - "netgdx-1,3-eth0"
+      - "netgdx-1,3-eth1"
+      - "netgdx-1,3-eth2"
+    next : 
+     - switch11: 
+        width: 2
+        nodes: "gdx-1,18-eth0"
+        next: 
+          - netgear01: 
+             width: 1
+             nodes: "gdx-1,36-bmc"
+     - switch12:
+        width: 2
+        nodes: "gdx-19,36-eth0"
+        next: 
+          - mrv01: 
+             width: 1
+             nodes: "gdx-1,36-rsa"
+     - switch09: 
+        width: 2
+        nodes: "gdx-37,54-eth0"
+        next: 
+          - netgear02: 
+             width: 1
+             nodes: "gdx-37,72-bmc"
+     - switch08:
+        width: 2
+        nodes: "gdx-55,72-eth0"
+        next: 
+          - mrv02: 
+             width: 1
+             nodes: "gdx-37,72-rsa"
+     - switch06: 
+        width: 2
+        nodes: "gdx-73,90-eth0"
+        next: 
+          - netgear03: 
+             width: 1
+             nodes: "gdx-73,108-bmc"
+     - switch05:
+        width: 2
+        nodes: "gdx-91,108-eth0"
+        next: 
+          - mrv03: 
+             width: 1
+             nodes: "gdx-73,108-rsa"
+     - switch03: 
+        width: 2
+        nodes: "gdx-109,126-eth0"
+        next: 
+          - netgear04: 
+             width: 1
+             nodes: "gdx-109,144-bmc"
+     - switch02:
+        width: 2
+        nodes: "gdx-127,144-eth0"
+        next: 
+          - mrv04: 
+             width: 1
+             nodes: "gdx-109,144-rsa"
+     - switch18: 
+        width: 2
+        nodes: "gdx-145,162-eth0"
+        next: 
+          - netgear05: 
+             width: 1
+             nodes: "gdx-145,180-bmc"
+     - switch17:
+        width: 2
+        nodes: "gdx-163,180-eth0"
+        next: 
+          - mrv05: 
+             width: 1
+             nodes: "gdx-145,180-rsa"
+     - switch15: 
+        width: 2
+        nodes: "gdx-181,198-eth0"
+        next: 
+          - netgear06: 
+             width: 1
+             nodes: "gdx-181,216-bmc"
+     - switch14:
+        width: 2
+        nodes: "gdx-199,216-eth0"
+        next: 
+          - mrv06: 
+             width: 1
+             nodes: "gdx-181,216-rsa"
+     - switch07: 
+        width: 2
+        nodes: "gdx-217,234-eth0"
+        next: 
+          - netgear07: 
+             width: 1
+             nodes: "gdx-217,252-bmc"
+     - switch04:
+        width: 2
+        nodes: "gdx-235,252-eth0"
+        next: 
+          - mrv07: 
+             width: 1
+             nodes: "gdx-217,252-rsa"
+     - switch10: 
+        width: 2
+        nodes: "gdx-253,270-eth0"
+        next: 
+          - netgear08: 
+             width: 1
+             nodes: "gdx-253,288-bmc"
+     - switch11:
+        width: 2
+        nodes: "gdx-271,288-eth0"
+        next: 
+          - mrv08: 
+             width: 1
+             nodes: "gdx-253,288-rsa"
+     - switch01: 
+        width: 2
+        nodes: "gdx-298,306-eth0"
+        next: 
+          - netgear09: 
+             width: 1
+             nodes: "gdx-298,310-bmc"
+     - switch13:
+        width: 2
+        nodes: "gdx-307,310-eth0"
+        next: 
+          - mrv09: 
+             width: 1
+             nodes: "gdx-298,310-rsa"
+  switch-mx:
+    nodes : "gdx-1,4-myri0"
     
\ No newline at end of file
diff --git a/generators/input/orsay-netgdx.back.yaml b/generators/input/orsay-netgdx.back.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8e71fbc56cb030c198c95b216d7985b776b31dd0
--- /dev/null
+++ b/generators/input/orsay-netgdx.back.yaml
@@ -0,0 +1,147 @@
+--- 
+netgdx-10:
+  mac_eth0: 00:11:25:c4:28:42
+  mac_eth1: 00:11:25:c4:28:43
+  mac_eth2: 00:10:18:16:4d:f9
+  mac_bmc: 00:11:25:91:48:4C
+netgdx-11:
+  mac_eth0: 00:11:25:c4:4f:56
+  mac_eth1: 00:11:25:c4:4f:57
+  mac_eth2: 00:10:18:16:4d:dc
+  mac_bmc: 00:11:25:91:45:A4
+netgdx-12:
+  mac_eth0: 00:11:25:c4:4d:ea
+  mac_eth1: 00:11:25:c4:4d:eb
+  mac_eth2: 00:10:18:16:4d:57
+  mac_bmc: 00:11:25:91:45:C0
+netgdx-13:
+  mac_eth0: 00:11:25:c4:52:b6
+  mac_eth1: 00:11:25:c4:52:b7
+  mac_eth2: 00:10:18:16:4d:cb
+  mac_bmc: 00:11:25:91:45:86
+netgdx-14:
+  mac_eth0: 00:11:25:c4:52:62
+  mac_eth1: 00:11:25:c4:52:63
+  mac_eth2: 00:10:18:16:4f:d9
+  mac_bmc: 00:11:25:91:48:E0
+netgdx-15:
+  mac_eth0: 00:11:25:c4:4f:76
+  mac_eth1: 00:11:25:c4:4f:77
+  mac_eth2: 00:10:18:16:4f:0b
+  mac_bmc: 00:11:25:91:49:51
+netgdx-16:
+  mac_eth0: 00:11:25:c4:4f:48
+  mac_eth1: 00:11:25:c4:4f:49
+  mac_eth2: 00:10:18:16:4f:0e
+  mac_bmc: 00:11:25:91:48:F6
+netgdx-17:
+  mac_eth0: 00:11:25:c4:42:e0
+  mac_eth1: 00:11:25:c4:42:e1
+  mac_eth2: 00:10:18:16:4f:23
+  mac_bmc: 00:11:25:91:48:3E
+netgdx-18:
+  mac_eth0: 00:11:25:c4:4e:c6
+  mac_eth1: 00:11:25:c4:4e:c7
+  mac_eth2: 00:10:18:16:28:1c
+  mac_bmc: 00:11:25:91:47:B7
+netgdx-19:
+  mac_eth0: 00:11:25:c4:4f:8a
+  mac_eth1: 00:11:25:c4:4f:8b
+  mac_eth2: 00:10:18:16:4f:74
+  mac_bmc: 00:11:25:91:46:65
+netgdx-1:
+  mac_eth0: 00:11:25:c4:4f:62
+  mac_eth1: 00:11:25:c4:4f:63
+  mac_eth2: 00:10:18:16:4f:2e
+  mac_bmc: 00:11:25:91:48:1E
+netgdx-20:
+  mac_eth0: 00:11:25:c4:4d:7c
+  mac_eth1: 00:11:25:c4:4d:7d
+  mac_eth2: 00:10:18:16:4e:ec
+  mac_bmc: 00:11:25:91:47:7E
+netgdx-21:
+  mac_eth0: 00:11:25:c4:50:2e
+  mac_eth1: 00:11:25:c4:50:2f
+  mac_eth2: 00:10:18:0b:e2:c2
+  mac_bmc: 00:11:25:91:47:A5
+netgdx-22:
+  mac_eth0: 00:11:25:c4:4f:7e
+  mac_eth1: 00:11:25:c4:4f:7f
+  mac_eth2: 00:10:18:0b:d8:a3
+  mac_bmc: 00:11:25:91:46:5F
+netgdx-23:
+  mac_eth0: 00:11:25:c4:4f:fe
+  mac_eth1: 00:11:25:c4:4f:ff
+  mac_eth2: 00:10:18:00:fa:12
+  mac_bmc: 00:11:25:91:46:68
+netgdx-24:
+  mac_eth0: 00:11:25:c4:54:8a
+  mac_eth1: 00:11:25:c4:54:8b
+  mac_eth2: 00:10:18:06:4f:a5
+  mac_bmc: 00:11:25:91:46:A2
+netgdx-25:
+  mac_eth0: 00:11:25:c4:52:68
+  mac_eth1: 00:11:25:c4:52:69
+  mac_eth2: 00:10:18:06:4f:e8
+  mac_bmc: 00:11:25:91:46:4B
+netgdx-26:
+  mac_eth0: 00:11:25:c4:52:ba
+  mac_eth1: 00:11:25:c4:52:bb
+  mac_eth2: 00:10:18:06:4e:db
+  mac_bmc: 00:11:25:91:48:ED
+netgdx-27:
+  comments: "Boot aborts because of tg3 driver : 'could not obtain valid ethernet address, aborting. probe of 0000:03:02.0 failed with error -22'"
+  mac_eth0: 00:11:25:1E:79:08
+  mac_eth1: 00:11:25:1E:79:09
+  mac_eth2: 00:10:18:06:4F:A7
+  mac_bmc: 00:11:25:91:46:34
+netgdx-28:
+  mac_eth0: 00:11:25:c4:4d:28
+  mac_eth1: 00:11:25:c4:4d:29
+  mac_eth2: 00:10:18:06:4f:ae
+  mac_bmc: 00:11:25:91:47:48
+netgdx-29:
+  mac_eth0: 00:11:25:c4:4f:9e
+  mac_eth1: 00:11:25:c4:4f:9f
+  mac_eth2: 00:10:18:06:4f:b5
+  mac_bmc: 00:11:25:91:45:F3
+netgdx-2:
+  mac_eth0: 00:11:25:c4:52:bc
+  mac_eth1: 00:11:25:c4:52:bd
+  mac_eth2: 00:10:18:16:50:6c
+  mac_bmc: 00:11:25:91:47:B2
+netgdx-30:
+  mac_eth0: 00:11:25:c4:4f:38
+  mac_eth1: 00:11:25:c4:4f:39
+  mac_eth2: 00:10:18:06:4f:b0
+  mac_bmc: 00:11:25:91:49:2D
+netgdx-3:
+  mac_eth0: 00:11:25:c4:4f:66
+  mac_eth1: 00:11:25:c4:4f:67
+  mac_eth2: 00:10:18:16:4a:f0
+  mac_bmc: 00:11:25:91:45:CB
+netgdx-4:
+  mac_eth0: 00:11:25:c4:50:94
+  mac_eth1: 00:11:25:c4:50:95
+  mac_eth2: 00:10:18:16:4f:31
+  mac_bmc: 00:11:25:91:47:BA
+netgdx-5:
+  mac_eth0: 00:11:25:c4:50:90
+  mac_eth1: 00:11:25:c4:50:91
+  mac_eth2: 00:10:18:16:4e:c9
+  mac_bmc: 00:11:25:91:47:83
+netgdx-7:
+  mac_eth0: 00:11:25:c4:4f:60
+  mac_eth1: 00:11:25:c4:4f:61
+  mac_eth2: 00:10:18:16:4d:86
+  mac_bmc: 00:11:25:91:48:4A
+netgdx-8:
+  mac_eth0: 00:11:25:c4:4f:d4
+  mac_eth1: 00:11:25:c4:4f:d5
+  mac_eth2: 00:10:18:16:4e:f0
+  mac_bmc: 00:11:25:91:45:95
+netgdx-9:
+  mac_eth0: 00:11:25:c4:54:5c
+  mac_eth1: 00:11:25:c4:54:5d
+  mac_eth2: 00:10:18:16:4f:91
+  mac_bmc: 00:11:25:91:45:E6
\ No newline at end of file
diff --git a/generators/input/orsay-netgdx.yaml b/generators/input/orsay-netgdx.yaml
index 8e71fbc56cb030c198c95b216d7985b776b31dd0..c79bf32222de15e3090a8c7df672e8ef06a69bc0 100644
--- a/generators/input/orsay-netgdx.yaml
+++ b/generators/input/orsay-netgdx.yaml
@@ -1,147 +1,361 @@
 --- 
-netgdx-10:
-  mac_eth0: 00:11:25:c4:28:42
-  mac_eth1: 00:11:25:c4:28:43
-  mac_eth2: 00:10:18:16:4d:f9
-  mac_bmc: 00:11:25:91:48:4C
-netgdx-11:
-  mac_eth0: 00:11:25:c4:4f:56
-  mac_eth1: 00:11:25:c4:4f:57
-  mac_eth2: 00:10:18:16:4d:dc
-  mac_bmc: 00:11:25:91:45:A4
-netgdx-12:
-  mac_eth0: 00:11:25:c4:4d:ea
-  mac_eth1: 00:11:25:c4:4d:eb
-  mac_eth2: 00:10:18:16:4d:57
-  mac_bmc: 00:11:25:91:45:C0
-netgdx-13:
-  mac_eth0: 00:11:25:c4:52:b6
-  mac_eth1: 00:11:25:c4:52:b7
-  mac_eth2: 00:10:18:16:4d:cb
-  mac_bmc: 00:11:25:91:45:86
-netgdx-14:
-  mac_eth0: 00:11:25:c4:52:62
-  mac_eth1: 00:11:25:c4:52:63
-  mac_eth2: 00:10:18:16:4f:d9
-  mac_bmc: 00:11:25:91:48:E0
-netgdx-15:
-  mac_eth0: 00:11:25:c4:4f:76
-  mac_eth1: 00:11:25:c4:4f:77
-  mac_eth2: 00:10:18:16:4f:0b
-  mac_bmc: 00:11:25:91:49:51
-netgdx-16:
-  mac_eth0: 00:11:25:c4:4f:48
-  mac_eth1: 00:11:25:c4:4f:49
-  mac_eth2: 00:10:18:16:4f:0e
-  mac_bmc: 00:11:25:91:48:F6
-netgdx-17:
-  mac_eth0: 00:11:25:c4:42:e0
-  mac_eth1: 00:11:25:c4:42:e1
-  mac_eth2: 00:10:18:16:4f:23
-  mac_bmc: 00:11:25:91:48:3E
-netgdx-18:
-  mac_eth0: 00:11:25:c4:4e:c6
-  mac_eth1: 00:11:25:c4:4e:c7
-  mac_eth2: 00:10:18:16:28:1c
-  mac_bmc: 00:11:25:91:47:B7
-netgdx-19:
-  mac_eth0: 00:11:25:c4:4f:8a
-  mac_eth1: 00:11:25:c4:4f:8b
-  mac_eth2: 00:10:18:16:4f:74
-  mac_bmc: 00:11:25:91:46:65
-netgdx-1:
-  mac_eth0: 00:11:25:c4:4f:62
-  mac_eth1: 00:11:25:c4:4f:63
-  mac_eth2: 00:10:18:16:4f:2e
-  mac_bmc: 00:11:25:91:48:1E
-netgdx-20:
-  mac_eth0: 00:11:25:c4:4d:7c
-  mac_eth1: 00:11:25:c4:4d:7d
-  mac_eth2: 00:10:18:16:4e:ec
-  mac_bmc: 00:11:25:91:47:7E
-netgdx-21:
-  mac_eth0: 00:11:25:c4:50:2e
-  mac_eth1: 00:11:25:c4:50:2f
-  mac_eth2: 00:10:18:0b:e2:c2
-  mac_bmc: 00:11:25:91:47:A5
-netgdx-22:
-  mac_eth0: 00:11:25:c4:4f:7e
-  mac_eth1: 00:11:25:c4:4f:7f
-  mac_eth2: 00:10:18:0b:d8:a3
-  mac_bmc: 00:11:25:91:46:5F
-netgdx-23:
-  mac_eth0: 00:11:25:c4:4f:fe
-  mac_eth1: 00:11:25:c4:4f:ff
-  mac_eth2: 00:10:18:00:fa:12
-  mac_bmc: 00:11:25:91:46:68
-netgdx-24:
-  mac_eth0: 00:11:25:c4:54:8a
-  mac_eth1: 00:11:25:c4:54:8b
-  mac_eth2: 00:10:18:06:4f:a5
-  mac_bmc: 00:11:25:91:46:A2
-netgdx-25:
-  mac_eth0: 00:11:25:c4:52:68
-  mac_eth1: 00:11:25:c4:52:69
-  mac_eth2: 00:10:18:06:4f:e8
-  mac_bmc: 00:11:25:91:46:4B
-netgdx-26:
-  mac_eth0: 00:11:25:c4:52:ba
-  mac_eth1: 00:11:25:c4:52:bb
-  mac_eth2: 00:10:18:06:4e:db
-  mac_bmc: 00:11:25:91:48:ED
-netgdx-27:
-  comments: "Boot aborts because of tg3 driver : 'could not obtain valid ethernet address, aborting. probe of 0000:03:02.0 failed with error -22'"
-  mac_eth0: 00:11:25:1E:79:08
-  mac_eth1: 00:11:25:1E:79:09
-  mac_eth2: 00:10:18:06:4F:A7
-  mac_bmc: 00:11:25:91:46:34
-netgdx-28:
-  mac_eth0: 00:11:25:c4:4d:28
-  mac_eth1: 00:11:25:c4:4d:29
-  mac_eth2: 00:10:18:06:4f:ae
-  mac_bmc: 00:11:25:91:47:48
-netgdx-29:
-  mac_eth0: 00:11:25:c4:4f:9e
-  mac_eth1: 00:11:25:c4:4f:9f
-  mac_eth2: 00:10:18:06:4f:b5
-  mac_bmc: 00:11:25:91:45:F3
-netgdx-2:
-  mac_eth0: 00:11:25:c4:52:bc
-  mac_eth1: 00:11:25:c4:52:bd
-  mac_eth2: 00:10:18:16:50:6c
-  mac_bmc: 00:11:25:91:47:B2
-netgdx-30:
-  mac_eth0: 00:11:25:c4:4f:38
-  mac_eth1: 00:11:25:c4:4f:39
-  mac_eth2: 00:10:18:06:4f:b0
-  mac_bmc: 00:11:25:91:49:2D
-netgdx-3:
-  mac_eth0: 00:11:25:c4:4f:66
-  mac_eth1: 00:11:25:c4:4f:67
-  mac_eth2: 00:10:18:16:4a:f0
-  mac_bmc: 00:11:25:91:45:CB
-netgdx-4:
-  mac_eth0: 00:11:25:c4:50:94
-  mac_eth1: 00:11:25:c4:50:95
-  mac_eth2: 00:10:18:16:4f:31
-  mac_bmc: 00:11:25:91:47:BA
-netgdx-5:
-  mac_eth0: 00:11:25:c4:50:90
-  mac_eth1: 00:11:25:c4:50:91
-  mac_eth2: 00:10:18:16:4e:c9
-  mac_bmc: 00:11:25:91:47:83
-netgdx-7:
-  mac_eth0: 00:11:25:c4:4f:60
-  mac_eth1: 00:11:25:c4:4f:61
-  mac_eth2: 00:10:18:16:4d:86
-  mac_bmc: 00:11:25:91:48:4A
-netgdx-8:
-  mac_eth0: 00:11:25:c4:4f:d4
-  mac_eth1: 00:11:25:c4:4f:d5
-  mac_eth2: 00:10:18:16:4e:f0
-  mac_bmc: 00:11:25:91:45:95
-netgdx-9:
-  mac_eth0: 00:11:25:c4:54:5c
-  mac_eth1: 00:11:25:c4:54:5d
-  mac_eth2: 00:10:18:16:4f:91
-  mac_bmc: 00:11:25:91:45:E6
\ No newline at end of file
+netgdx-27: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.27
+    ip: 00:11:25:1E:79:08
+  eth1: 
+    mac: 172.24.240.27
+    ip: 00:11:25:1E:79:09
+  eth2: 
+    mac: 172.24.190.27
+    ip: 00:10:18:06:4F:A7
+netgdx-16: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.16
+    ip: 00:11:25:C4:4F:48
+  eth1: 
+    mac: 172.24.240.16
+    ip: 00:11:25:C4:4F:49
+  eth2: 
+    mac: 172.24.190.16
+    ip: 00:10:18:16:4f:0e
+netgdx-8: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.8
+    ip: 00:11:25:C4:4F:D4
+  eth1: 
+    mac: 172.24.240.8
+    ip: 00:11:25:C4:4F:D5
+  eth2: 
+    mac: 172.24.190.8
+    ip: 00:10:18:16:4e:f0
+netgdx-28: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.28
+    ip: 00:11:25:C4:4D:28
+  eth1: 
+    mac: 172.24.240.28
+    ip: 00:11:25:C4:4D:29
+  eth2: 
+    mac: 172.24.190.28
+    ip: 00:10:18:06:4F:AE
+netgdx-17: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.17
+    ip: 00:11:25:C4:42:E0
+  eth1: 
+    mac: 172.24.240.17
+    ip: 00:11:25:C4:42:E1
+  eth2: 
+    mac: 172.24.190.17
+    ip: 00:10:18:16:4f:23
+netgdx-9: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.9
+    ip: 00:11:25:C4:54:5C
+  eth1: 
+    mac: 172.24.240.9
+    ip: 00:11:25:C4:54:5D
+  eth2: 
+    mac: 172.24.190.9
+    ip: 00:10:18:16:4f:91
+netgdx-29: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.29
+    ip: 00:11:25:C4:4F:9E
+  eth1: 
+    mac: 172.24.240.29
+    ip: 00:11:25:C4:4F:9F
+  eth2: 
+    mac: 172.24.190.29
+    ip: 00:10:18:06:4F:B5
+netgdx-18: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.18
+    ip: 00:11:25:C4:4E:C6
+  eth1: 
+    mac: 172.24.240.18
+    ip: 00:11:25:C4:4E:C7
+  eth2: 
+    mac: 172.24.190.18
+    ip: 00:10:18:16:28:1c
+netgdx-30: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.30
+    ip: 00:11:25:C4:4F:38
+  eth1: 
+    mac: 172.24.240.30
+    ip: 00:11:25:C4:4F:39
+  eth2: 
+    mac: 172.24.190.30
+    ip: 00:10:18:06:4F:B0
+netgdx-19: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.19
+    ip: 00:11:25:C4:4F:8A
+  eth1: 
+    mac: 172.24.240.19
+    ip: 00:11:25:C4:4F:8B
+  eth2: 
+    mac: 172.24.190.19
+    ip: 00:10:18:16:4f:74
+netgdx-20: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.20
+    ip: 00:11:25:C4:4D:7C
+  eth1: 
+    mac: 172.24.240.20
+    ip: 00:11:25:C4:4D:7D
+  eth2: 
+    mac: 172.24.190.20
+    ip: 00:10:18:16:4e:ec
+netgdx-1: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.1
+    ip: 00:11:25:C4:4F:62
+  eth1: 
+    mac: 172.24.240.1
+    ip: 00:11:25:C4:4F:63
+  eth2: 
+    mac: 172.24.190.1
+    ip: 00:10:18:16:4f:2e
+netgdx-21: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.21
+    ip: 00:11:25:C4:50:2E
+  eth1: 
+    mac: 172.24.240.21
+    ip: 00:11:25:C4:50:2F
+  eth2: 
+    mac: 172.24.190.21
+    ip: 00:10:18:0B:E2:C2
+netgdx-10: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.10
+    ip: 00:11:25:C4:28:42
+  eth1: 
+    mac: 172.24.240.10
+    ip: 00:11:25:C4:28:43
+  eth2: 
+    mac: 172.24.190.10
+    ip: 00:10:18:16:4d:f9
+netgdx-2: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.2
+    ip: 00:11:25:C4:52:BC
+  eth1: 
+    mac: 172.24.240.2
+    ip: 00:11:25:C4:52:BD
+  eth2: 
+    mac: 172.24.190.2
+    ip: 00:10:18:16:50:6c
+netgdx-22: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.22
+    ip: 00:11:25:C4:4F:7E
+  eth1: 
+    mac: 172.24.240.22
+    ip: 00:11:25:C4:4F:7F
+  eth2: 
+    mac: 172.24.190.22
+    ip: 00:10:18:0B:D8:A3
+netgdx-11: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.11
+    ip: 00:11:25:C4:4F:56
+  eth1: 
+    mac: 172.24.240.11
+    ip: 00:11:25:C4:4F:57
+  eth2: 
+    mac: 172.24.190.11
+    ip: 00:10:18:16:4d:dc
+netgdx-3: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.3
+    ip: 00:11:25:C4:4F:66
+  eth1: 
+    mac: 172.24.240.3
+    ip: 00:11:25:C4:4F:67
+  eth2: 
+    mac: 172.24.190.3
+    ip: 00:10:18:16:4a:f0
+netgdx-23: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.23
+    ip: 00:11:25:C4:4F:FE
+  eth1: 
+    mac: 172.24.240.23
+    ip: 00:11:25:C4:4F:FF
+  eth2: 
+    mac: 172.24.190.23
+    ip: 00:10:18:00:FA:12
+netgdx-12: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.12
+    ip: 00:11:25:C4:4D:EA
+  eth1: 
+    mac: 172.24.240.12
+    ip: 00:11:25:C4:4D:EB
+  eth2: 
+    mac: 172.24.190.12
+    ip: 00:10:18:16:4d:57
+netgdx-4: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.4
+    ip: 00:11:25:C4:50:94
+  eth1: 
+    mac: 172.24.240.4
+    ip: 00:11:25:C4:50:95
+  eth2: 
+    mac: 172.24.190.4
+    ip: 00:10:18:16:4f:31
+netgdx-24: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.24
+    ip: 00:11:25:C4:54:8A
+  eth1: 
+    mac: 172.24.240.24
+    ip: 00:11:25:C4:54:8B
+  eth2: 
+    mac: 172.24.190.24
+    ip: 00:10:18:06:4F:A5
+netgdx-13: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.13
+    ip: 00:11:25:C4:52:B6
+  eth1: 
+    mac: 172.24.240.13
+    ip: 00:11:25:C4:52:B7
+  eth2: 
+    mac: 172.24.190.13
+    ip: 00:10:18:16:4d:cb
+netgdx-5: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.5
+    ip: 00:11:25:C4:50:90
+  eth1: 
+    mac: 172.24.240.5
+    ip: 00:11:25:C4:50:91
+  eth2: 
+    mac: 172.24.190.5
+    ip: 00:10:18:16:4e:c9
+netgdx-25: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.25
+    ip: 00:11:25:C4:52:68
+  eth1: 
+    mac: 172.24.240.25
+    ip: 00:11:25:C4:52:69
+  eth2: 
+    mac: 172.24.190.25
+    ip: 00:10:18:06:4F:E8
+netgdx-14: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.14
+    ip: 00:11:25:C4:52:62
+  eth1: 
+    mac: 172.24.240.14
+    ip: 00:11:25:C4:52:63
+  eth2: 
+    mac: 172.24.190.14
+    ip: 00:10:18:16:4f:d9
+netgdx-6: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.6
+    ip: 00:11:25:C4:24:1E
+  eth1: 
+    mac: 172.24.240.6
+    ip: 00:11:25:C4:24:1F
+  eth2: 
+    mac: 172.24.190.6
+    ip: 00:10:18:16:4c:29
+netgdx-26: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.26
+    ip: 00:11:25:C4:52:BA
+  eth1: 
+    mac: 172.24.240.26
+    ip: 00:11:25:C4:52:BB
+  eth2: 
+    mac: 172.24.190.26
+    ip: 00:10:18:06:4E:DB
+netgdx-15: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.15
+    ip: 00:11:25:C4:4F:76
+  eth1: 
+    mac: 172.24.240.15
+    ip: 00:11:25:C4:4F:77
+  eth2: 
+    mac: 172.24.190.15
+    ip: 00:10:18:16:4f:0b
+netgdx-7: 
+  bmc: {}
+
+  eth0: 
+    mac: 172.24.110.7
+    ip: 00:11:25:C4:4F:60
+  eth1: 
+    mac: 172.24.240.7
+    ip: 00:11:25:C4:4F:61
+  eth2: 
+    mac: 172.24.190.7
+    ip: 00:10:18:16:4d:86
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 9149a74464206cefe8010a537ebf3281a3183c80..e0a8ed4ec049f1561a0407f2c82538d091258263 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -1,270 +1,167 @@
 --- 
 switch-nil:
-  name: nil
-  rate: 0
+  rate-out: "0"
+  rate-in: "0"
   ip: nil
   mac: nil
-  next_switch : nil
-  next_switch_rate : 0
-switch-eth0-0:
-  name: "switch11"
-  nodes: "gdx-[1-18]"
-  rate: 1.G
+switch01:
+  rate-out: 1.G
+  rate-in: 1.G
+  ip: 172.26.120.101
+  mac: nil
+switch04:
+  rate-out: 1.G
+  rate-in: 1.G
+  ip: 172.26.120.104
+  mac: nil
+switch17:
+  rate-out: 1.G
+  rate-in: 1.G
+  ip: 172.26.120.117
+  mac: nil
+switch18:
+  rate-out: 1.G
+  rate-in: 1.G
+  ip: 172.26.120.118
+  mac: nil
+switch11:
+  rate-out: 1.G
+  rate-in: 1.G
   ip: 172.26.120.111
   mac: 00:12:01:73:21:C2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-1:
-  name: "switch12"
-  nodes: "gdx-[19-36]"
+switch12:
   rate: 1.G  
   ip: 172.26.120.112
   mac: 00:12:01:73:27:C2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-2:
-  name: "switch09"
-  nodes: "gdx-[37-54]"
+switch09:
   rate: 1.G  
   ip: 172.26.120.109
   mac: 00:24:F9:3E:81:42
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-3:
-  name: "switch08"
-  nodes: "gdx-[55-72]"
+switch08:
   rate: 1.G  
   ip: 172.26.120.108
   mac: 00:11:BB:3E:FD:C2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-4:
-  name: "switch06"
-  nodes: "gdx-[73-90]"
+switch06:
   rate: 1.G  
   ip: 172.26.120.106
   mac: 00:24:f9:3e:e7:42
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-5:
-  name: "switch05"
-  nodes: "gdx-[91-108]"
+switch05:
   rate: 1.G  
   ip: 172.26.120.105
   mac: 00:12:00:44:53:42
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-6:
-  name: "switch03"
-  nodes: "gdx-[109-126]"
+switch03:
   rate: 1.G  
   ip: 172.26.120.103
   mac: 00:24:f9:3e:a7:42
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-7:
-  name: "switch02"
-  nodes: "gdx-[127-144]"
+switch02:
   rate: 1.G  
   ip: 172.26.120.102
   mac: 00:12:00:4c:f5:c2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-8:
-  name: "switch07"
-  nodes: "gdx-[289-306]"
+switch07:
   rate: 1.G  
   ip: 172.26.120.107
   mac: 00:12:00:44:68:42
-  next_switch : "switch-gw"
-  next_switch_rate : 3.G
-switch-eth0-9:
-  name: "switch13"
-  nodes: "gdx-[307-310]"
+switch13:
   rate: 1.G  
   ip: 172.26.120.113
   mac: 00:24:f9:2a:0e:41
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-10:
-  name: "switch14"
-  nodes: "gdx-[181-198]"
+switch14:
   rate: 1.G  
   ip: 172.26.120.114
   mac: 00:11:bb:17:e8:c2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-11:
-  name: "switch15"
-  nodes: "gdx-[199-216]"
+switch15:
   rate: 1.G  
   ip: 172.26.120.115
   mac: 00:12:00:4c:a7:c2
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-12:
-  name: "switch10"
-  nodes: "gdx-[253-270]"
+switch10:
   rate: 1.G  
   ip: 172.26.120.110
   mac: 00:12:01:72:cd:42
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-13:
-  name: "switch16"
-  nodes: "gdx-[271-288]"
+switch16:
   rate: 1.G  
   ip: 172.26.120.116
   mac: 00:12:01:5b:af:42
-  next_switch : "switch-gw"
-  next_switch_rate : 3.G
-switch-eth0-14:
-  name: "procurve17"
-  rate: 100.M  
+procurve17:
+  rate-in: 100.M
+  rate-out: 1.G
   ip: 172.26.120.197
   mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-15:
-  name: "procurve18"
-  nodes: "gdx-[163-180]"
-  rate: 100.M  
+procurve18:
+  rate-in: 100.M
+  rate-out: 1.G
   ip: 172.26.120.198
   mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-16:
-  name: "procurve-04-07"
-  nodes: "gdx-[235-252]"
+procurve-04-07:
   rate: 1.G  
   ip: 172.26.120.184
+  mac: nil  
+procurve-bmc-09:
+  rate-in: 100.M
+  rate-out: 1.G
+  ip: 172.26.120.189
   mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 3.G
-switch-eth0-17:
-  name: "procurve-04-07"
-  nodes: "gdx-[217-234]"
-  rate: 1.G  
-  ip: 172.26.120.184
+procurve-bmc-06:
+  rate-in: 100.M
+  rate-out: 1.G
+  ip: 172.26.120.186
   mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 3.G
-switch-bmc-0:
-  name: "netgear01"
-  nodes: "gdx-[1-36]"
+netgear01:
   rate: 1.G  
   ip: 172.26.120.151
   mac: 00:0f:b5:fc:0d:26
-  next_switch : "switch-eth0-1"
-  next_switch_rate : 1.G
-switch-bmc-1:
-  name: "netgear02"
-  nodes: "gdx-[37-72]"
+netgear02:
   rate: 1.G  
   ip: 172.26.120.152
   mac: 00:22:3f:e6:f8:ce
-  next_switch : "switch-eth0-3"
-  next_switch_rate : 1.G
-switch-bmc-2:
-  name: "netgear03"
-  nodes: "gdx-[73-108]"
+netgear03:
   rate: 1.G  
   ip: 172.26.120.153
   mac: 00:0f:b5:fb:70:89
-  next_switch : "switch-eth0-5"
-  next_switch_rate : 1.G
-switch-bmc-3:
-  name: "netgear04"
-  nodes: "gdx-[109-144]"
+netgear04:
   rate: 1.G  
   ip: 172.26.120.154
   mac: 00:0f:b5:f5:79:2a
-  next_switch : "switch-eth0-7"
-  next_switch_rate : 1.G
-switch-bmc-4:
-  name: "netgear05"
-  nodes: "gdx-[145-180]"
+netgear05:
   rate: 1.G  
   ip: 172.26.120.155
   mac: 00:0f:b5:fb:70:a5
-  next_switch : "switch-eth0-9"
-  next_switch_rate : 1.G
-switch-bmc-5:
-  name: "netgear06"
-  nodes: "gdx-[181-216]"
+netgear06:
   rate: 1.G  
   ip: 172.26.120.156
   mac: nil
-  next_switch : "switch-eth0-11"
-  next_switch_rate : 1.G
-switch-bmc-6:
-  name: "netgear07"
+netgear07:
   rate: 1.G  
   ip: 172.26.120.157
   mac: nil
-  next_switch : "switch-eth0-13"
-  next_switch_rate : 1.G
-switch-bmc-7:
-  name: "netgear08"
+netgear08:
   rate: 1.G  
   ip: 172.26.120.158
   mac: 00:0f:b5:fc:0d:aa
-  next_switch : "switch-eth0-15"
-  next_switch_rate : 1.G
-switch-bmc-8:
-  name: "procurve-bmc-09"
-  rate: 100.M  
-  ip: 172.26.120.159
-  mac: nil
-  next_switch : "switch-eth0-17"
-  next_switch_rate : 1.G
-switch-bmc-9:
-  name: "netgear10"
+netgear09:
   rate: 1.G
   ip: 172.26.120.160
   mac: 00:0f:b5:fc:0d:a8
-  next_switch : "switch-gw"
-  next_switch_rate : 1.G
-switch-rsa-0:
-  name: "mrv01"
+mrv01:
   rate: 1.G  
   ip: 172.26.120.201
   mac: nil
-  next_switch : "switch-eth0-1"
-  next_switch_rate : 1.G
-switch-rsa-1:
-  name: "mrv02"
-  nodes: "gdx-[37-72]"
-  rate: 1.G  
+mrv02:
+  rate: 1.G
   ip: 172.26.120.202
   mac: 00:a0:9c:00:16:41
-  next_switch : "switch-eth0-3"
-  next_switch_rate : 1.G
-switch-rsa-2:
-  name: "mrv03"
-  nodes: "gdx-[73-108]"
+mrv03:
   rate: 1.G  
   ip: 172.26.120.203
   mac: 00:a0:9c:00:12:dd
-  next_switch : "switch-eth0-5"
-  next_switch_rate : 1.G
-switch-rsa-3:
-  name: "mrv04"
-  nodes: "gdx-[109-144]"
+mrv04:
   rate: 1.G  
   ip: 172.26.120.204
   mac: 00:a0:9c:00:12:e4
-  next_switch : "switch-eth0-7"
-  next_switch_rate : 1.G
-switch-rsa-4:
-  name: "mrv05"
-  nodes: "gdx-[145-180]"
+mrv05:
   rate: 1.G  
   ip: 172.26.120.205
   mac: 00:a0:9c:00:10:ae
-  next_switch : "switch-eth0-9"
-  next_switch_rate : 1.G
-switch-rsa-5:
+mrv06:
   name: "mrv06"
   nodes: "gdx-[181-216]"
   rate: 1.G  
@@ -272,48 +169,28 @@ switch-rsa-5:
   mac: 00:a0:9c:00:16:42
   next_switch : "switch-eth0-11"
   next_switch_rate : 1.G
-switch-rsa-6:
-  name: "mrv07"
-  nodes: "gdx-[217-252]"
+mrv07:
   rate: 1.G  
   ip: 172.26.120.207
   mac: nil
-  next_switch : "switch-eth0-13"
-  next_switch_rate : 1.G
-switch-rsa-7:
-  name: "mrv08"
-  nodes: "gdx-[253-288]"
+mrv08:
   rate: 1.G  
   ip: 172.26.120.208
   mac: nil
-  next_switch : "switch-eth0-15"
-  next_switch_rate : 1.G
-switch-rsa-8:
-  name: "mrv09"
-  nodes: "gdx-[289-310]"
+mrv09:
   rate: 1.G  
   ip: 172.26.120.209
   mac: 00:a0:9c:00:25:4a
-  next_switch : "switch-eth0-17"
-  next_switch_rate : 1.G
-switch-rsa-9:
-  name: "mrv00"
+mrv00:
   rate: 1.G 
   ip: 172.26.120.200
   mac: 00:a0:9c:00:12:fa
-  next_switch : "switch-gw"
-  next_switch_rate : 1.G
 switch-mx:
-  name: "switch-mx"
   rate: 10.G  
   ip: nil
   mac: nil
-switch-gw:
-  name-prod: "gw"
-  name-admin: "cisco"
+gw:
   rate: 1.G 
-  ip-prod: 172.24.120.10
-  mac-prod: 00:11:5d:3d:50:00
-  ip-admin: 172.26.120.100
-  mac-admin: 00:11:5d:3d:50:00  
+  ip: 172.24.120.10
+  mac: 00:11:5d:3d:50:00
   
\ No newline at end of file
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index 55d033d21bbdddf326c36e8e050c06f1fabbcc17..54b5c1d5240017b1d70d84c11f95a86c7e12fbb4 100755
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -1,3 +1,80 @@
+require 'net/ssh'
+def switch_match_node(switch,id); switch != nil and (switch[:nodes][0] <= id and id <= switch[:nodes][1]); end
+def get_switch_for_node(switches,id)
+  switches.each{|k,v| 
+    arr = v.split(",").map{|s| s.to_i}
+    next if id < arr[0] or arr[1] < id
+    return lookup('orsay-network',k).merge({:nodes=>arr})
+  }
+  fail "Could not find your switch."
+end
+def node_switch(clusters,switch,node)
+  cluster,uids,iface = node.split("-")
+  clusters[cluster] = [] unless  clusters.has_key? cluster
+  min,max = uids.split(",").map{|s| s.to_i}
+  nodes = clusters[cluster]
+  min.upto(max) {|id|
+    nodes[id] = {} if nodes[id].nil?
+    ifaces = nodes[id]
+    fail "nodes #{cluster}-#{id} already has switch for iface '#{iface}' : #{ifaces.inspect} " unless ifaces[iface].nil?
+    ifaces[iface] = switch
+  }
+end
+def cluster_node_switch(clusters,switch)
+  switch.each{|sw,v0|
+#    puts "sw = #{sw} ; v0 = #{v0}"
+    if v0.has_key? "nodes"
+      if v0["nodes"].is_a? String
+        node_switch clusters, sw, v0["nodes"]
+      elsif v0["nodes"].is_a? Array
+        v0["nodes"].each{|node| node_switch clusters,sw,node} 
+      else
+        fail "Nodes must be String or Array."
+      end
+    end
+    if v0.has_key? "next"
+      v0["next"].each{|sw| cluster_node_switch clusters,sw}
+    end
+  }
+end
+
+def update_switch(switches,iface,sw_name)
+  unless switches.has_key? iface and switches[iface]["name"] == sw_name
+    sw = lookup('orsay-network',sw_name) 
+    fail "Switch '#{sw_name}' not found in 'orsay-network'" if sw.nil?
+    if sw["rate-in"].nil? 
+      fail "Switch '#{sw_name}' input rate must be defined : 'rate' or 'rate-in'" if sw["rate"].nil?
+      sw["rate-in"] = sw["rate"]
+    end
+    if sw["rate-out"].nil? 
+      fail "Switch '#{sw_name}' output rate must be defined : 'rate' or 'rate-out'" if sw["rate"].nil?
+      sw["rate-out"] = sw["rate"]
+    end
+    sw["name"] = sw_name
+    switches[iface] = sw
+  end
+end
+def fill_iface(site_uid,node_uid,iface,switches)
+  {
+    :interface => (case iface;when "myri0";'Myrinet';else;"Ethernet";end),
+    :device => iface,
+    :rate => (eval switches[iface]["rate-in"]),
+    :mac => lookup('orsay-gdx', "#{node_uid}")[iface]["mac"],
+    :vendor => (case iface;when "myri0";'Myrinet';else;'Broadcom';end),
+    :version => (case iface;when "myri0";'10G-PCIE-8A-C';else;'NetXtreme BCM5780';end),
+    :enabled => (case iface;when "eth1";false;else;true;end),
+    :management => (case iface;when "bmc";true;else;false;end),
+    :mountable => (case iface;when "myri0","eth0";true;else;false;end),
+    :mounted => (case iface;when "myri0","eth0";true;else;false;end),
+    :driver => (case iface;when "myri0";'mx_driver';else;'tg3';end),
+    :network_address => (case iface;when "eth0";"#{node_uid}.#{site_uid}.grid5000.fr";else;"#{node_uid}-#{iface}.#{site_uid}.grid5000.fr";end),
+    :ip => lookup('orsay-gdx', "#{node_uid}")[iface]["ip"],
+    :switch =>  ((switches[iface]["name"] == "switch-nil") ? (nil) : (switches[iface]["name"]+".#{site_uid}.grid5000.fr")),
+    :switch_ip => switches[iface]["ip"],
+    :switch_mac => switches[iface]["mac"]
+  }  
+end
+
 site :orsay do |site_uid|
   name "Orsay"
   location "Orsay, France" 
@@ -10,4 +87,74 @@ site :orsay do |site_uid|
   security_contact "orsay-staff@lists.grid5000.fr"
   user_support_contact "orsay-staff@lists.grid5000.fr"
   
+  links = lookup("orsay-links","switch-to-switch")
+#  puts links.inspect
+  clusters = {}
+  links.each{|sw,v| cluster_node_switch clusters,{sw => v}}
+#  puts clusters.inspect
+  
+  cluster :gdx do |cluster_uid|
+    model "IBM eServer 326m"
+    created_at nil
+    misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
+
+    switches = {}
+    clusters["gdx"].each.each_with_index {|ifaces, id|
+      next if ifaces.nil?
+      ifaces.each{|iface,sw_name| update_switch switches, iface, sw_name }
+      
+      node "#{cluster_uid}-#{id}" do |node_uid|
+        cmts = lookup('orsay-gdx', "#{node_uid}", 'comments')
+        comments cmts unless cmts.nil?
+            
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+        architecture({
+          :smp_size => 2, 
+          :smt_size => 2,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "AMD",
+          :model => "AMD Opteron",
+          :version => ( (180 < id and id < 307 ) ? "250" : "246"),
+          :clock_speed => ( (180 < id and id < 307 ) ? 2.4.G : 2.G),
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 1.MiB
+        })
+        main_memory({
+          :ram_size => 2.GiB, # bytes
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "debian-x64-5-prod",
+          :release => "5.1.2",
+          :version => "5",
+          :kernel   => "2.6.26"
+        })
+        storage_devices [
+          {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
+          ]
+
+        net_ifaces = []
+        ifaces.each{|iface,sw_name|
+          next if iface == "rsa"
+          net = fill_iface site_uid, node_uid, iface, switches
+          if net[:device] == "bmc"
+            net.merge!({
+            :switch_console => (switches["rsa"]["name"]+".#{site_uid}.grid5000.fr"),
+            :switch_console_ip => switches["rsa"]["ip"],
+            :switch_console_mac => switches["rsa"]["mac"]
+            })
+          end
+          net_ifaces.push(net)
+        }
+#        puts net_ifaces.inspect
+        network_adapters net_ifaces
+      end        
+    }
+  end
 end