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 57f9c5c4a6930711b5ab40ad1186a7d2b7a22e1d..087d224cd4a50b176b20f8c4dab1844a0ae2beaf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -9,31 +9,13 @@
     "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": null,
-      "mac": null,
+      "ip": "172.26.128.1",
+      "mac": "00:11:25:91:47:F2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -44,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:7E",
-      "mac": "172.24.1.1",
+      "ip": "172.24.1.1",
+      "mac": "00:11:25:C4:35:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:7F",
-      "mac": "172.24.128.1",
+      "ip": "172.24.128.1",
+      "mac": "00:11:25:C4:35:7F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5d50d60c9f4378329b0099b898c384418428b88d..3a9a34211ddfbb78e579c48c84925e66190ddf43 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.10",
+      "mac": "00:11:25:91:47:58",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:38",
-      "mac": "172.24.1.10",
+      "ip": "172.24.1.10",
+      "mac": "00:11:25:C4:33:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:39",
-      "mac": "172.24.128.10",
+      "ip": "172.24.128.10",
+      "mac": "00:11:25:C4:33:39",
       "management": false,
       "mountable": false,
       "mounted": false,
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 47615c72dc7a413c49eded5adedf4a1556fe2484..317877a173d11071a4e7abd27201864236896b0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.28",
+      "mac": "00:11:25:91:48:B7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:BE",
-      "mac": "172.24.9.28",
+      "ip": "172.24.9.28",
+      "mac": "00:11:25:C4:4E:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-100.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:BF",
-      "mac": "172.24.136.28",
+      "ip": "172.24.136.28",
+      "mac": "00:11:25:C4:4E:BF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 56655f4e7961092374515096b884e1afca52f41e..b73311e6bbaaa8172143a3af233613f0c4d9db59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.29",
+      "mac": "00:11:25:91:45:DF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:8C",
-      "mac": "172.24.9.29",
+      "ip": "172.24.9.29",
+      "mac": "00:11:25:C4:51:8C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-101.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:8D",
-      "mac": "172.24.136.29",
+      "ip": "172.24.136.29",
+      "mac": "00:11:25:C4:51:8D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 eb485f16bdbc14b163a9f038425333d59b2ed8df..0b2f4d0ecb521dfcbd9d642eb0e0be4d717dd217 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.30",
+      "mac": "00:11:25:91:49:61",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:DE",
-      "mac": "172.24.9.30",
+      "ip": "172.24.9.30",
+      "mac": "00:11:25:C4:4E:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-102.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:DF",
-      "mac": "172.24.136.30",
+      "ip": "172.24.136.30",
+      "mac": "00:11:25:C4:4E:DF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 378971eb42bfa616fb11f2d1a3b63b7ac292b0db..4a0b39ee68d31eb8eb3b5c414a162548f94b94f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.31",
+      "mac": "00:11:25:91:46:1D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:FC",
-      "mac": "172.24.9.31",
+      "ip": "172.24.9.31",
+      "mac": "00:11:25:C4:4E:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-103.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:FD",
-      "mac": "172.24.136.31",
+      "ip": "172.24.136.31",
+      "mac": "00:11:25:C4:4E:FD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 6444a9388d949abdbe94b3d641f81e78110ba22e..7464dd865a3b7a4732f7ae3d4c6fcec82de73774 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.32",
+      "mac": "00:11:25:91:47:78",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:4A",
-      "mac": "172.24.9.32",
+      "ip": "172.24.9.32",
+      "mac": "00:11:25:C4:52:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-104.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:4B",
-      "mac": "172.24.136.32",
+      "ip": "172.24.136.32",
+      "mac": "00:11:25:C4:52:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 eac99d4aba2182930f91c11df8d412d89f90c506..0fbd45731ea031f080fe4c9b27a63b05c6044188 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.33",
+      "mac": "00:11:25:91:49:14",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:0A",
-      "mac": "172.24.9.33",
+      "ip": "172.24.9.33",
+      "mac": "00:11:25:C4:4F:0A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-105.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:0B",
-      "mac": "172.24.136.33",
+      "ip": "172.24.136.33",
+      "mac": "00:11:25:C4:4F:0B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 76af8cd62925b5446ae3022b535dc20047ddb4b8..2cb294ad884092ae65619cfebaf649dd25fabdeb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.34",
+      "mac": "00:11:25:91:47:6A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C2",
-      "mac": "172.24.9.34",
+      "ip": "172.24.9.34",
+      "mac": "00:11:25:C4:4E:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-106.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C3",
-      "mac": "172.24.136.34",
+      "ip": "172.24.136.34",
+      "mac": "00:11:25:C4:4E:C3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 84ed113c39029dc74545de109999c8e891188d51..076e1f7df0c3bdc752c0a0de999f2edbc2d139d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.35",
+      "mac": "00:11:25:91:48:8A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:D2",
-      "mac": "172.24.9.35",
+      "ip": "172.24.9.35",
+      "mac": "00:11:25:C4:4E:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-107.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:D3",
-      "mac": "172.24.136.35",
+      "ip": "172.24.136.35",
+      "mac": "00:11:25:C4:4E:D3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f629fdfd2e39819d8a5d6797dd3d7a8b6805d9aa..5a3389bb58618a0c16e238afd7a6babbd4c63698 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.36",
+      "mac": "00:11:25:91:47:DC",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:BC",
-      "mac": "172.24.9.36",
+      "ip": "172.24.9.36",
+      "mac": "00:11:25:C4:51:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-108.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:BD",
-      "mac": "172.24.136.36",
+      "ip": "172.24.136.36",
+      "mac": "00:11:25:C4:51:BD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 abdcdee1cee772d28d35d53616d802a4d3501c35..f9b7975b053317b2c0863b908326ab99c7332afd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.1",
+      "mac": "00:11:25:91:45:F1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:22",
-      "mac": "172.24.10.1",
+      "ip": "172.24.10.1",
+      "mac": "00:11:25:C4:53:22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-109.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:23",
-      "mac": "172.24.137.1",
+      "ip": "172.24.137.1",
+      "mac": "00:11:25:C4:53:23",
       "management": false,
       "mountable": false,
       "mounted": false,
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 579af1881eca66b18d7c856259dc323b225475cb..5bb189989940233483d5cec05cb87414a4c1e862 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.11",
+      "mac": "00:11:25:91:48:EE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:3E",
-      "mac": "172.24.1.11",
+      "ip": "172.24.1.11",
+      "mac": "00:11:25:C4:34:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:3F",
-      "mac": "172.24.128.11",
+      "ip": "172.24.128.11",
+      "mac": "00:11:25:C4:34:3F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c899ccb660fd3a6e8d5174c959598e3264d9cfa4..08bc19a792eda63f8554fb56f903d132807552b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.2",
+      "mac": "00:11:25:91:45:DE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:A4",
-      "mac": "172.24.10.2",
+      "ip": "172.24.10.2",
+      "mac": "00:11:25:C4:51:A4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-110.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:A5",
-      "mac": "172.24.137.2",
+      "ip": "172.24.137.2",
+      "mac": "00:11:25:C4:51:A5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 95895d6a285fb62d1d8d6f8a7cf57f880fda5f37..df3f04280f339f9aff4e28b3eee961fab3a04aa8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.3",
+      "mac": "00:11:25:91:46:7C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:30",
-      "mac": "172.24.10.3",
+      "ip": "172.24.10.3",
+      "mac": "00:11:25:C4:50:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-111.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:31",
-      "mac": "172.24.137.3",
+      "ip": "172.24.137.3",
+      "mac": "00:11:25:C4:50:31",
       "management": false,
       "mountable": false,
       "mounted": false,
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 a6b510e58cd93abe547efae238b3bf11c428c301..ce9934b2551f3210736b3a4bb438716b24fda50e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.4",
+      "mac": "00:11:25:91:48:7F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C6",
-      "mac": "172.24.10.4",
+      "ip": "172.24.10.4",
+      "mac": "00:11:25:C4:4F:C6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-112.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C7",
-      "mac": "172.24.137.4",
+      "ip": "172.24.137.4",
+      "mac": "00:11:25:C4:4F:C7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 635a518f002ce205de34a374c19bbb89a5c28f62..cb22ca273cbab5a6fa6a08f52da19a29db4ea2d7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.5",
+      "mac": "00:11:25:91:45:9C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:48",
-      "mac": "172.24.10.5",
+      "ip": "172.24.10.5",
+      "mac": "00:11:25:C4:51:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-113.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:49",
-      "mac": "172.24.137.5",
+      "ip": "172.24.137.5",
+      "mac": "00:11:25:C4:51:49",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5c821e03b6be707c6dbd3cf0c34575beaccb9e88..9384bfda1e44744156e3a9f3e324432486a8a8f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.6",
+      "mac": "00:11:25:91:47:AA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:00",
-      "mac": "172.24.10.6",
+      "ip": "172.24.10.6",
+      "mac": "00:11:25:C4:53:00",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-114.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:01",
-      "mac": "172.24.137.6",
+      "ip": "172.24.137.6",
+      "mac": "00:11:25:C4:53:01",
       "management": false,
       "mountable": false,
       "mounted": false,
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 80a7fa399f65ff0666c394c8cfdd806b294f861a..15b1cde220e76b2ac0b8a36e1fc82d41498053f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.7",
+      "mac": "00:11:25:91:48:5C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:44",
-      "mac": "172.24.10.7",
+      "ip": "172.24.10.7",
+      "mac": "00:11:25:C4:4E:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-115.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:45",
-      "mac": "172.24.137.7",
+      "ip": "172.24.137.7",
+      "mac": "00:11:25:C4:4E:45",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ca8fb6221c6ed7882c71d6a774e3406a68d5b65f..a0ad9e1ce21459938a164c6db8903d97539bfca7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.8",
+      "mac": "00:11:25:91:45:BA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:A2",
-      "mac": "172.24.10.8",
+      "ip": "172.24.10.8",
+      "mac": "00:11:25:C4:52:A2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-116.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:A3",
-      "mac": "172.24.137.8",
+      "ip": "172.24.137.8",
+      "mac": "00:11:25:C4:52:A3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 442fd7a682d8af92fa2d7dda3ba2b4594c9afda4..e938727f6f9ebd49881d5e0c7e8c4a970f96a495 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.9",
+      "mac": "00:11:25:91:45:94",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:EC",
-      "mac": "172.24.10.9",
+      "ip": "172.24.10.9",
+      "mac": "00:11:25:C4:52:EC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-117.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:ED",
-      "mac": "172.24.137.9",
+      "ip": "172.24.137.9",
+      "mac": "00:11:25:C4:52:ED",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0802178b5562d53049616181363ef54ff12fb489..b8883875696cced4501be1169003f4bf1df9aaa0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.10",
+      "mac": "00:11:25:91:48:5B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:EA",
-      "mac": "172.24.10.10",
+      "ip": "172.24.10.10",
+      "mac": "00:11:25:C4:53:EA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-118.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:EB",
-      "mac": "172.24.137.10",
+      "ip": "172.24.137.10",
+      "mac": "00:11:25:C4:53:EB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 cadcb15bbdeee9c4e9d0b1f27ff23d75d3c309f8..06e88366efaeee0d70d875c65f0ae68418b498fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.11",
+      "mac": "00:11:25:91:46:15",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:AC",
-      "mac": "172.24.10.11",
+      "ip": "172.24.10.11",
+      "mac": "00:11:25:C4:51:AC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-119.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:AD",
-      "mac": "172.24.137.11",
+      "ip": "172.24.137.11",
+      "mac": "00:11:25:C4:51:AD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 05b16e985ce5e5f99710e8843e4fb30eb6d73d70..1858e7e72f598739cc9317e8424d2e11d18e61a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.12",
+      "mac": "00:11:25:91:45:B8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:42",
-      "mac": "172.24.1.12",
+      "ip": "172.24.1.12",
+      "mac": "00:11:25:C4:35:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:43",
-      "mac": "172.24.128.12",
+      "ip": "172.24.128.12",
+      "mac": "00:11:25:C4:35:43",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bcc334c77b2945f5a70f1825d1fa7b7115ea6796..bd28f7226abd3edf7c621017efe5ac4051b904b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.137.12",
+      "mac": "00:11:25:91:48:19",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:D2",
-      "mac": "172.24.10.12",
+      "ip": "172.24.10.12",
+      "mac": "00:11:25:C4:4F:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-120.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:D3",
-      "mac": "172.24.137.12",
+      "ip": "172.24.137.12",
+      "mac": "00:11:25:C4:4F:D3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 288869fbb8defaa1b125729428e250ebd81d7d59..fff4c54f6f8e80822148fa355be98f1a9d3f1fbd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.13",
+      "mac": "00:11:25:91:48:88",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:1A",
-      "mac": "172.24.11.13",
+      "ip": "172.24.11.13",
+      "mac": "00:11:25:C4:50:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-121.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:1B",
-      "mac": "172.24.138.13",
+      "ip": "172.24.138.13",
+      "mac": "00:11:25:C4:50:1B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 02f6e7f905925bd4fb3433aa9bca797fa1ead10b..8dc9a0b980415cca24b96b1f575f26e866655be7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.14",
+      "mac": "00:11:25:91:46:29",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:84",
-      "mac": "172.24.11.14",
+      "ip": "172.24.11.14",
+      "mac": "00:11:25:C4:4D:84",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-122.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:85",
-      "mac": "172.24.138.14",
+      "ip": "172.24.138.14",
+      "mac": "00:11:25:C4:4D:85",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bf782ae0edca39daa60e1b63c5563a6d582068aa..90cefe600a5e056a1da348b69e8bbdeff7400ec9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.15",
+      "mac": "00:11:25:91:45:F2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:B0",
-      "mac": "172.24.11.15",
+      "ip": "172.24.11.15",
+      "mac": "00:11:25:C4:4E:B0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-123.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:B1",
-      "mac": "172.24.138.15",
+      "ip": "172.24.138.15",
+      "mac": "00:11:25:C4:4E:B1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1bf193be9fd37242e6b414fbaf00f4ac51bada3d..4f1ca10a7e71369eb01374e4d0f2ebd77d35286c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.16",
+      "mac": "00:11:25:91:46:6D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:C8",
-      "mac": "172.24.11.16",
+      "ip": "172.24.11.16",
+      "mac": "00:11:25:C4:4D:C8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-124.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:C9",
-      "mac": "172.24.138.16",
+      "ip": "172.24.138.16",
+      "mac": "00:11:25:C4:4D:C9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3bc52cf3a2d3732c3f38c503f4c957f906c65538..1dc8ffdd52e84f3e77f309cc6e8e61a6ef64c4af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.17",
+      "mac": "00:11:25:91:46:45",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:F8",
-      "mac": "172.24.11.17",
+      "ip": "172.24.11.17",
+      "mac": "00:11:25:C4:51:F8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-125.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:F9",
-      "mac": "172.24.138.17",
+      "ip": "172.24.138.17",
+      "mac": "00:11:25:C4:51:F9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3f9d61486297f81f0f187f5d01b59a87331d2ad7..637567918b275caa4d471e09b63d3b1f09021c04 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.18",
+      "mac": "00:11:25:91:48:37",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:0E",
-      "mac": "172.24.11.18",
+      "ip": "172.24.11.18",
+      "mac": "00:11:25:C4:53:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-126.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
-      "switch_mac": "00:24:f9:3e:a7:42",
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:0F",
-      "mac": "172.24.138.18",
+      "ip": "172.24.138.18",
+      "mac": "00:11:25:C4:53:0F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e1a84530d93b45623dbdcac6020b356a2d13224d..36aa4243425d05f6f11382eaecef310e567bd5e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.19",
+      "mac": "00:11:25:91:46:88",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:94",
-      "mac": "172.24.11.19",
+      "ip": "172.24.11.19",
+      "mac": "00:11:25:C4:4D:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-127.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:95",
-      "mac": "172.24.138.19",
+      "ip": "172.24.138.19",
+      "mac": "00:11:25:C4:4D:95",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e89105c350becad6751daaef0836733b525758a5..dad37afa821aa369aa96ea3e50b863f467ccfb5f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.20",
+      "mac": "00:11:25:91:46:02",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:18",
-      "mac": "172.24.11.20",
+      "ip": "172.24.11.20",
+      "mac": "00:11:25:C4:53:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-128.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:19",
-      "mac": "172.24.138.20",
+      "ip": "172.24.138.20",
+      "mac": "00:11:25:C4:53:19",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c99962081d43b27bee0694e37f2005a443b8cbd9..a6132eb44ff9e93e10da63f0a605510cda9d4efc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.21",
+      "mac": "00:11:25:91:45:FB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:80",
-      "mac": "172.24.11.21",
+      "ip": "172.24.11.21",
+      "mac": "00:11:25:C4:4D:80",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-129.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:81",
-      "mac": "172.24.138.21",
+      "ip": "172.24.138.21",
+      "mac": "00:11:25:C4:4D:81",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c7a68286889c9e81bd0e315434b2fa91c96e890a..a3b29e5f47487102de589b6076a2edfe347edc3a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.13",
+      "mac": "00:11:25:91:48:02",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:48",
-      "mac": "172.24.2.13",
+      "ip": "172.24.2.13",
+      "mac": "00:11:25:C4:34:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:49",
-      "mac": "172.24.129.13",
+      "ip": "172.24.129.13",
+      "mac": "00:11:25:C4:34:49",
       "management": false,
       "mountable": false,
       "mounted": false,
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 700b4fa45988e0a176df847d00cb168ad14e0824..9731d8eed3eefe2a8f5cbc36cc1d87528c1d7b1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.22",
+      "mac": "00:11:25:91:45:A5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:6A",
-      "mac": "172.24.11.22",
+      "ip": "172.24.11.22",
+      "mac": "00:11:25:C4:54:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-130.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:6B",
-      "mac": "172.24.138.22",
+      "ip": "172.24.138.22",
+      "mac": "00:11:25:C4:54:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 57e99f7c156bd612250dee38d8d7aa4a360e8764..f0b5a841efe0bf6186bf6327c1092b3c7fd6f83c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.23",
+      "mac": "00:11:25:91:46:AA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:86",
-      "mac": "172.24.11.23",
+      "ip": "172.24.11.23",
+      "mac": "00:11:25:C4:54:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-131.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:87",
-      "mac": "172.24.138.23",
+      "ip": "172.24.138.23",
+      "mac": "00:11:25:C4:54:87",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4f47a23b5e46a76139437a9c63b501a1200a3ffe..6c8f58752977af92709c071801944923e42f2a9e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.138.24",
+      "mac": "00:11:25:91:47:E3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:58",
-      "mac": "172.24.11.24",
+      "ip": "172.24.11.24",
+      "mac": "00:11:25:C4:4E:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-132.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:59",
-      "mac": "172.24.138.24",
+      "ip": "172.24.138.24",
+      "mac": "00:11:25:C4:4E:59",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2964279ff9e412cb9e6e720c7d0afc660a020fa6..7b967f4d07ee203de2ac07e4fd605380c073e6ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.25",
+      "mac": "00:11:25:91:47:93",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:82",
-      "mac": "172.24.12.25",
+      "ip": "172.24.12.25",
+      "mac": "00:11:25:C4:4E:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-133.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:83",
-      "mac": "172.24.139.25",
+      "ip": "172.24.139.25",
+      "mac": "00:11:25:C4:4E:83",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ec5408d2bfcba07536f5fc7cffcfa9b72f50f10c..e19d626c6322e581063eecd781724129396372f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.26",
+      "mac": "00:11:25:91:48:1D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:4E",
-      "mac": "172.24.12.26",
+      "ip": "172.24.12.26",
+      "mac": "00:11:25:C4:4F:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-134.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:4F",
-      "mac": "172.24.139.26",
+      "ip": "172.24.139.26",
+      "mac": "00:11:25:C4:4F:4F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7f87fd4fde369d50b83fec6e9d82f7d22ae8c045..862b7ca2a82adfc7bf72d87f7407f79ac27ffb87 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.27",
+      "mac": "00:11:25:91:47:6B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:E6",
-      "mac": "172.24.12.27",
+      "ip": "172.24.12.27",
+      "mac": "00:11:25:C4:53:E6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-135.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:E7",
-      "mac": "172.24.139.27",
+      "ip": "172.24.139.27",
+      "mac": "00:11:25:C4:53:E7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 24f700db0d79e835bb9a54490265603f3fb7284a..852c0eca8abc18799554370800ab657491af154a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.28",
+      "mac": "00:11:25:91:48:A0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:40",
-      "mac": "172.24.12.28",
+      "ip": "172.24.12.28",
+      "mac": "00:11:25:C4:4D:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-136.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:41",
-      "mac": "172.24.139.28",
+      "ip": "172.24.139.28",
+      "mac": "00:11:25:C4:4D:41",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2ff46d6c130e6de62cb7dfa74bdeb99874e83c90..7b44973711be19ab818462fa66d55213c49fc24a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.29",
+      "mac": "00:11:25:91:45:C6",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E2",
-      "mac": "172.24.12.29",
+      "ip": "172.24.12.29",
+      "mac": "00:11:25:C4:4F:E2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-137.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E3",
-      "mac": "172.24.139.29",
+      "ip": "172.24.139.29",
+      "mac": "00:11:25:C4:4F:E3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 83a4d21b57e3870d06f45933a17bf6149e742d66..6a71636f53c9da22ef9bb08248c83ba47f7125e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.30",
+      "mac": "00:11:25:91:46:22",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:4A",
-      "mac": "172.24.12.30",
+      "ip": "172.24.12.30",
+      "mac": "00:11:25:C4:4D:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-138.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:4B",
-      "mac": "172.24.139.30",
+      "ip": "172.24.139.30",
+      "mac": "00:11:25:C4:4D:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 de572ea71ffb052c1d167e3e699f0b0f347a4686..ec0fef8559daab738533da9973579e4ddd817a97 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.31",
+      "mac": "00:11:25:91:45:CF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:DE",
-      "mac": "172.24.12.31",
+      "ip": "172.24.12.31",
+      "mac": "00:11:25:C4:38:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-139.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:DF",
-      "mac": "172.24.139.31",
+      "ip": "172.24.139.31",
+      "mac": "00:11:25:C4:38:DF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d3d880b2d910beb5c5ab73c98f19eb4c5db17906..6d8bf17fa5d84f1d2a1497e71eebc50d0c937e9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.14",
+      "mac": "00:11:25:91:48:91",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:3C",
-      "mac": "172.24.2.14",
+      "ip": "172.24.2.14",
+      "mac": "00:11:25:C4:34:3C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:3D",
-      "mac": "172.24.129.14",
+      "ip": "172.24.129.14",
+      "mac": "00:11:25:C4:34:3D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 dd26e15e1fe1588bf9c52031fff8c469b2bbc3aa..ea49b1d8b029cc774c41814d23952f183fc8af0f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.32",
+      "mac": "00:11:25:91:48:32",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:24:02",
-      "mac": "172.24.12.32",
+      "ip": "172.24.12.32",
+      "mac": "00:11:25:C4:24:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-140.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:24:03",
-      "mac": "172.24.139.32",
+      "ip": "172.24.139.32",
+      "mac": "00:11:25:C4:24:03",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5270a0c8b2ae2ba308d3cba2210f447e6e8b1ba2..95bc5f82b785cd3c0f9105d351c9bfecc5391a5d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.33",
+      "mac": "00:11:25:91:48:63",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:A8",
-      "mac": "172.24.12.33",
+      "ip": "172.24.12.33",
+      "mac": "00:11:25:C4:3F:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-141.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:A9",
-      "mac": "172.24.139.33",
+      "ip": "172.24.139.33",
+      "mac": "00:11:25:C4:3F:A9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9ec49dd8c2cda579789624fe4f992692d1b24416..ea3d011d67d433cea78831029a237f7662f699a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.34",
+      "mac": "00:11:25:91:46:41",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:D8",
-      "mac": "172.24.12.34",
+      "ip": "172.24.12.34",
+      "mac": "00:11:25:C4:4F:D8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-142.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:D9",
-      "mac": "172.24.139.34",
+      "ip": "172.24.139.34",
+      "mac": "00:11:25:C4:4F:D9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0c86c82dd2736135ef9dd5a232d8d0e632b2e06c..f65e06394a4aee225136e4f8279f6af4423b3d55 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.35",
+      "mac": "00:11:25:91:48:33",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AA",
-      "mac": "172.24.12.35",
+      "ip": "172.24.12.35",
+      "mac": "00:11:25:C4:4F:AA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-143.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AB",
-      "mac": "172.24.139.35",
+      "ip": "172.24.139.35",
+      "mac": "00:11:25:C4:4F:AB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 445fd3e68d296f274faa8008e0c461a6fe5e0a4e..b83f078095a9f97a664e38aec9d33d5c761b05a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Keeps restarting every 3 seconds.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.139.36",
+      "mac": "00:11:25:91:45:A6",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.204",
-      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_console_mac": "00:A0:9C:00:12:E4",
       "switch_ip": "172.26.120.154",
-      "switch_mac": "00:0f:b5:f5:79:2a",
+      "switch_mac": "00:0F:B5:F5:79:2A",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:0E",
-      "mac": "172.24.12.36",
+      "ip": "172.24.12.36",
+      "mac": "00:11:25:C4:50:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-144.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
-      "switch_mac": "00:12:00:4c:f5:c2",
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:0F",
-      "mac": "172.24.139.36",
+      "ip": "172.24.139.36",
+      "mac": "00:11:25:C4:50:0F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 026ca17677f864e1ea5809f063b6c06671dda534..dc59c8731eda0c724cffb6903fece5058e32a2c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.1",
+      "mac": "00:11:25:91:45:AD",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:20",
-      "mac": "172.24.13.1",
+      "ip": "172.24.13.1",
+      "mac": "00:11:25:C4:50:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-145.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:21",
-      "mac": "172.24.140.1",
+      "ip": "172.24.140.1",
+      "mac": "00:11:25:C4:50:21",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f3bd7e3b2eaee0340e95ee4e5f159dc299532363..226dd42ac67b8a9e0825bc61cff621721ca04bcd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.2",
+      "mac": "00:11:25:91:46:B4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:4C",
-      "mac": "172.24.13.2",
+      "ip": "172.24.13.2",
+      "mac": "00:11:25:C4:4D:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-146.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:4D",
-      "mac": "172.24.140.2",
+      "ip": "172.24.140.2",
+      "mac": "00:11:25:C4:4D:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b4d3084b1551d5f6f31a8610d13e8a51b91537c9..04352af91928b912080645e838366ba6fc03c90e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.3",
+      "mac": "00:11:25:91:47:22",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:FE",
-      "mac": "172.24.13.3",
+      "ip": "172.24.13.3",
+      "mac": "00:11:25:C4:4D:FE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-147.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:FF",
-      "mac": "172.24.140.3",
+      "ip": "172.24.140.3",
+      "mac": "00:11:25:C4:4D:FF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f194a9b89bea0294b2cf399f8a69237c09b9aa32..77e9c8c5bc1fd88c6ab99e786c5c475e4c08edc6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.4",
+      "mac": "00:11:25:91:47:FC",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:06",
-      "mac": "172.24.13.4",
+      "ip": "172.24.13.4",
+      "mac": "00:11:25:C4:51:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-148.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:07",
-      "mac": "172.24.140.4",
+      "ip": "172.24.140.4",
+      "mac": "00:11:25:C4:51:07",
       "management": false,
       "mountable": false,
       "mounted": false,
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 23dae73d70017fb427303775dcefbc404c4a93f8..c285bf114b2f71870101d6adbe0f928fa2e45b48 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.5",
+      "mac": "00:11:25:91:46:2C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C0",
-      "mac": "172.24.13.5",
+      "ip": "172.24.13.5",
+      "mac": "00:11:25:C4:4F:C0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-149.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C1",
-      "mac": "172.24.140.5",
+      "ip": "172.24.140.5",
+      "mac": "00:11:25:C4:4F:C1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8a789a5df66b3e229a268f9dbdf828e109161ac6..1c44ab189fbbd6c5559a8598c23fb080621d0d33 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.15",
+      "mac": "00:11:25:91:48:A2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:9B",
-      "mac": "172.24.2.15",
+      "ip": "172.24.2.15",
+      "mac": "00:11:25:C4:35:9B",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:9C",
-      "mac": "172.24.129.15",
+      "ip": "172.24.129.15",
+      "mac": "00:11:25:C4:35:9C",
       "management": false,
       "mountable": false,
       "mounted": false,
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 26e80703cdc9123b3c1a17da2df42625785cf669..8278b94520b38b25c25fffd69b778db806d4a347 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.6",
+      "mac": "00:11:25:91:47:B4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:02",
-      "mac": "172.24.13.6",
+      "ip": "172.24.13.6",
+      "mac": "00:11:25:C4:4F:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-150.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:03",
-      "mac": "172.24.140.6",
+      "ip": "172.24.140.6",
+      "mac": "00:11:25:C4:4F:03",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3515ab5e66ccc904647b40f708b9c213eee385e5..8ee75890d8d4fc5a3f062a39ce92213b094edcf9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.7",
+      "mac": "00:11:25:91:45:9D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:78",
-      "mac": "172.24.13.7",
+      "ip": "172.24.13.7",
+      "mac": "00:11:25:C4:53:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-151.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:79",
-      "mac": "172.24.140.7",
+      "ip": "172.24.140.7",
+      "mac": "00:11:25:C4:53:79",
       "management": false,
       "mountable": false,
       "mounted": false,
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 256594e6e0d67b09435e9a35740fb25b1594f0a9..c87b7e0af65ee7f0441266279ae25bc9ff637262 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.8",
+      "mac": "00:11:25:91:49:23",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:B6",
-      "mac": "172.24.13.8",
+      "ip": "172.24.13.8",
+      "mac": "00:11:25:C4:50:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-152.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:B7",
-      "mac": "172.24.140.8",
+      "ip": "172.24.140.8",
+      "mac": "00:11:25:C4:50:B7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 281bc53cb5ebfcaf6177bc6cf7132f71418bc0f9..ebbf7fca115f4270ed40c5ce69c255758ab4e763 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.9",
+      "mac": "00:11:25:91:46:07",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A8",
-      "mac": "172.24.13.9",
+      "ip": "172.24.13.9",
+      "mac": "00:11:25:C4:50:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-153.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A9",
-      "mac": "172.24.140.9",
+      "ip": "172.24.140.9",
+      "mac": "00:11:25:C4:50:A9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d3200722590c28c581cd8bf0a29f4edbfc37e117..ee4710cccbb66570f49b50c8fd6fb00121217067 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.10",
+      "mac": "00:11:25:91:46:DE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:2A",
-      "mac": "172.24.13.10",
+      "ip": "172.24.13.10",
+      "mac": "00:11:25:C4:4D:2A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-154.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:2B",
-      "mac": "172.24.140.10",
+      "ip": "172.24.140.10",
+      "mac": "00:11:25:C4:4D:2B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 69a0d71da926eb08ca901ccb1fab2ef72f67b415..9e37480700569ab07f90bfdb3d113f759a1eaead 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.11",
+      "mac": "00:11:25:91:48:BA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A2",
-      "mac": "172.24.13.11",
+      "ip": "172.24.13.11",
+      "mac": "00:11:25:C4:50:A2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-155.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A3",
-      "mac": "172.24.140.11",
+      "ip": "172.24.140.11",
+      "mac": "00:11:25:C4:50:A3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8add03fcd71c80c53f8f7d773631d7f13c99911f..fcd7477c6a8947e692903b5d5107995c8f1d97d7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.140.12",
+      "mac": "00:11:25:91:48:76",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:0B:06",
-      "mac": "172.24.13.12",
+      "ip": "172.24.13.12",
+      "mac": "00:11:25:C4:0B:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-156.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:0B:07",
-      "mac": "172.24.140.12",
+      "ip": "172.24.140.12",
+      "mac": "00:11:25:C4:0B:07",
       "management": false,
       "mountable": false,
       "mounted": false,
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 56423fec1a9328acfcb9e2b68d2e75faa418a0c7..89979c413876f3ab582bd9b4e7d76a5fbd240492 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.13",
+      "mac": "00:11:25:91:47:71",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:CA",
-      "mac": "172.24.14.13",
+      "ip": "172.24.14.13",
+      "mac": "00:11:25:C4:52:CA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-157.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:CB",
-      "mac": "172.24.141.13",
+      "ip": "172.24.141.13",
+      "mac": "00:11:25:C4:52:CB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 07b450ec6a07c2c5258a3d180dfb3e6e1e4d3879..47d0d84ca1129049842ee42512e6609423fb0b3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.14",
+      "mac": "00:11:25:91:46:B3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:46",
-      "mac": "172.24.14.14",
+      "ip": "172.24.14.14",
+      "mac": "00:11:25:C4:54:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-158.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:47",
-      "mac": "172.24.141.14",
+      "ip": "172.24.141.14",
+      "mac": "00:11:25:C4:54:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 545f14e703bf6547bca38ad92edeed3cb4cf21d9..4d67f14f1866bf2e7bbc28bea4c1b8e0b5bc1696 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.15",
+      "mac": "00:11:25:91:48:0D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:82",
-      "mac": "172.24.14.15",
+      "ip": "172.24.14.15",
+      "mac": "00:11:25:C4:4F:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-159.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:83",
-      "mac": "172.24.141.15",
+      "ip": "172.24.141.15",
+      "mac": "00:11:25:C4:4F:83",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ac5c1ecf5d7c6d870c3b21899810ba87ec5065e9..78299b20f6ddd7b3b31d5e42eb2cce12609d72b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.16",
+      "mac": "00:11:25:91:45:8E",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2E:CE",
-      "mac": "172.24.2.16",
+      "ip": "172.24.2.16",
+      "mac": "00:11:25:C4:2E:CE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2E:CF",
-      "mac": "172.24.129.16",
+      "ip": "172.24.129.16",
+      "mac": "00:11:25:C4:2E:CF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f3af39af857041bf96459e1b02984a2c04569c94..65dacd940def6f38922268ab55d589258c1074b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.16",
+      "mac": "00:11:25:91:46:8D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:3A",
-      "mac": "172.24.14.16",
+      "ip": "172.24.14.16",
+      "mac": "00:11:25:C4:4F:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-160.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:3B",
-      "mac": "172.24.141.16",
+      "ip": "172.24.141.16",
+      "mac": "00:11:25:C4:4F:3B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8d86c5b1c9efc31d630601df12532a049f4c4949..eca63b04e5ad516b5dd020c8af0298ffb1e2cebf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.17",
+      "mac": "00:11:25:91:48:B8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:8E",
-      "mac": "172.24.14.17",
+      "ip": "172.24.14.17",
+      "mac": "00:11:25:C4:4F:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-161.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:8F",
-      "mac": "172.24.141.17",
+      "ip": "172.24.141.17",
+      "mac": "00:11:25:C4:4F:8F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1f96a382200a0ddda732ed830e711c41100b9c92..87d2d0dc09639f38e65945b298f38fcf48c1256c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.18",
+      "mac": "00:11:25:91:45:FE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:B8",
-      "mac": "172.24.14.18",
+      "ip": "172.24.14.18",
+      "mac": "00:11:25:C4:4E:B8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-162.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.118",
-      "switch_mac": "nil",
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:B9",
-      "mac": "172.24.141.18",
+      "ip": "172.24.141.18",
+      "mac": "00:11:25:C4:4E:B9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2d3b2d596ffc82e4b3578a6c9fa6616b1864575e..3ef53ad7c914769651f0fff912fa88a61825dbe4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.19",
+      "mac": "00:11:25:91:48:34",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:c4:50:86",
-      "mac": "172.24.14.19",
+      "ip": "172.24.14.19",
+      "mac": "00:11:25:C4:50:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-163.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:c4:50:06",
-      "mac": "172.24.141.19",
+      "ip": "172.24.141.19",
+      "mac": "00:11:25:C4:50:06",
       "management": false,
       "mountable": false,
       "mounted": false,
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 402554a950fc80b9eac86479d3020b13e94b50c3..77c864c4144f58c17d30ce68fc0db21728c4757b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.20",
+      "mac": "00:11:25:91:47:AE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:A0",
-      "mac": "172.24.14.20",
+      "ip": "172.24.14.20",
+      "mac": "00:11:25:C4:53:A0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-164.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:A1",
-      "mac": "172.24.141.20",
+      "ip": "172.24.141.20",
+      "mac": "00:11:25:C4:53:A1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ecb72631ce9fcd8bb4b70fb7bdef306a421ee2c2..7b37e3cf9aafb2955e62db223c1afac63d6bcc6b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.21",
+      "mac": "00:11:25:91:45:D0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:6A",
-      "mac": "172.24.14.21",
+      "ip": "172.24.14.21",
+      "mac": "00:11:25:C4:4D:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-165.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:6B",
-      "mac": "172.24.141.21",
+      "ip": "172.24.141.21",
+      "mac": "00:11:25:C4:4D:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 aa5ebdee4111a3ee3c2ba2b6e3dee1b8f348c039..04775952f51e456ccfd446f7d6dec5c7fc1b48f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.22",
+      "mac": "00:11:25:91:47:5C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "changée",
-      "mac": "{",
+      "ip": "172.24.14.22",
+      "mac": "00:11:25:C4:04:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-166.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:91",
-      "mac": "172.24.141.22",
+      "ip": "172.24.141.22",
+      "mac": "00:11:25:C4:3A:91",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8d9b7af0b2d355b56de279403a493512aad2d028..18ad2c64297ce7d87a8ad5e8632271ef392cd3f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.23",
+      "mac": "00:11:25:91:46:9C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:02",
-      "mac": "172.24.14.23",
+      "ip": "172.24.14.23",
+      "mac": "00:11:25:C4:50:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-167.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:03",
-      "mac": "172.24.141.23",
+      "ip": "172.24.141.23",
+      "mac": "00:11:25:C4:50:03",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1152cd5cb7afacae9eaa98ee3b6a3608adc50945..b3222d2f7642cc0d9209cb5ab7f446da26c20ee2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.141.24",
+      "mac": "00:11:25:91:49:17",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:4C",
-      "mac": "172.24.14.24",
+      "ip": "172.24.14.24",
+      "mac": "00:11:25:C4:54:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-168.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:4D",
-      "mac": "172.24.141.24",
+      "ip": "172.24.141.24",
+      "mac": "00:11:25:C4:54:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e13804dc972a9a2d55a9dcdbd7337c61b4bd5488..75cfab42acd78c157660840ae61ca4d8b45db0ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.25",
+      "mac": "00:11:25:91:48:F0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:45:B0",
-      "mac": "172.24.15.25",
+      "ip": "172.24.15.25",
+      "mac": "00:11:25:C4:45:B0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-169.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:45:B1",
-      "mac": "172.24.142.25",
+      "ip": "172.24.142.25",
+      "mac": "00:11:25:C4:45:B1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3014a0f5dba5cfee23ef07f66982b75a5d908791..ab82de14a9ea5e05f01d2a0aab5099e1e035c844 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.17",
+      "mac": "00:11:25:91:49:4A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:56",
-      "mac": "172.24.2.17",
+      "ip": "172.24.2.17",
+      "mac": "00:11:25:C4:34:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:57",
-      "mac": "172.24.129.17",
+      "ip": "172.24.129.17",
+      "mac": "00:11:25:C4:34:57",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2fcb90460f0d331be42768f7118e86a6f73278e0..7d540f1dd0f324da168ff4b0bbabf38d391927cc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.26",
+      "mac": "00:11:25:91:48:3D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:00",
-      "mac": "172.24.15.26",
+      "ip": "172.24.15.26",
+      "mac": "00:11:25:C4:4D:00",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-170.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:01",
-      "mac": "172.24.142.26",
+      "ip": "172.24.142.26",
+      "mac": "00:11:25:C4:4D:01",
       "management": false,
       "mountable": false,
       "mounted": false,
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 639ae62938b9c3dca6729974f381927aaee0da8e..9fcac932fada7746f6997fee53815a7c73cffdca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.27",
+      "mac": "00:11:25:91:45:FC",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:08",
-      "mac": "172.24.15.27",
+      "ip": "172.24.15.27",
+      "mac": "00:11:25:C4:4D:08",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-171.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:09",
-      "mac": "172.24.142.27",
+      "ip": "172.24.142.27",
+      "mac": "00:11:25:C4:4D:09",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d520fda8b58ac717207270aaf086fed918eb0410..5a89b057fdcb83cb5e257829b19c9f0cf093276d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.28",
+      "mac": "00:11:25:91:45:92",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:18",
-      "mac": "172.24.15.28",
+      "ip": "172.24.15.28",
+      "mac": "00:11:25:C4:54:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-172.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:19",
-      "mac": "172.24.142.28",
+      "ip": "172.24.142.28",
+      "mac": "00:11:25:C4:54:19",
       "management": false,
       "mountable": false,
       "mounted": false,
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 cd7228fc8d07a6b9c3cb3d88e2788c5e0f924e20..e44788c3b3d8fa2e30f106592d2619f29febc62e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.29",
+      "mac": "00:11:25:91:45:EA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:DA",
-      "mac": "172.24.15.29",
+      "ip": "172.24.15.29",
+      "mac": "00:11:25:C4:51:DA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-173.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:DB",
-      "mac": "172.24.142.29",
+      "ip": "172.24.142.29",
+      "mac": "00:11:25:C4:51:DB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e6e018ba7fd9a37814e6cf3e3545dfc233ba0377..f041ab36980969911d55d815f821274050fd8f23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.30",
+      "mac": "00:11:25:91:45:FA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:46",
-      "mac": "172.24.15.30",
+      "ip": "172.24.15.30",
+      "mac": "00:11:25:C4:4F:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-174.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:47",
-      "mac": "172.24.142.30",
+      "ip": "172.24.142.30",
+      "mac": "00:11:25:C4:4F:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8313dc31ab5ecdb844e6e552a8e69174b0add43d..529c6a14d8bef67b7bba7da12c23a84c32d80948 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.31",
+      "mac": "00:11:25:91:48:EB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AC",
-      "mac": "172.24.15.31",
+      "ip": "172.24.15.31",
+      "mac": "00:11:25:C4:4F:AC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-175.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AD",
-      "mac": "172.24.142.31",
+      "ip": "172.24.142.31",
+      "mac": "00:11:25:C4:4F:AD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 99510a66305151b9972cb44ccfb9d10b15e682d2..54cdfb45930271952a6ef2b0f6bae229638dc24d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.32",
+      "mac": "00:11:25:91:48:EA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:CA",
-      "mac": "172.24.15.32",
+      "ip": "172.24.15.32",
+      "mac": "00:11:25:C4:4F:CA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-176.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:CB",
-      "mac": "172.24.142.32",
+      "ip": "172.24.142.32",
+      "mac": "00:11:25:C4:4F:CB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f207c3cf30aab70a779e27e28437c93893da0689..6e073333c4c73c8e1b635e694fbd6d663f54029e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.33",
+      "mac": "00:11:25:91:47:8B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C4",
-      "mac": "172.24.15.33",
+      "ip": "172.24.15.33",
+      "mac": "00:11:25:C4:4F:C4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-177.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:C5",
-      "mac": "172.24.142.33",
+      "ip": "172.24.142.33",
+      "mac": "00:11:25:C4:4F:C5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d2017f8a48a741f8ad714349b648f3206de72c88..8a99a7191b0b0a972185454a4047aa656a16b3e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.34",
+      "mac": "00:11:25:91:45:C7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:0A",
-      "mac": "172.24.15.34",
+      "ip": "172.24.15.34",
+      "mac": "00:11:25:C4:50:0A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-178.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:0B",
-      "mac": "172.24.142.34",
+      "ip": "172.24.142.34",
+      "mac": "00:11:25:C4:50:0B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b73362214d028d91ca17659916fd35e18a25e62d..4c41345c6a16a9ec10a2c5083dacca3b07c57de7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.35",
+      "mac": "00:11:25:91:46:14",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:76",
-      "mac": "172.24.15.35",
+      "ip": "172.24.15.35",
+      "mac": "00:11:25:C4:50:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-179.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:77",
-      "mac": "172.24.142.35",
+      "ip": "172.24.142.35",
+      "mac": "00:11:25:C4:50:77",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1b3879a99ed16cd68bc456b7ca180289b5c5dde9..2b8ea26b2545df8d09869aa4a09b5c1605e0918e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.18",
+      "mac": "00:11:25:91:48:AF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:7A",
-      "mac": "172.24.2.18",
+      "ip": "172.24.2.18",
+      "mac": "00:11:25:C4:35:7A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:7B",
-      "mac": "172.24.129.18",
+      "ip": "172.24.129.18",
+      "mac": "00:11:25:C4:35:7B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 a2e759db46c616f815885ac51216f74a5010c76d..f770c3544cf2b81bcc0b46e4ecfa48346a9a8d6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.142.36",
+      "mac": "00:11:25:91:45:8F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.205",
-      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_console_mac": "00:A0:9C:00:10:AE",
       "switch_ip": "172.26.120.155",
-      "switch_mac": "00:0f:b5:fb:70:a5",
+      "switch_mac": "00:0F:B5:FB:70:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E6",
-      "mac": "172.24.15.36",
+      "ip": "172.24.15.36",
+      "mac": "00:11:25:C4:4F:E6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E7",
-      "mac": "172.24.142.36",
+      "ip": "172.24.142.36",
+      "mac": "00:11:25:C4:4F:E7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1dff12d6680ef0bf4af9a0c72f50132c5671c460..47e12e672f3d5ed77610bce780e80b98b0fc888b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.1",
+      "mac": "00:11:25:91:45:DD",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-181-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:4A",
-      "mac": "172.24.16.1",
+      "ip": "172.24.16.1",
+      "mac": "00:11:25:C4:53:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-181.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:4B",
-      "mac": "172.24.143.1",
+      "ip": "172.24.143.1",
+      "mac": "00:11:25:C4:53:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 04b579c086c83d68f406102924d5291ad4135600..2c404a4163e4a083bc51e547ccfd586e7896d852 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.2",
+      "mac": "00:11:25:91:47:A0",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-182-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:88",
-      "mac": "172.24.16.2",
+      "ip": "172.24.16.2",
+      "mac": "00:11:25:C4:52:88",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-182.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:89",
-      "mac": "172.24.143.2",
+      "ip": "172.24.143.2",
+      "mac": "00:11:25:C4:52:89",
       "management": false,
       "mountable": false,
       "mounted": false,
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 84ca33969967c104c5bfe26a6e7eed7050e1b5c3..ad241e0250307aad185b95768f4dd5a2bfb215cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.3",
+      "mac": "00:11:25:91:47:91",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-183-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:5E",
-      "mac": "172.24.16.3",
+      "ip": "172.24.16.3",
+      "mac": "00:11:25:C4:4F:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-183.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:5F",
-      "mac": "172.24.143.3",
+      "ip": "172.24.143.3",
+      "mac": "00:11:25:C4:4F:5F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 61c4ce5e89c0b52763614d7ed093c5dd7462c146..9c538ac5ce6b0b8707f090666f5979c653d79fc6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.4",
+      "mac": "00:11:25:91:46:3B",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-184-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:08",
-      "mac": "172.24.16.4",
+      "ip": "172.24.16.4",
+      "mac": "00:11:25:C4:4E:08",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-184.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:09",
-      "mac": "172.24.143.4",
+      "ip": "172.24.143.4",
+      "mac": "00:11:25:C4:4E:09",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d0e82589585e3b9a9c348820277c3866cdad68da..47fd665918986c01e1853eb028b235470d02bc90 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.5",
+      "mac": "00:11:25:91:46:A0",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-185-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:B6",
-      "mac": "172.24.16.5",
+      "ip": "172.24.16.5",
+      "mac": "00:11:25:C4:53:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-185.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:B7",
-      "mac": "172.24.143.5",
+      "ip": "172.24.143.5",
+      "mac": "00:11:25:C4:53:B7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 083de6e2d0bb650176eb8eb85f99cb72ca0368ef..ef6e7fa960ca53f234404f7871b60b19344ab71d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.6",
+      "mac": "00:11:25:91:47:F6",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-186-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:48",
-      "mac": "172.24.16.6",
+      "ip": "172.24.16.6",
+      "mac": "00:11:25:C4:4E:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-186.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:49",
-      "mac": "172.24.143.6",
+      "ip": "172.24.143.6",
+      "mac": "00:11:25:C4:4E:49",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9283737dcec53b0d626238b907ce886b5cf50fa9..4ae38f7fdeba4899ab972ad67fbb23f67d5a54fb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.7",
+      "mac": "00:11:25:91:48:58",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-187-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:70",
-      "mac": "172.24.16.7",
+      "ip": "172.24.16.7",
+      "mac": "00:11:25:C4:4E:70",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-187.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:71",
-      "mac": "172.24.143.7",
+      "ip": "172.24.143.7",
+      "mac": "00:11:25:C4:4E:71",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d0e5ce9e0b655d92b4bb5e2ca2184bd830d33744..a350a72f289ba3565d1376be7db8074057f559de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.8",
+      "mac": "00:11:25:91:47:30",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-188-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:4E",
-      "mac": "172.24.16.8",
+      "ip": "172.24.16.8",
+      "mac": "00:11:25:C4:52:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-188.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:4F",
-      "mac": "172.24.143.8",
+      "ip": "172.24.143.8",
+      "mac": "00:11:25:C4:52:4F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 82cf8e11fa95f05f7e7422404931c9f9ea4ab5ce..149caac275734d59e235124a85b49cee196cfbad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.9",
+      "mac": "00:11:25:91:48:5F",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-189-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:46",
-      "mac": "172.24.16.9",
+      "ip": "172.24.16.9",
+      "mac": "00:11:25:C4:52:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-189.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:47",
-      "mac": "172.24.143.9",
+      "ip": "172.24.143.9",
+      "mac": "00:11:25:C4:52:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2f9efbaa26effe211b21b442701a27be4e3f27e4..0f1080a8e8a86e90d7c035a574d3a170e6ea1e13 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.19",
+      "mac": "00:11:25:91:49:55",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4C",
-      "mac": "172.24.2.19",
+      "ip": "172.24.2.19",
+      "mac": "00:11:25:C4:34:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4D",
-      "mac": "172.24.129.19",
+      "ip": "172.24.129.19",
+      "mac": "00:11:25:C4:34:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3405de19521496521301fa6410a75b293533d4df..43fa886f1bc987881137ab9743e0e0769b57d4da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,37 +15,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.10",
+      "mac": "00:11:25:91:48:11",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-190-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:34",
-      "mac": "172.24.16.10",
+      "ip": "172.24.16.10",
+      "mac": "00:11:25:C4:4E:34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-190.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:35",
-      "mac": "172.24.143.10",
+      "ip": "172.24.143.10",
+      "mac": "00:11:25:C4:4E:35",
       "management": false,
       "mountable": false,
       "mounted": false,
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 295784309c3592024029df76f3c4673ed19e230e..6bea99ce4a614a0323988ad58db304fcefb0388a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.11",
+      "mac": "00:11:25:91:49:4D",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-191-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:3A",
-      "mac": "172.24.16.11",
+      "ip": "172.24.16.11",
+      "mac": "00:11:25:C4:4E:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-191.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:3B",
-      "mac": "172.24.143.11",
+      "ip": "172.24.143.11",
+      "mac": "00:11:25:C4:4E:3B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 36131f20bd830862565eb915a40a4e0a59bfc059..f6982952f1fe65c9664911196b43b635e9c2c9c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.143.12",
+      "mac": "00:11:25:91:47:56",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-192-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:A8",
-      "mac": "172.24.16.12",
+      "ip": "172.24.16.12",
+      "mac": "00:11:25:C4:4E:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-192.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:A9",
-      "mac": "172.24.143.12",
+      "ip": "172.24.143.12",
+      "mac": "00:11:25:C4:4E:A9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e98332264d339beb1ea536c0cb2eb35cfd945da1..cb07448cb2ffd03e4621c62ee50db6563c6ff8f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.13",
+      "mac": "00:11:25:91:49:12",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-193-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:14",
-      "mac": "172.24.17.13",
+      "ip": "172.24.17.13",
+      "mac": "00:11:25:C4:4E:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-193.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:15",
-      "mac": "172.24.144.13",
+      "ip": "172.24.144.13",
+      "mac": "00:11:25:C4:4E:15",
       "management": false,
       "mountable": false,
       "mounted": false,
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 6d3af03515f44bd772d4003e45180a27f3d9e212..a4b7a883af3a7651f5099d8cc56d112800502477 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.14",
+      "mac": "00:11:25:91:47:74",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-194-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:D0",
-      "mac": "172.24.17.14",
+      "ip": "172.24.17.14",
+      "mac": "00:11:25:C4:52:D0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-194.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:D1",
-      "mac": "172.24.144.14",
+      "ip": "172.24.144.14",
+      "mac": "00:11:25:C4:52:D1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c3293d849ecf862ebf36bced0a283062e03af4f0..d166dd75baece7ae7f288475ba8c3625a59ef22f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.15",
+      "mac": "00:11:25:91:47:F5",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-195-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:D4",
-      "mac": "172.24.17.15",
+      "ip": "172.24.17.15",
+      "mac": "00:11:25:C4:38:D4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-195.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:D5",
-      "mac": "172.24.144.15",
+      "ip": "172.24.144.15",
+      "mac": "00:11:25:C4:38:D5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 57f349e37413d1df29a0f9c2ea44f7e713b2ad4d..33cbbb01f592398ed3715b0d3c7fbaebdf62e450 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.16",
+      "mac": "00:11:25:91:45:7B",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-196-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E4",
-      "mac": "172.24.17.16",
+      "ip": "172.24.17.16",
+      "mac": "00:11:25:C4:4F:E4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-196.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:E5",
-      "mac": "172.24.144.16",
+      "ip": "172.24.144.16",
+      "mac": "00:11:25:C4:4F:E5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 acf7eded07136a75c8b106011ac92eed727f3898..f9afd01965c48026c7719ca8995df32e3b397742 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.17",
+      "mac": "00:11:25:91:45:F9",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-197-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:72",
-      "mac": "172.24.17.17",
+      "ip": "172.24.17.17",
+      "mac": "00:11:25:C4:51:72",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-197.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:73",
-      "mac": "172.24.144.17",
+      "ip": "172.24.144.17",
+      "mac": "00:11:25:C4:51:73",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f0456c2c505e14ad5661b67abe774289e07cc813..6fe10877121c6f2cbe7d6f609791112c2734bd34 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.18",
+      "mac": "00:11:25:91:48:95",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-198-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C8",
-      "mac": "172.24.17.18",
+      "ip": "172.24.17.18",
+      "mac": "00:11:25:C4:4E:C8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-198.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": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C9",
-      "mac": "172.24.144.18",
+      "ip": "172.24.144.18",
+      "mac": "00:11:25:C4:4E:C9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 da8961cc803fe8aa597d0fc67abded5c327c9047..1cb466d89e0163419837d130f2c6159acbe67449 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.19",
+      "mac": "00:11:25:91:48:99",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-199-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:CC",
-      "mac": "172.24.17.19",
+      "ip": "172.24.17.19",
+      "mac": "00:11:25:C4:4E:CC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-199.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:CD",
-      "mac": "172.24.144.19",
+      "ip": "172.24.144.19",
+      "mac": "00:11:25:C4:4E:CD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 08b3d0d867964cc93e9233df8e0d21f016fb7a56..2d435c1026041ef8fd5b3004d3f4dd39e46db5be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -9,31 +9,13 @@
     "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": null,
-      "mac": null,
+      "ip": "172.26.128.2",
+      "mac": "00:11:25:91:48:A7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -44,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:56",
-      "mac": "172.24.1.2",
+      "ip": "172.24.1.2",
+      "mac": "00:11:25:C4:35:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:57",
-      "mac": "172.24.128.2",
+      "ip": "172.24.128.2",
+      "mac": "00:11:25:C4:35:57",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8caffd402b22ed6ff5406a0948f7e1f25d11640b..0610900e2dadbbe25a689762febcba5c391a9447 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.20",
+      "mac": "00:11:25:91:45:7C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:52",
-      "mac": "172.24.2.20",
+      "ip": "172.24.2.20",
+      "mac": "00:11:25:C4:35:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:53",
-      "mac": "172.24.129.20",
+      "ip": "172.24.129.20",
+      "mac": "00:11:25:C4:35:53",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2c23fd537e25997bb32c2501f931100c67a55b0c..add60d17cf7aa819bc06657927642b6bf3b53e43 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.20",
+      "mac": "00:11:25:91:47:C9",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-200-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:D2",
-      "mac": "172.24.17.20",
+      "ip": "172.24.17.20",
+      "mac": "00:11:25:C4:50:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-200.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:D3",
-      "mac": "172.24.144.20",
+      "ip": "172.24.144.20",
+      "mac": "00:11:25:C4:50:D3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 85433f888b13d7698697327311b8dce181a36806..352546a9aa4c0f9abc098346382407e167dcd0e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.21",
+      "mac": "00:11:25:91:47:A2",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-201-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:B2",
-      "mac": "172.24.17.21",
+      "ip": "172.24.17.21",
+      "mac": "00:11:25:C4:51:B2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-201.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:B3",
-      "mac": "172.24.144.21",
+      "ip": "172.24.144.21",
+      "mac": "00:11:25:C4:51:B3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9261baca638516b7b427fa680fa95527d4aeac3f..c135a7a11633b01a4a975a4ea2dba96ccd8e684e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.22",
+      "mac": "00:11:25:91:47:A8",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-202-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:F8",
-      "mac": "172.24.17.22",
+      "ip": "172.24.17.22",
+      "mac": "00:11:25:C4:53:F8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-202.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:F9",
-      "mac": "172.24.144.22",
+      "ip": "172.24.144.22",
+      "mac": "00:11:25:C4:53:F9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 89a501902f325d205f6aaa698cbb582bcf2294b3..16653a06bb5a7c1c048fa9cf448e2eb9426ac607 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.23",
+      "mac": "00:11:25:91:45:F5",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-203-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4C:FC",
-      "mac": "172.24.17.23",
+      "ip": "172.24.17.23",
+      "mac": "00:11:25:C4:4C:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-203.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4C:FD",
-      "mac": "172.24.144.23",
+      "ip": "172.24.144.23",
+      "mac": "00:11:25:C4:4C:FD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 64710b37954244d874265b597ba9693a764e9e4e..7df0fea4899e081ea7f04626e7331de5877719ee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.144.24",
+      "mac": "00:11:25:91:46:16",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-204-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:04",
-      "mac": "172.24.17.24",
+      "ip": "172.24.17.24",
+      "mac": "00:11:25:C4:4F:04",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-204.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:05",
-      "mac": "172.24.144.24",
+      "ip": "172.24.144.24",
+      "mac": "00:11:25:C4:4F:05",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3a8f0f2b435df0a4406eb68f624d7e89242c16d3..5df3fbd1b065cd527f3bea315195a05b54289932 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.25",
+      "mac": "00:11:25:91:47:95",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-205-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:14",
-      "mac": "172.24.18.25",
+      "ip": "172.24.18.25",
+      "mac": "00:11:25:C4:4F:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-205.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:15",
-      "mac": "172.24.145.25",
+      "ip": "172.24.145.25",
+      "mac": "00:11:25:C4:4F:15",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8db75f63e52b62afe9ae704f4ee4eae504e91a6d..e223551f307e4a25d4dc3b46a234af1d77f5eb14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.26",
+      "mac": "00:11:25:91:46:54",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-206-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:64",
-      "mac": "172.24.18.26",
+      "ip": "172.24.18.26",
+      "mac": "00:11:25:C4:52:64",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-206.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:52:65",
-      "mac": "172.24.145.26",
+      "ip": "172.24.145.26",
+      "mac": "00:11:25:C4:52:65",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bc6929ccdc619b945229b2e344ba6de3e258f4f1..6914f07fc6241836e7ce8c99f907e74a68a87b06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.27",
+      "mac": "00:11:25:91:48:D5",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-207-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:B4",
-      "mac": "172.24.18.27",
+      "ip": "172.24.18.27",
+      "mac": "00:11:25:C4:4F:B4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-207.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:B5",
-      "mac": "172.24.145.27",
+      "ip": "172.24.145.27",
+      "mac": "00:11:25:C4:4F:B5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8d7a80e1f548f5296a734d15b42f1c92422a7b04..d07c90136051c1cc95a929bebad49594fc32c74f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.28",
+      "mac": "00:11:25:91:46:7D",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-208-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AE",
-      "mac": "172.24.18.28",
+      "ip": "172.24.18.28",
+      "mac": "00:11:25:C4:4F:AE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-208.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:AF",
-      "mac": "172.24.145.28",
+      "ip": "172.24.145.28",
+      "mac": "00:11:25:C4:4F:AF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 54732dc38682804515967061e34e6c931e61c489..a635e85fcb16a498cb2efd68cb59095ac2325b52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.29",
+      "mac": "00:11:25:91:45:82",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-209-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C4",
-      "mac": "172.24.18.29",
+      "ip": "172.24.18.29",
+      "mac": "00:11:25:C4:4E:C4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-209.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:C5",
-      "mac": "172.24.145.29",
+      "ip": "172.24.145.29",
+      "mac": "00:11:25:C4:4E:C5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2092e5ad1c05123fd65221ab941fc3fa4c7c0b5d..b2ebc3d53b4055bdf8f65358ee5e6007dea69a92 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.21",
+      "mac": "00:11:25:91:47:F8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A8",
-      "mac": "172.24.2.21",
+      "ip": "172.24.2.21",
+      "mac": "00:11:25:C4:35:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A9",
-      "mac": "172.24.129.21",
+      "ip": "172.24.129.21",
+      "mac": "00:11:25:C4:35:A9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 741d09cea2b51c8f360748623524ae7859ec2ca8..8b91d81f0130428f62d27f421040b873ecff3b80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.30",
+      "mac": "00:11:25:91:45:AA",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-210-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:94",
-      "mac": "172.24.18.30",
+      "ip": "172.24.18.30",
+      "mac": "00:11:25:C4:4E:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-210.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:95",
-      "mac": "172.24.145.30",
+      "ip": "172.24.145.30",
+      "mac": "00:11:25:C4:4E:95",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e3a357bd1d44a18e26296a005a7b9edcca1909ad..dc9a075e2030a6b7b311c80a4b265eb8b393d9d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.31",
+      "mac": "00:11:25:91:48:38",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-211-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:94",
-      "mac": "172.24.18.31",
+      "ip": "172.24.18.31",
+      "mac": "00:11:25:C4:4F:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-211.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:95",
-      "mac": "172.24.145.31",
+      "ip": "172.24.145.31",
+      "mac": "00:11:25:C4:4F:95",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9229e232e29042902b9e9e8181d6e859c34f9122..60d951a493711e9733a5d35433ee45c3b6a908cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.32",
+      "mac": "00:11:25:91:47:C3",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-212-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:BA",
-      "mac": "172.24.18.32",
+      "ip": "172.24.18.32",
+      "mac": "00:11:25:C4:4F:BA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-212.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:BB",
-      "mac": "172.24.145.32",
+      "ip": "172.24.145.32",
+      "mac": "00:11:25:C4:4F:BB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 164ee153d00b288d7b5fd8fb17ee61f3e6b93dac..ec57fe3f112bde2f5cb0d7ffd06edfed6826e5af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.33",
+      "mac": "00:11:25:91:47:EE",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-213-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:50",
-      "mac": "172.24.18.33",
+      "ip": "172.24.18.33",
+      "mac": "00:11:25:C4:54:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-213.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:51",
-      "mac": "172.24.145.33",
+      "ip": "172.24.145.33",
+      "mac": "00:11:25:C4:54:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 372c57be1b90f8b3f6569e784e75b75a32240025..bac93fd2e91738eee32d00e30652aef38c552138 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.34",
+      "mac": "00:11:25:91:47:C7",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-214-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:50",
-      "mac": "172.24.18.34",
+      "ip": "172.24.18.34",
+      "mac": "00:11:25:C4:4E:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-214.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:51",
-      "mac": "172.24.145.34",
+      "ip": "172.24.145.34",
+      "mac": "00:11:25:C4:4E:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 6d7cc77e992127454f496f1d6532740d4357a649..115a88f241cba30dc178050c9eef308a94d30b71 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.35",
+      "mac": "00:11:25:91:46:83",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-215-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:7E",
-      "mac": "172.24.18.35",
+      "ip": "172.24.18.35",
+      "mac": "00:11:25:C4:54:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-215.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:54:7F",
-      "mac": "172.24.145.35",
+      "ip": "172.24.145.35",
+      "mac": "00:11:25:C4:54:7F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 64f3c2091f40498118330f372542e12a0a019e7f..5f54de02c8945608e97c4284cf4e5d0dd1eb6b59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.145.36",
+      "mac": "00:11:25:91:47:AF",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-216-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "netgear06.orsay.grid5000.fr",
+      "switch": "netgear08.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.156",
-      "switch_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:16:42",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0F:B5:FC:0D:AA",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:1C",
-      "mac": "172.24.18.36",
+      "ip": "172.24.18.36",
+      "mac": "00:11:25:C4:4D:1C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-216.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": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:1D",
-      "mac": "172.24.145.36",
+      "ip": "172.24.145.36",
+      "mac": "00:11:25:C4:4D:1D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b3310ed342eefe5ab23ea71265dfdab66796bb54..f0651dd3be7baaf9048f3ec590401cf6aaef9072 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.1",
+      "mac": "00:11:25:91:46:70",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:7C",
-      "mac": "172.24.19.1",
+      "ip": "172.24.19.1",
+      "mac": "00:11:25:C4:3B:7C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:7D",
-      "mac": "172.24.146.1",
+      "ip": "172.24.146.1",
+      "mac": "00:11:25:C4:3B:7D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7346019eb4b8128bd7df65444c6f9e0d1e648f96..109b44627264971768929c0fb8d258b0e16a6773 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.2",
+      "mac": "00:11:25:91:48:D2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:46",
-      "mac": "172.24.19.2",
+      "ip": "172.24.19.2",
+      "mac": "00:11:25:C4:35:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:47",
-      "mac": "172.24.146.2",
+      "ip": "172.24.146.2",
+      "mac": "00:11:25:C4:35:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 80ab5fe17fc41a56fbf73646dacd39ebbd022373..0bf2772d2338d61ddf66cd59f56084ad07b55469 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.3",
+      "mac": "00:11:25:91:48:AA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:A8",
-      "mac": "172.24.19.3",
+      "ip": "172.24.19.3",
+      "mac": "00:11:25:C4:39:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:A9",
-      "mac": "172.24.146.3",
+      "ip": "172.24.146.3",
+      "mac": "00:11:25:C4:39:A9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 91ce28e1766b0cfef7385b9e87d5f9bffa56217f..b608205ae342953de364374606d9ee42deff4d52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.22",
+      "mac": "00:11:25:91:49:2A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:5A",
-      "mac": "172.24.2.22",
+      "ip": "172.24.2.22",
+      "mac": "00:11:25:C4:34:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:5B",
-      "mac": "172.24.129.22",
+      "ip": "172.24.129.22",
+      "mac": "00:11:25:C4:34:5B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bf29ef0b355282e70080e2858446e0e78df37297..f2451844c3aca6047d28a95a1596ffe2defccdf5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.4",
+      "mac": "00:11:25:91:48:39",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:6A",
-      "mac": "172.24.19.4",
+      "ip": "172.24.19.4",
+      "mac": "00:11:25:C4:3C:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:6B",
-      "mac": "172.24.146.4",
+      "ip": "172.24.146.4",
+      "mac": "00:11:25:C4:3C:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2239831e6a788e80e8428f498c74ba2f9a207e12..3c61ed96f684f1f9b9057dace8c41890b3c4d0c5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.5",
+      "mac": "00:11:25:91:45:C3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3D:96",
-      "mac": "172.24.19.5",
+      "ip": "172.24.19.5",
+      "mac": "00:11:25:C4:3D:96",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3D:97",
-      "mac": "172.24.146.5",
+      "ip": "172.24.146.5",
+      "mac": "00:11:25:C4:3D:97",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4bbc4f0a925a39283c9c76a2ebdbe8ad25f4b894..9469bb1bdb7620b16a66df99f028de817f2bec31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.6",
+      "mac": "00:11:25:91:48:16",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:54",
-      "mac": "172.24.19.6",
+      "ip": "172.24.19.6",
+      "mac": "00:11:25:C4:39:54",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:55",
-      "mac": "172.24.146.6",
+      "ip": "172.24.146.6",
+      "mac": "00:11:25:C4:39:55",
       "management": false,
       "mountable": false,
       "mounted": false,
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 dbf2745b398b84af2ffdd7e68c88d60a6ddf671b..f6411b0a4f2750c19a76a84b54d3b822ec9a31fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -4,6 +4,7 @@
     "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
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.7",
+      "mac": "00:11:25:91:48:A4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:14",
-      "mac": "172.24.19.7",
+      "ip": "172.24.19.7",
+      "mac": "00:11:25:C4:3C:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:15",
-      "mac": "172.24.146.7",
+      "ip": "172.24.146.7",
+      "mac": "00:11:25:C4:3C:15",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c810fbfc4c57c198b3d38bada2c90cc15f66d9d5..e3dc321df32c581127ca666ab83fbd7130789cb7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.8",
+      "mac": "00:11:25:91:46:7E",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:00",
-      "mac": "172.24.19.8",
+      "ip": "172.24.19.8",
+      "mac": "00:11:25:C4:39:00",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:01",
-      "mac": "172.24.146.8",
+      "ip": "172.24.146.8",
+      "mac": "00:11:25:C4:39:01",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5bd294c9cb1e5c42367fdae0747f20a70944ee6a..dc503fb882db88a2b1c05552f972cfdc644cb1bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.9",
+      "mac": "00:11:25:91:46:AE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:D0",
-      "mac": "172.24.19.9",
+      "ip": "172.24.19.9",
+      "mac": "00:11:25:C4:38:D0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:D1",
-      "mac": "172.24.146.9",
+      "ip": "172.24.146.9",
+      "mac": "00:11:25:C4:38:D1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e0f93614103d354003e4451b09c697329442f557..5cc4f739ba94d962caa6c6aa14fde515153c65bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.10",
+      "mac": "00:11:25:91:48:35",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:F6",
-      "mac": "172.24.19.10",
+      "ip": "172.24.19.10",
+      "mac": "00:11:25:C4:38:F6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:F7",
-      "mac": "172.24.146.10",
+      "ip": "172.24.146.10",
+      "mac": "00:11:25:C4:38:F7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9577854933ebb03f2e11b6bed9a02f845e7b7e8f..408e89ba8ab5bb951c6858dccab17ba0f9b8ec4e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.11",
+      "mac": "00:14:5E:65:C6:4A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "changée",
-      "mac": "{",
+      "ip": "172.24.19.11",
+      "mac": "00:11:25:C4:34:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:8F",
-      "mac": "172.24.146.11",
+      "ip": "172.24.146.11",
+      "mac": "00:11:25:C4:39:8F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 a5bd6b5f1ab5f743336170c66f025934aba1ed2c..160e810564609575b5b83e4c0659206ffea909b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.146.12",
+      "mac": "00:11:25:91:46:0C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:A6",
-      "mac": "172.24.19.12",
+      "ip": "172.24.19.12",
+      "mac": "00:11:25:C4:32:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:A7",
-      "mac": "172.24.146.12",
+      "ip": "172.24.146.12",
+      "mac": "00:11:25:C4:32:A7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 356d840f464b7edf1a75ac9fcee8422d9b7a4da5..4b6fc08e7ba18b23831202839cce8eb6bb78a7e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.13",
+      "mac": "00:11:25:91:45:8A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:76",
-      "mac": "172.24.20.13",
+      "ip": "172.24.20.13",
+      "mac": "00:11:25:C4:3C:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:77",
-      "mac": "172.24.147.13",
+      "ip": "172.24.147.13",
+      "mac": "00:11:25:C4:3C:77",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7ea1b6a8727df8321305f7862f4af4ffa4326ef3..0c86af65d17d8877dfe6505e0413b5165d050c85 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.23",
+      "mac": "00:11:25:91:46:B7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:EA",
-      "mac": "172.24.2.23",
+      "ip": "172.24.2.23",
+      "mac": "00:11:25:C4:34:EA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:EB",
-      "mac": "172.24.129.23",
+      "ip": "172.24.129.23",
+      "mac": "00:11:25:C4:34:EB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 47ac3df56b58b2ddc66c5c69280117c1e71f78b6..ab7ae059b13d93090e482cb495e7e94630f7c0ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.14",
+      "mac": "00:11:25:91:45:B4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A6",
-      "mac": "172.24.20.14",
+      "ip": "172.24.20.14",
+      "mac": "00:11:25:C4:35:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A7",
-      "mac": "172.24.147.14",
+      "ip": "172.24.147.14",
+      "mac": "00:11:25:C4:35:A7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8c01e9d088e65931c3eafc8b6e282ffdb025d7cf..effabaac4bfdbcc6b0b984bf46f548825819c2ec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.15",
+      "mac": "00:11:25:91:47:E5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:78",
-      "mac": "172.24.20.15",
+      "ip": "172.24.20.15",
+      "mac": "00:11:25:C4:3C:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:79",
-      "mac": "172.24.147.15",
+      "ip": "172.24.147.15",
+      "mac": "00:11:25:C4:3C:79",
       "management": false,
       "mountable": false,
       "mounted": false,
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 26b36d12681c3ee80a9bb91fcfa764d4bfe5d37e..965a7a6f4e97704a750786d9c14a844830ef185a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.16",
+      "mac": "00:11:25:91:45:79",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:CA",
-      "mac": "172.24.20.16",
+      "ip": "172.24.20.16",
+      "mac": "00:11:25:C4:38:CA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:CB",
-      "mac": "172.24.147.16",
+      "ip": "172.24.147.16",
+      "mac": "00:11:25:C4:38:CB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 48c3ca852cd0d95cfbfb84925fa0b03b873158b8..9c18c15b1580cfd03b3c510ebaf359d2c9c3c26d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.17",
+      "mac": "00:11:25:91:45:96",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:20",
-      "mac": "172.24.20.17",
+      "ip": "172.24.20.17",
+      "mac": "00:11:25:C4:3C:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:21",
-      "mac": "172.24.147.17",
+      "ip": "172.24.147.17",
+      "mac": "00:11:25:C4:3C:21",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5837dda655c79a48a79ca7037be01b83a8af3368..5fbcac1822e38d85d41b7a9826962837a41bdb31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.18",
+      "mac": "00:11:25:91:46:08",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:42",
-      "mac": "172.24.20.18",
+      "ip": "172.24.20.18",
+      "mac": "00:11:25:C4:3C:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:43",
-      "mac": "172.24.147.18",
+      "ip": "172.24.147.18",
+      "mac": "00:11:25:C4:3C:43",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e8502afec4588ea14fa4ba22e5a50d770ab24157..a61293c63881a21f85c15da332904e71857def79 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.19",
+      "mac": "00:11:25:91:47:EB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:50",
-      "mac": "172.24.20.19",
+      "ip": "172.24.20.19",
+      "mac": "00:11:25:C4:35:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:51",
-      "mac": "172.24.147.19",
+      "ip": "172.24.147.19",
+      "mac": "00:11:25:C4:35:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 adeb74bd7963d6ea813bbe7b3e30f1d08c699773..2e37caa317d37e6bbe084d0e89f6504c0bcc8f00 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.20",
+      "mac": "00:11:25:91:47:F7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:AC",
-      "mac": "172.24.20.20",
+      "ip": "172.24.20.20",
+      "mac": "00:11:25:C4:39:AC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:AD",
-      "mac": "172.24.147.20",
+      "ip": "172.24.147.20",
+      "mac": "00:11:25:C4:39:AD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5928e04b02c732239d1cb9c11362ceda63ed3548..aefa898cec74ea3a0102c047c3fe4c03cd6cdb5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.21",
+      "mac": "00:11:25:91:48:45",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:80",
-      "mac": "172.24.20.21",
+      "ip": "172.24.20.21",
+      "mac": "00:11:25:C4:3C:80",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:81",
-      "mac": "172.24.147.21",
+      "ip": "172.24.147.21",
+      "mac": "00:11:25:C4:3C:81",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ae060a95320495724d42b3d95add86fa44f19095..16624102cc827621a4f6de305d789e21af6d64c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.22",
+      "mac": "00:11:25:91:48:CF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:7E",
-      "mac": "172.24.20.22",
+      "ip": "172.24.20.22",
+      "mac": "00:11:25:C4:3C:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:7F",
-      "mac": "172.24.147.22",
+      "ip": "172.24.147.22",
+      "mac": "00:11:25:C4:3C:7F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 498b67603347f8449647cdefb3b7d625f609e3ab..0e4a6c122a85c4daf0d0d9b1a526ce3cd55f8787 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.23",
+      "mac": "00:11:25:91:48:C1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:50",
-      "mac": "172.24.20.23",
+      "ip": "172.24.20.23",
+      "mac": "00:11:25:C4:3F:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:51",
-      "mac": "172.24.147.23",
+      "ip": "172.24.147.23",
+      "mac": "00:11:25:C4:3F:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 26b228076c8b301902a98adb5fbb1781238a97d5..1a3eadc75d9fac3e5f257f2d63063c546936be36 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.129.24",
+      "mac": "00:11:25:91:47:39",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:50",
-      "mac": "172.24.2.24",
+      "ip": "172.24.2.24",
+      "mac": "00:11:25:C4:34:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:51",
-      "mac": "172.24.129.24",
+      "ip": "172.24.129.24",
+      "mac": "00:11:25:C4:34:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 98132483df181303dc670a6cda100e3fd78330dc..e5ea4e8ba1ef627a208df9ce4230ed1d9626cc42 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.147.24",
+      "mac": "00:11:25:91:46:09",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:34",
-      "mac": "172.24.20.24",
+      "ip": "172.24.20.24",
+      "mac": "00:11:25:C4:3E:34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:35",
-      "mac": "172.24.147.24",
+      "ip": "172.24.147.24",
+      "mac": "00:11:25:C4:3E:35",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2e93c372a49475d7fe8ab57e084d95b9a37f5072..2af2de70ad029d9b3f49cd975137a116ced4366e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.25",
+      "mac": "00:11:25:91:46:5D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:74",
-      "mac": "172.24.21.25",
+      "ip": "172.24.21.25",
+      "mac": "00:11:25:C4:3C:74",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:75",
-      "mac": "172.24.148.25",
+      "ip": "172.24.148.25",
+      "mac": "00:11:25:C4:3C:75",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ffad517046ac6734316435da1160f4f2ea53f89f..4c17b2d169b4832635b55e63aada33f05a682396 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.26",
+      "mac": "00:11:25:91:48:AD",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:FC",
-      "mac": "172.24.21.26",
+      "ip": "172.24.21.26",
+      "mac": "00:11:25:C4:2B:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:FD",
-      "mac": "172.24.148.26",
+      "ip": "172.24.148.26",
+      "mac": "00:11:25:C4:2B:FD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e38cd2359a5708b1878f29e8c27cf4302358e12a..a466ef7ca70cb74a02741ad8157cbe1d42819654 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.27",
+      "mac": "00:11:25:91:46:7A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:58",
-      "mac": "172.24.21.27",
+      "ip": "172.24.21.27",
+      "mac": "00:11:25:C4:2B:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:59",
-      "mac": "172.24.148.27",
+      "ip": "172.24.148.27",
+      "mac": "00:11:25:C4:2B:59",
       "management": false,
       "mountable": false,
       "mounted": false,
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 dc93e74684546eb3e5c8f6bc29b797bf2a29ce64..766502bff56cbd910bfe73d5bb3410d3c6d8dc24 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.28",
+      "mac": "00:11:25:91:46:A3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "changée",
-      "mac": "{",
+      "ip": "172.24.21.28",
+      "mac": "00:11:25:C4:10:FA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:ED",
-      "mac": "172.24.148.28",
+      "ip": "172.24.148.28",
+      "mac": "00:11:25:C4:10:FB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 59136b9a9369e907f9e54fb679bbb02c00bf6f8c..6380f68bd65a3d760e8f1cc67d09a54ea2739f37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.29",
+      "mac": "00:11:25:91:47:EA",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:4E",
-      "mac": "172.24.21.29",
+      "ip": "172.24.21.29",
+      "mac": "00:11:25:C4:3A:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:4F",
-      "mac": "172.24.148.29",
+      "ip": "172.24.148.29",
+      "mac": "00:11:25:C4:3A:4F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3f602de2ddc710330b3d7841895b63b3ea6fff55..ec6768a7917d4cb7cbace1cbe6e8a54adb93a44a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.30",
+      "mac": "00:11:25:91:46:0E",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:E2",
-      "mac": "172.24.21.30",
+      "ip": "172.24.21.30",
+      "mac": "00:11:25:C4:38:E2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:E3",
-      "mac": "172.24.148.30",
+      "ip": "172.24.148.30",
+      "mac": "00:11:25:C4:38:E3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f7bf8ee8dd2de9456809968c9d82101a2dc65449..dc5d2110fe3e991e368c704e362c8bf1aa154704 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.31",
+      "mac": "00:11:25:91:48:F4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:76",
-      "mac": "172.24.21.31",
+      "ip": "172.24.21.31",
+      "mac": "00:11:25:C4:32:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:77",
-      "mac": "172.24.148.31",
+      "ip": "172.24.148.31",
+      "mac": "00:11:25:C4:32:77",
       "management": false,
       "mountable": false,
       "mounted": false,
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 725d2ff895bdb38521cb3d00d993fa8d15303d02..4f6b8a900c398c9399a2b17de6cf1d82082b93ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.32",
+      "mac": "00:11:25:91:48:3B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:FA",
-      "mac": "172.24.21.32",
+      "ip": "172.24.21.32",
+      "mac": "00:11:25:C4:31:FA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:FB",
-      "mac": "172.24.148.32",
+      "ip": "172.24.148.32",
+      "mac": "00:11:25:C4:31:FB",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5e3ef37cea2ae0c4280ff8942932f6621a7127ee..c61b2b2695962574636dbad22f92b59c182d7a57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.33",
+      "mac": "00:11:25:91:45:E9",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:40",
-      "mac": "172.24.21.33",
+      "ip": "172.24.21.33",
+      "mac": "00:11:25:C4:33:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:41",
-      "mac": "172.24.148.33",
+      "ip": "172.24.148.33",
+      "mac": "00:11:25:C4:33:41",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c7c6d2cc159daa3a14e59459024f7113f44894ba..c0f688c44c8d6820213eb761437ec506e31f8add 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.25",
+      "mac": "00:11:25:91:47:A1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:1C",
-      "mac": "172.24.3.25",
+      "ip": "172.24.3.25",
+      "mac": "00:11:25:C4:35:1C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:1D",
-      "mac": "172.24.130.25",
+      "ip": "172.24.130.25",
+      "mac": "00:11:25:C4:35:1D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 102b4a9506673b17cb7f30bcf4410c9376496cae..9dead0fdaefc2af8ef14140c6e13c1ec7093de70 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.34",
+      "mac": "00:11:25:91:45:E8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:9A",
-      "mac": "172.24.21.34",
+      "ip": "172.24.21.34",
+      "mac": "00:11:25:C4:3B:9A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:9B",
-      "mac": "172.24.148.34",
+      "ip": "172.24.148.34",
+      "mac": "00:11:25:C4:3B:9B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 6ecf6c8e94bfe606938bf747eba9680da9ef454a..c13a2d6c38a60add0f02ba8fa09a14bd819e396f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.35",
+      "mac": "00:11:25:91:47:40",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:90",
-      "mac": "172.24.21.35",
+      "ip": "172.24.21.35",
+      "mac": "00:11:25:C4:3F:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3F:91",
-      "mac": "172.24.148.35",
+      "ip": "172.24.148.35",
+      "mac": "00:11:25:C4:3F:91",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4e7af1b5b7fe2201bf0520400b2b414c33baf017..68fe752950f892c3740c61fc94f55773bf0ec001 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.148.36",
+      "mac": "00:11:25:91:48:28",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "nil",
+      "switch_console_mac": "00:A0:9C:00:25:84",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "nil",
+      "switch_mac": "00:0F:B5:FC:0D:A5",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:5A",
-      "mac": "172.24.21.36",
+      "ip": "172.24.21.36",
+      "mac": "00:11:25:C4:32:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:5B",
-      "mac": "172.24.148.36",
+      "ip": "172.24.148.36",
+      "mac": "00:11:25:C4:32:5B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 18c5b555c2b0503ce04a856c7b5dcef8fa2d8e9b..20a03143c55bac797dac08affc158ec79f37fd59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.1",
+      "mac": "00:11:25:91:47:CC",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-253-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:68",
-      "mac": "172.24.22.1",
+      "ip": "172.24.22.1",
+      "mac": "00:11:25:C4:34:68",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-253.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:69",
-      "mac": "172.24.149.1",
+      "ip": "172.24.149.1",
+      "mac": "00:11:25:C4:34:69",
       "management": false,
       "mountable": false,
       "mounted": false,
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 dd6f7ce9812fe7042b40ec97c3191aabe2d37ed4..98132d532a7349ef2358b09045d1a23251918614 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.2",
+      "mac": "00:11:25:91:46:C7",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-254-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:B8",
-      "mac": "172.24.22.2",
+      "ip": "172.24.22.2",
+      "mac": "00:11:25:C4:35:B8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-254.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:B9",
-      "mac": "172.24.149.2",
+      "ip": "172.24.149.2",
+      "mac": "00:11:25:C4:35:B9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4a2a9f01654ec7bb3f9bdf1e91e23ef5b4325f5f..ebdcd3eba3cd2367a38ae71d71d6f5f09664148d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.3",
+      "mac": "00:11:25:91:48:BC",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-255-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "changée",
-      "mac": "{",
+      "ip": "172.24.22.3",
+      "mac": "00:11:25:C4:09:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-255.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:05",
-      "mac": "172.24.149.3",
+      "ip": "172.24.149.3",
+      "mac": "00:11:25:C4:09:87",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8f47b09dd4b4ab62d2dbcefc79da4d6ddd4e647c..78d412b641884f1ce549d284778576bb184b261a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.4",
+      "mac": "00:11:25:91:47:F0",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-256-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:90",
-      "mac": "172.24.22.4",
+      "ip": "172.24.22.4",
+      "mac": "00:11:25:C4:35:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-256.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:91",
-      "mac": "172.24.149.4",
+      "ip": "172.24.149.4",
+      "mac": "00:11:25:C4:35:91",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8ab387fffff1e05bdff16cbb37eb0921e0dec123..964850c1d9e1112686de65c427320d831d655d96 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.5",
+      "mac": "00:11:25:91:47:E2",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-257-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:62",
-      "mac": "172.24.22.5",
+      "ip": "172.24.22.5",
+      "mac": "00:11:25:C4:35:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-257.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:63",
-      "mac": "172.24.149.5",
+      "ip": "172.24.149.5",
+      "mac": "00:11:25:C4:35:63",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e67013d68c9311cfd64d7e7eb9a29ae41af690c2..721c7cb731e3779131a3749b6201cbfd3ed9eed0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.6",
+      "mac": "00:11:25:91:47:7C",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-258-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:13:1A",
-      "mac": "172.24.22.6",
+      "ip": "172.24.22.6",
+      "mac": "00:11:25:C4:13:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-258.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:13:1B",
-      "mac": "172.24.149.6",
+      "ip": "172.24.149.6",
+      "mac": "00:11:25:C4:13:1B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f75ff0d8d86a8194525fc3164b7466aa3d5b0db1..518000ab7dd52c27b1bc255042bcf6dc1c6d5d64 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.7",
+      "mac": "00:11:25:91:49:15",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-259-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:6A",
-      "mac": "172.24.22.7",
+      "ip": "172.24.22.7",
+      "mac": "00:11:25:C4:35:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-259.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:6B",
-      "mac": "172.24.149.7",
+      "ip": "172.24.149.7",
+      "mac": "00:11:25:C4:35:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3de9ee99adbb775de21d67d7f069da24eee5f33b..255ab3853b2827e8aacea1a5fb415fcc1b00bd2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.26",
+      "mac": "00:11:25:91:48:A5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A4",
-      "mac": "172.24.3.26",
+      "ip": "172.24.3.26",
+      "mac": "00:11:25:C4:35:A4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:A5",
-      "mac": "172.24.130.26",
+      "ip": "172.24.130.26",
+      "mac": "00:11:25:C4:35:A5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 00abade4c477fb2896cd86fc864fefd93542e779..457c5bdb13649cd61a8e2007e92e4d0161433366 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.8",
+      "mac": "00:11:25:91:45:D3",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-260-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:82",
-      "mac": "172.24.22.8",
+      "ip": "172.24.22.8",
+      "mac": "00:11:25:C4:33:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-260.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:83",
-      "mac": "172.24.149.8",
+      "ip": "172.24.149.8",
+      "mac": "00:11:25:C4:33:83",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0332f0e065e804edc0daab1c122bf98f41607b5a..bb898cdd0c945f10f0ec04948ee3c1de8cf77944 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.9",
+      "mac": "00:11:25:91:48:7B",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-261-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:72",
-      "mac": "172.24.22.9",
+      "ip": "172.24.22.9",
+      "mac": "00:11:25:C4:2D:72",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-261.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:73",
-      "mac": "172.24.149.9",
+      "ip": "172.24.149.9",
+      "mac": "00:11:25:C4:2D:73",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0eb8d12fcb74ce4df6edaa0883ecfb83b259d961..ac132c4c0ce20607fac2188c52f431c8b01c881f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.10",
+      "mac": "00:11:25:91:47:46",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-262-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:E8",
-      "mac": "172.24.22.10",
+      "ip": "172.24.22.10",
+      "mac": "00:11:25:C4:34:E8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-262.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:E9",
-      "mac": "172.24.149.10",
+      "ip": "172.24.149.10",
+      "mac": "00:11:25:C4:34:E9",
       "management": false,
       "mountable": false,
       "mounted": false,
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 064d2fc3638186ce122248129e24a1df72b8cfc4..151ef2994f2fe76170b60ae3f646cf1c57fbe592 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.11",
+      "mac": "00:11:25:91:48:07",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-263-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:88",
-      "mac": "172.24.22.11",
+      "ip": "172.24.22.11",
+      "mac": "00:11:25:C4:35:88",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-263.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:89",
-      "mac": "172.24.149.11",
+      "ip": "172.24.149.11",
+      "mac": "00:11:25:C4:35:89",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b3b89fc00cfd981d0c0adbcdee1956599ad86dd0..c0b437eab77a333975ff248fe30ba5f1161e5622 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.149.12",
+      "mac": "00:11:25:91:48:14",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-264-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:5E",
-      "mac": "172.24.22.12",
+      "ip": "172.24.22.12",
+      "mac": "00:11:25:C4:33:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-264.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:5F",
-      "mac": "172.24.149.12",
+      "ip": "172.24.149.12",
+      "mac": "00:11:25:C4:33:5F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ca3a0dfb2aa36168f5991ce2b0d02c600b4cba3f..c64cf63cc9a8ed3d544045277c4988b2f2c43fa0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.13",
+      "mac": "00:11:25:91:46:36",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-265-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:64",
-      "mac": "172.24.23.13",
+      "ip": "172.24.23.13",
+      "mac": "00:11:25:C4:34:64",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-265.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:65",
-      "mac": "172.24.150.13",
+      "ip": "172.24.150.13",
+      "mac": "00:11:25:C4:34:65",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9aa26968bd3f750fa2e1517f5f82b400e7597eb7..12058425063ae0cb0267bc469f78979d58b3f7b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.14",
+      "mac": "00:11:25:91:46:60",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-266-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:8A",
-      "mac": "172.24.23.14",
+      "ip": "172.24.23.14",
+      "mac": "00:11:25:C4:34:8A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-266.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:8B",
-      "mac": "172.24.150.14",
+      "ip": "172.24.150.14",
+      "mac": "00:11:25:C4:34:8B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 cb2b4be1f319b9772270e869c12adf2d1944e4dd..40686beb5d48115eea964be9b222d33547cb33e6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,37 +15,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.15",
+      "mac": "00:11:25:91:45:AE",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-267-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:36",
-      "mac": "172.24.23.15",
+      "ip": "172.24.23.15",
+      "mac": "00:11:25:C4:35:36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-267.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:37",
-      "mac": "172.24.150.15",
+      "ip": "172.24.150.15",
+      "mac": "00:11:25:C4:35:37",
       "management": false,
       "mountable": false,
       "mounted": false,
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 42579365dfabbabfa8814cef61497e812b7f250a..49bf80bae608e2d4d42f2e5855466e616062dba4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.16",
+      "mac": "00:11:25:91:45:87",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-268-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4E",
-      "mac": "172.24.23.16",
+      "ip": "172.24.23.16",
+      "mac": "00:11:25:C4:34:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-268.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4F",
-      "mac": "172.24.150.16",
+      "ip": "172.24.150.16",
+      "mac": "00:11:25:C4:34:4F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 739189f1cf90a6181c9bb58b023b09cff60058c1..a80b10a6c37868cf13de67a9db8b110deca1e14f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.17",
+      "mac": "00:11:25:91:46:D0",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-269-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:0E",
-      "mac": "172.24.23.17",
+      "ip": "172.24.23.17",
+      "mac": "00:11:25:C4:33:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-269.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:0F",
-      "mac": "172.24.150.17",
+      "ip": "172.24.150.17",
+      "mac": "00:11:25:C4:33:0F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 63f0d31227b12d840d835f0c7b2f3305227ecab0..25ce9d1399be17b078e89ead300492e6345d0bd7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.27",
+      "mac": "00:11:25:91:49:1C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:4E",
-      "mac": "172.24.3.27",
+      "ip": "172.24.3.27",
+      "mac": "00:11:25:C4:31:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:4F",
-      "mac": "172.24.130.27",
+      "ip": "172.24.130.27",
+      "mac": "00:11:25:C4:31:4F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b90fa3547c4d7eb8aafe9f6005264a2ce0df52c3..b6fd9b132e6fe280fbb258194ab5a3bd54955ac5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.18",
+      "mac": "00:11:25:91:46:CF",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-270-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "00:18:FE:50:5B:41",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:48",
-      "mac": "172.24.23.18",
+      "ip": "172.24.23.18",
+      "mac": "00:11:25:C4:35:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-270.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:18:fe:50:6b:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:49",
-      "mac": "172.24.150.18",
+      "ip": "172.24.150.18",
+      "mac": "00:11:25:C4:35:49",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c14171a9f59115be250653f12b6c3b7d4e9d790b..108eb1d4071f2b1dadc38a1e5b92f25d41301bae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.19",
+      "mac": "00:11:25:91:47:7D",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-271-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:92",
-      "mac": "172.24.23.19",
+      "ip": "172.24.23.19",
+      "mac": "00:11:25:C4:31:92",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-271.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:93",
-      "mac": "172.24.150.19",
+      "ip": "172.24.150.19",
+      "mac": "00:11:25:C4:31:93",
       "management": false,
       "mountable": false,
       "mounted": false,
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 48edec4502c7ea95df271cd6f725975ea1975655..6d4f001532f24a665eb6a35a33cbee20445d8778 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.20",
+      "mac": "00:11:25:91:48:15",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-272-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2F:20",
-      "mac": "172.24.23.20",
+      "ip": "172.24.23.20",
+      "mac": "00:11:25:C4:2F:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-272.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2F:21",
-      "mac": "172.24.150.20",
+      "ip": "172.24.150.20",
+      "mac": "00:11:25:C4:2F:21",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5d76ca4e8b6ba0a19028dfdec95ea8a0e08aafaf..6e3c5bc00cde463e77e2924bf00ad39904cf7682 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.21",
+      "mac": "00:11:25:91:46:99",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-273-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:EE",
-      "mac": "172.24.23.21",
+      "ip": "172.24.23.21",
+      "mac": "00:11:25:C4:32:EE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-273.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:EF",
-      "mac": "172.24.150.21",
+      "ip": "172.24.150.21",
+      "mac": "00:11:25:C4:32:EF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7b04ca7c38d0f0936581db5a19fa3b3068f4f60d..3f67650658e32bd8820e73470e53b0cc59b74d7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.22",
+      "mac": "00:11:25:91:45:C9",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-274-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:C0",
-      "mac": "172.24.23.22",
+      "ip": "172.24.23.22",
+      "mac": "00:11:25:C4:35:C0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-274.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:C1",
-      "mac": "172.24.150.22",
+      "ip": "172.24.150.22",
+      "mac": "00:11:25:C4:35:C1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c19c740e240cd17ca91c08def6a5c613936d1649..2bfd978e60e2047532a8e5554ca8afbff63c301d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.23",
+      "mac": "00:11:25:91:45:F0",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-275-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:11:38",
-      "mac": "172.24.23.23",
+      "ip": "172.24.23.23",
+      "mac": "00:11:25:C4:11:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-275.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:11:39",
-      "mac": "172.24.150.23",
+      "ip": "172.24.150.23",
+      "mac": "00:11:25:C4:11:39",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ad3f375c0ce13dd3f6fad354251474c6b48980ac..8b11f6c85968c0bd491313cd7042396414a3f235 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.150.24",
+      "mac": "00:09:6B:5E:FB:10",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-276-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:B6",
-      "mac": "172.24.23.24",
+      "ip": "172.24.23.24",
+      "mac": "00:11:25:C4:35:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-276.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:B7",
-      "mac": "172.24.150.24",
+      "ip": "172.24.150.24",
+      "mac": "00:11:25:C4:35:B7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2fe124c22d259a443d4b42597e8a618f8185521c..b888a5389012ed1a1b4fee6051171717584970b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.25",
+      "mac": "00:11:25:91:49:5E",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-277-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:58",
-      "mac": "172.24.24.25",
+      "ip": "172.24.24.25",
+      "mac": "00:11:25:C4:34:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-277.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:59",
-      "mac": "172.24.151.25",
+      "ip": "172.24.151.25",
+      "mac": "00:11:25:C4:34:59",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d098515031e0e7bdc153140f856703e7eeae2263..84f58c66c4d71e6bbcd52d0209c9ee9954dc39d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.26",
+      "mac": "00:11:25:91:47:6C",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-278-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:46",
-      "mac": "172.24.24.26",
+      "ip": "172.24.24.26",
+      "mac": "00:11:25:C4:34:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-278.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:47",
-      "mac": "172.24.151.26",
+      "ip": "172.24.151.26",
+      "mac": "00:11:25:C4:34:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 9c1bde3208d15fb5ca677791ce3b515cef084f16..6f03f45dd1a078e16c587ac9d6fd94c3bfd807ca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.27",
+      "mac": "00:11:25:91:46:42",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-279-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:96",
-      "mac": "172.24.24.27",
+      "ip": "172.24.24.27",
+      "mac": "00:11:25:C4:33:96",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-279.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:97",
-      "mac": "172.24.151.27",
+      "ip": "172.24.151.27",
+      "mac": "00:11:25:C4:33:97",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7be5137c971fb7fd56953a2e5c0704d439a2e18c..65fdab4b8ee183c8178267a8c9d45522a1e950a1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.28",
+      "mac": "00:11:25:91:49:01",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6E",
-      "mac": "172.24.3.28",
+      "ip": "172.24.3.28",
+      "mac": "00:11:25:C4:34:6E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6F",
-      "mac": "172.24.130.28",
+      "ip": "172.24.130.28",
+      "mac": "00:11:25:C4:34:6F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3b247bdc4063164d54076a2075fcbdceac79cf84..ce84fbb9d213b86d7f540834096ac836198cec2f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.28",
+      "mac": "00:11:25:91:46:92",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-280-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:20",
-      "mac": "172.24.24.28",
+      "ip": "172.24.24.28",
+      "mac": "00:11:25:C4:33:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-280.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:21",
-      "mac": "172.24.151.28",
+      "ip": "172.24.151.28",
+      "mac": "00:11:25:C4:33:21",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5340855ff253d5789e8bada8604a3fd508912fc8..bd40b00eae27d1bdb3b8ecc19f3b50b7ac5163b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.29",
+      "mac": "00:11:25:91:45:7F",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-281-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:18",
-      "mac": "172.24.24.29",
+      "ip": "172.24.24.29",
+      "mac": "00:11:25:C4:33:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-281.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:19",
-      "mac": "172.24.151.29",
+      "ip": "172.24.151.29",
+      "mac": "00:11:25:C4:33:19",
       "management": false,
       "mountable": false,
       "mounted": false,
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 08fdc1979dc520455417f6e7634dd54931085351..f002a094955f0350b090133eebd241d7923737b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.30",
+      "mac": "00:11:25:91:47:11",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-282-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:44",
-      "mac": "172.24.24.30",
+      "ip": "172.24.24.30",
+      "mac": "00:11:25:C4:31:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-282.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:45",
-      "mac": "172.24.151.30",
+      "ip": "172.24.151.30",
+      "mac": "00:11:25:C4:31:45",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e79e1f760e6853ab70149b087ad8453a1adbd783..bdd17861b97b45d39e303379a25acd332d5395fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.31",
+      "mac": "00:11:25:91:45:9E",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-283-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:5E",
-      "mac": "172.24.24.31",
+      "ip": "172.24.24.31",
+      "mac": "00:11:25:C4:34:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-283.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:5F",
-      "mac": "172.24.151.31",
+      "ip": "172.24.151.31",
+      "mac": "00:11:25:C4:34:5F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 cb03a27ea75d3f482a845764f895951202aab3c3..143f8885f0b5dfced159f19a9f300c198a83375b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.32",
+      "mac": "00:11:25:91:45:A2",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-284-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:49:DE",
-      "mac": "172.24.24.32",
+      "ip": "172.24.24.32",
+      "mac": "00:11:25:C4:49:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-284.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:49:DF",
-      "mac": "172.24.151.32",
+      "ip": "172.24.151.32",
+      "mac": "00:11:25:C4:49:DF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 5a89938060b0f9f223cb168baee53eeee09d03f6..fcdcf097b80383f2a43c985d4b0219d8b98d9c3a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.33",
+      "mac": "00:11:25:91:48:CE",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-285-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:BE",
-      "mac": "172.24.24.33",
+      "ip": "172.24.24.33",
+      "mac": "00:11:25:C4:35:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-285.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:BF",
-      "mac": "172.24.151.33",
+      "ip": "172.24.151.33",
+      "mac": "00:11:25:C4:35:BF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 43c0116642dc43b5a2cf5c40011b4df1a44554e8..a6e38dc1a1db8be85e9953aee6071d0cda66940b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.34",
+      "mac": "00:11:25:91:45:DA",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-286-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2A:C2",
-      "mac": "172.24.24.34",
+      "ip": "172.24.24.34",
+      "mac": "00:11:25:C4:2A:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-286.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2A:C3",
-      "mac": "172.24.151.34",
+      "ip": "172.24.151.34",
+      "mac": "00:11:25:C4:2A:C3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 48ea604f403fa46354b63cfa12dd9b4f5c65344a..9a16145dd2d58a2d92f7b6e9c0c23876ec1f7a26 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.35",
+      "mac": "00:11:25:91:46:33",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-287-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:40",
-      "mac": "172.24.24.35",
+      "ip": "172.24.24.35",
+      "mac": "00:11:25:C4:34:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-287.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:41",
-      "mac": "172.24.151.35",
+      "ip": "172.24.151.35",
+      "mac": "00:11:25:C4:34:41",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8741df1183a05efc46b573d261cbe6c7a314e045..a0914fc72ea1edb66623b1c2aa8981b80440a615 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.151.36",
+      "mac": "00:11:25:91:46:58",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-288-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear08.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.158",
-      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "00:18:FE:50:B8:81",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:66",
-      "mac": "172.24.24.36",
+      "ip": "172.24.24.36",
+      "mac": "00:11:25:C4:34:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "rate": 100000000,
+      "switch": "procurve16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.196",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:67",
-      "mac": "172.24.151.36",
+      "ip": "172.24.151.36",
+      "mac": "00:11:25:C4:34:67",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bb0c237ca9d6bb667a2acb18f43d36228025de0c..ab7738bc6a69795da49204abb2b885403c8b9321 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:69",
-      "mac": "172.24.152.1",
+      "ip": "172.24.152.1",
+      "mac": "00:11:25:C4:33:69",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f7946ae810913a7f25e7f2fe005d46663edcd7ed..28281ef452fd33d2f069d89a12ae1997071245e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.29",
+      "mac": "00:14:5E:65:C6:29",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +27,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:52",
-      "mac": "{",
+      "ip": "172.24.3.29",
+      "mac": "00:11:25:C4:05:0C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:53",
-      "mac": "172.24.130.29",
+      "ip": "172.24.130.29",
+      "mac": "00:11:25:C4:34:53",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d3b87d6ae47cf81a68953e866ca29dec541dd5c0..b4995709fe7d048846870e2ec81361377b366a30 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -4,18 +4,37 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:7D",
-      "mac": "172.24.152.2",
+      "ip": "172.24.152.2",
+      "mac": "00:11:25:C4:33:7D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e25179cdbe07329a17791f84dde44d84a02b7fa2..6c09cc4afd1706d73133bbaf6de8243dd12fa4db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:1D",
-      "mac": "172.24.152.3",
+      "ip": "172.24.152.3",
+      "mac": "00:11:25:C4:33:1D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 78a736fbd513d3e9dc6984b20f0745c16ca2eb4d..759f77568e861642a2adb867b56333ebf0b4d0e6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:89",
-      "mac": "172.24.152.4",
+      "ip": "172.24.152.4",
+      "mac": "00:11:25:C4:33:89",
       "management": false,
       "mountable": false,
       "mounted": false,
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 239dca37a19562b97bd8cea5cddb85a896f6a072..0926af166b23e77a27de429daf3717de3d6e7469 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:4B",
-      "mac": "172.24.152.5",
+      "ip": "172.24.152.5",
+      "mac": "00:11:25:C4:33:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3cac9fc39f60d90d8e38e7b17ea640a0d3414363..70fd4ed7a66a9e8e64029f8988ffebe07cb479fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:25",
-      "mac": "172.24.152.6",
+      "ip": "172.24.152.6",
+      "mac": "00:11:25:C4:33:25",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4e98cc2f5d41c4664a567ff4358dced390d243e5..08ea1f9a83974fc9f80cedf2f292e35fa8b699bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:7B",
-      "mac": "172.24.152.7",
+      "ip": "172.24.152.7",
+      "mac": "00:11:25:C4:33:7B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 47760a2e9cd4efb38942addb6b6aa7a2dd0245ea..36863cae2f18ce3da8f42b61128ba2cf4651fafa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:20:07",
-      "mac": "172.24.152.8",
+      "ip": "172.24.152.8",
+      "mac": "00:11:25:C4:20:07",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4e400cf04c2e82b382f5abd674b5a0b6989abdd3..81920f1a51da435e59c10fd2810ece4a4288b25a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -9,13 +9,31 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth1",
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:3D",
-      "mac": "172.24.152.9",
+      "ip": "172.24.152.9",
+      "mac": "00:11:25:C4:33:3D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 47fd3a71472c195685adac412d08caf647452550..9451164f2fa2837607620e39210d79981e119eb0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.152.10",
+      "mac": "00:11:25:91:46:8E",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-298-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:48",
-      "mac": "172.24.25.10",
+      "ip": "172.24.25.10",
+      "mac": "00:11:25:C4:33:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:49",
-      "mac": "172.24.152.10",
+      "ip": "172.24.152.10",
+      "mac": "00:11:25:C4:33:49",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b46f6170194d7e81b3b9150b9c96e134f91de6ab..f579e37f331cac84e7ebb4bbf8c84813b4d550b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.152.11",
+      "mac": "00:11:25:91:47:0B",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-299-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:46",
-      "mac": "172.24.25.11",
+      "ip": "172.24.25.11",
+      "mac": "00:11:25:C4:33:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:47",
-      "mac": "172.24.152.11",
+      "ip": "172.24.152.11",
+      "mac": "00:11:25:C4:33:47",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1dddfa2ab8a32f44b8162f4f6b009386b1bc5bdb..10b10a5d6bca4afc533bc871f357c2dc917bea31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -9,31 +9,13 @@
     "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": null,
-      "mac": null,
+      "ip": "172.26.128.3",
+      "mac": "00:11:25:91:47:3B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -44,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:3A",
-      "mac": "172.24.1.3",
+      "ip": "172.24.1.3",
+      "mac": "00:11:25:C4:35:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:3B",
-      "mac": "172.24.128.3",
+      "ip": "172.24.128.3",
+      "mac": "00:11:25:C4:35:3B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0e2065d7cd15d52539f4722cffe738decca7003f..dfece0463a4aae7f91777c9360e987add8475be1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.30",
+      "mac": "00:11:25:91:46:61",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +27,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:2C",
-      "mac": "172.24.3.30",
+      "ip": "172.24.3.30",
+      "mac": "00:11:25:C4:35:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:2D",
-      "mac": "172.24.130.30",
+      "ip": "172.24.130.30",
+      "mac": "00:11:25:C4:35:2D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8dd6ca6d02981a37039d3392719b9ab7adbaee75..71dd46edb719d22b62c3fa8ccee839b72c7223c5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.152.12",
+      "mac": "00:11:25:91:45:A9",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-300-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:14",
-      "mac": "172.24.25.12",
+      "ip": "172.24.25.12",
+      "mac": "00:11:25:C4:33:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:15",
-      "mac": "172.24.152.12",
+      "ip": "172.24.152.12",
+      "mac": "00:11:25:C4:33:15",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1377b2d508667cea58aa4f3a7980eb4eb795ab08..84cc7a00e3b3971cea883f3cda5479a4112a7dfd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.13",
+      "mac": "00:11:25:91:45:C4",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-301-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:06",
-      "mac": "172.24.26.13",
+      "ip": "172.24.26.13",
+      "mac": "00:11:25:C4:35:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:07",
-      "mac": "172.24.153.13",
+      "ip": "172.24.153.13",
+      "mac": "00:11:25:C4:35:07",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4940d451715e9d0cae7958eec6940a08ea140783..a52f8b3f393da90875e90a9fe741ba20a474dfc4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.14",
+      "mac": "00:11:25:91:46:64",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-302-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:42",
-      "mac": "172.24.26.14",
+      "ip": "172.24.26.14",
+      "mac": "00:11:25:C4:34:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:43",
-      "mac": "172.24.153.14",
+      "ip": "172.24.153.14",
+      "mac": "00:11:25:C4:34:43",
       "management": false,
       "mountable": false,
       "mounted": false,
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 f65bde6312c72bc3526b14e64a5a8cad067147e7..43a630f525ed1d0dbd7b9b59c895a09352291171 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.15",
+      "mac": "00:11:25:91:45:9A",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-303-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:0F:10",
-      "mac": "172.24.26.15",
+      "ip": "172.24.26.15",
+      "mac": "00:11:25:C4:0F:10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:0F:11",
-      "mac": "172.24.153.15",
+      "ip": "172.24.153.15",
+      "mac": "00:11:25:C4:0F:11",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0649ced827dffcf268807f6de3cafba3c4d9478b..96c4cc134c9040cf0251fd713859af630792fac3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.16",
+      "mac": "00:11:25:91:47:9C",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-304-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:58",
-      "mac": "172.24.26.16",
+      "ip": "172.24.26.16",
+      "mac": "00:11:25:C4:33:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:59",
-      "mac": "172.24.153.16",
+      "ip": "172.24.153.16",
+      "mac": "00:11:25:C4:33:59",
       "management": false,
       "mountable": false,
       "mounted": false,
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 a3d1838ec8f738c74b438c9119ce97067f4a9a63..ecd3d151955779a07ea7d8711dc827d55745218c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.17",
+      "mac": "00:11:25:91:46:5B",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-305-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:62",
-      "mac": "172.24.26.17",
+      "ip": "172.24.26.17",
+      "mac": "00:11:25:C4:34:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:63",
-      "mac": "172.24.153.17",
+      "ip": "172.24.153.17",
+      "mac": "00:11:25:C4:34:63",
       "management": false,
       "mountable": false,
       "mounted": false,
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 967072df032dcdab8e7af55f2b02f9bd3c5e505e..7eee9d715cf04f59ffdf034fb0e870b4bacfff69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -14,36 +14,54 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.18",
+      "mac": "00:11:25:91:46:35",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-306-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:41:5A",
-      "mac": "172.24.26.18",
+      "ip": "172.24.26.18",
+      "mac": "00:11:25:C4:41:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-306.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
       "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:41:5B",
-      "mac": "172.24.153.18",
+      "ip": "172.24.153.18",
+      "mac": "00:11:25:C4:41:5B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8a2a5e112cb19f5fcec759dc055096546ae79901..e2eade2b812d76f2de7758484530109b9bfdd6b1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.19",
+      "mac": "00:11:25:91:46:FE",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-307-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:4C",
-      "mac": "172.24.26.19",
+      "ip": "172.24.26.19",
+      "mac": "00:11:25:C4:33:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-307.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:4D",
-      "mac": "172.24.153.19",
+      "ip": "172.24.153.19",
+      "mac": "00:11:25:C4:33:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2d1a378b4b6d0b6d67e54c7dfece7a2dda647e19..f11a572fcc622bac7482cee137b040e4820567fb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -4,6 +4,7 @@
     "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
@@ -14,37 +15,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.20",
+      "mac": "00:11:25:91:46:66",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-308-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:6A",
-      "mac": "172.24.26.20",
+      "ip": "172.24.26.20",
+      "mac": "00:11:25:C4:32:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-308.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:32:6B",
-      "mac": "172.24.153.20",
+      "ip": "172.24.153.20",
+      "mac": "00:11:25:C4:32:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 809517c1c5112bc3005aa2935c1a53c642d0a9dd..9af509cd14410aabff6fba11430a506d9781ab8b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.21",
+      "mac": "00:11:25:91:45:F6",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-309-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:30",
-      "mac": "172.24.26.21",
+      "ip": "172.24.26.21",
+      "mac": "00:11:25:C4:33:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-309.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:31",
-      "mac": "172.24.153.21",
+      "ip": "172.24.153.21",
+      "mac": "00:11:25:C4:33:31",
       "management": false,
       "mountable": false,
       "mounted": false,
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 23ed724719e2368a8c60d6380750ba0fe44b07ca..a0a1d3fc2e244d79c6304f9c953b7aaf5bc44fa5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.31",
+      "mac": "00:11:25:91:45:C5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:24",
-      "mac": "172.24.3.31",
+      "ip": "172.24.3.31",
+      "mac": "00:11:25:C4:35:24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-31.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:25",
-      "mac": "172.24.130.31",
+      "ip": "172.24.130.31",
+      "mac": "00:11:25:C4:35:25",
       "management": false,
       "mountable": false,
       "mounted": false,
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 08345175e1a0890e8e7e00c1ef660af269891c06..688f02ebca522dbeb74687c10518f49f22df41ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -14,37 +14,55 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.153.22",
+      "mac": "00:11:25:91:47:A6",
       "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "gdx-310-bmc.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "netgear09.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve17.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.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_console_mac": "00:A0:9C:00:25:4A",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:D0",
-      "mac": "172.24.26.22",
+      "ip": "172.24.26.22",
+      "mac": "00:11:25:C4:33:D0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-310.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:D1",
-      "mac": "172.24.153.22",
+      "ip": "172.24.153.22",
+      "mac": "00:11:25:C4:33:D1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 25b0cc98e8af997e981b750ff7e52af7c42ec4fa..da5a9841c0ba9136958dbf788fa1920f7c749843 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.32",
+      "mac": "00:11:25:91:49:3D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:08",
-      "mac": "172.24.3.32",
+      "ip": "172.24.3.32",
+      "mac": "00:11:25:C4:35:08",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-32.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:09",
-      "mac": "172.24.130.32",
+      "ip": "172.24.130.32",
+      "mac": "00:11:25:C4:35:09",
       "management": false,
       "mountable": false,
       "mounted": false,
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 aa9b79d7abc890ebc811346d0893dfd7b890d58b..473fe5256360cfe34b73a23a7c4cb317a624fb52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.33",
+      "mac": "00:11:25:91:45:EB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:70",
-      "mac": "172.24.3.33",
+      "ip": "172.24.3.33",
+      "mac": "00:11:25:C4:34:70",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-33.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:71",
-      "mac": "172.24.130.33",
+      "ip": "172.24.130.33",
+      "mac": "00:11:25:C4:34:71",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8ff29b93c930f33ba9b62106c2571ce343fb9248..1dd263af309616c1c7358bfe3cac3ab491f6afbd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.34",
+      "mac": "00:11:25:91:49:34",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:8E",
-      "mac": "172.24.3.34",
+      "ip": "172.24.3.34",
+      "mac": "00:11:25:C4:33:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-34.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:8F",
-      "mac": "172.24.130.34",
+      "ip": "172.24.130.34",
+      "mac": "00:11:25:C4:33:8F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 45e6b5061b71afa6aae133acdcb3b7614a5bdade..b578239759fc7018a0b946939ed4b3f327f2fbbb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.35",
+      "mac": "00:11:25:91:47:C5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:7A",
-      "mac": "172.24.3.35",
+      "ip": "172.24.3.35",
+      "mac": "00:11:25:C4:34:7A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-35.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:7B",
-      "mac": "172.24.130.35",
+      "ip": "172.24.130.35",
+      "mac": "00:11:25:C4:34:7B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 18bf40a715ea142035dd8281ec66276fb0317d9c..c2b659769ea1b8f3d11fcab5f805a4f013acf61d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.130.36",
+      "mac": "00:11:25:91:45:E7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:56",
-      "mac": "172.24.3.36",
+      "ip": "172.24.3.36",
+      "mac": "00:11:25:C4:33:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-36.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
-      "switch_mac": "00:12:01:73:27:C2",
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:57",
-      "mac": "172.24.130.36",
+      "ip": "172.24.130.36",
+      "mac": "00:11:25:C4:33:57",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1241ecfc3c08f19e9ed31ffb758a8fde0a2a13b7..5b7e9c0e426f5eb33358b0c4ad190175a3a86732 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.1",
+      "mac": "00:11:25:91:48:3C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:66",
-      "mac": "172.24.4.1",
+      "ip": "172.24.4.1",
+      "mac": "00:11:25:C4:31:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-37.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:31:67",
-      "mac": "172.24.131.1",
+      "ip": "172.24.131.1",
+      "mac": "00:11:25:C4:31:67",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ae7d88d31b7d3a0e39ed50a87a6f3921b6d5012b..56af53c9a7d78ce5e29e7a0d1f60749d34b55ce7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.2",
+      "mac": "00:11:25:91:47:26",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6C",
-      "mac": "172.24.4.2",
+      "ip": "172.24.4.2",
+      "mac": "00:11:25:C4:34:6C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-38.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6D",
-      "mac": "172.24.131.2",
+      "ip": "172.24.131.2",
+      "mac": "00:11:25:C4:34:6D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b1cc9adc5568653fc0e98e5c39a72f1ee640b7db..6f0061e085dc2045f45f0c2d9a6773763b25f17e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.3",
+      "mac": "00:11:25:91:45:A8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4A",
-      "mac": "172.24.4.3",
+      "ip": "172.24.4.3",
+      "mac": "00:11:25:C4:34:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-39.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:4B",
-      "mac": "172.24.131.3",
+      "ip": "172.24.131.3",
+      "mac": "00:11:25:C4:34:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 8040d392b23dc6ecd13093f8de2b9e7783bbe098..81b82f287f72d3a2483a87acc9aedbf74b7f4ff8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -9,31 +9,13 @@
     "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": null,
-      "mac": null,
+      "ip": "172.26.128.4",
+      "mac": "00:11:25:91:49:63",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -44,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:40",
-      "mac": "172.24.1.4",
+      "ip": "172.24.1.4",
+      "mac": "00:11:25:C4:35:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -71,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:41",
-      "mac": "172.24.128.4",
+      "ip": "172.24.128.4",
+      "mac": "00:11:25:C4:35:41",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7e73b6ff137d9a8fa013f93104a3970430736def..800c13b711d7656aaa9358673250a30214921657 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.4",
+      "mac": "00:11:25:91:46:84",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:66",
-      "mac": "172.24.4.4",
+      "ip": "172.24.4.4",
+      "mac": "00:11:25:C4:33:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-40.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:67",
-      "mac": "172.24.131.4",
+      "ip": "172.24.131.4",
+      "mac": "00:11:25:C4:33:67",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ca65410408e499936a38453a926b29547ee4ef66..ee89eb79e2623fcf2ec81a3982642bdcb6f19016 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.5",
+      "mac": "00:11:25:91:45:AB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:86",
-      "mac": "172.24.4.5",
+      "ip": "172.24.4.5",
+      "mac": "00:11:25:C4:34:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-41.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:87",
-      "mac": "172.24.131.5",
+      "ip": "172.24.131.5",
+      "mac": "00:11:25:C4:34:87",
       "management": false,
       "mountable": false,
       "mounted": false,
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 edb480c0cf81d9fd8a8ce212bbf936644d718cf9..9d48924adcd1e99d5eebac7fa4a76cee0ee067d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.6",
+      "mac": "00:11:25:91:49:2C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:F0",
-      "mac": "172.24.4.6",
+      "ip": "172.24.4.6",
+      "mac": "00:11:25:C4:2B:F0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-42.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:F1",
-      "mac": "172.24.131.6",
+      "ip": "172.24.131.6",
+      "mac": "00:11:25:C4:2B:F1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d2dac33dbd0091678e12ca313fd103eac9f10bed..5780f58a7574490f26a00a93be23ae00c32e4908 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.7",
+      "mac": "00:11:25:91:45:BD",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:2A",
-      "mac": "172.24.4.7",
+      "ip": "172.24.4.7",
+      "mac": "00:11:25:C4:33:2A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-43.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:2B",
-      "mac": "172.24.131.7",
+      "ip": "172.24.131.7",
+      "mac": "00:11:25:C4:33:2B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 356b8de3ca184a7305a350f7dba68bf6c33e1811..809044f0e1f6f4da85d2186e511a538b8bc44f6e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.8",
+      "mac": "00:11:25:91:48:EC",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2F:50",
-      "mac": "172.24.4.8",
+      "ip": "172.24.4.8",
+      "mac": "00:11:25:C4:2F:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-44.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2F:51",
-      "mac": "172.24.131.8",
+      "ip": "172.24.131.8",
+      "mac": "00:11:25:C4:2F:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 73683ef80f75ed7be22084318aff4540eafe5cab..c54968bdda073d3bb21761a75cb71d455ffaf56e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.9",
+      "mac": "00:11:25:91:49:3F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:18",
-      "mac": "172.24.4.9",
+      "ip": "172.24.4.9",
+      "mac": "00:11:25:C4:35:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-45.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:19",
-      "mac": "172.24.131.9",
+      "ip": "172.24.131.9",
+      "mac": "00:11:25:C4:35:19",
       "management": false,
       "mountable": false,
       "mounted": false,
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 47c6849f49c18e31f4c39b673b2807c93643dea7..d95a13591c0d98d3f0f0fa4dcb51a6a3d0184adb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.10",
+      "mac": "00:11:25:91:76:3B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "changée",
-      "mac": "{",
+      "ip": "172.24.4.10",
+      "mac": "00:11:25:C4:09:C6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-46.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:21",
-      "mac": "172.24.131.10",
+      "ip": "172.24.131.10",
+      "mac": "00:11:25:C4:09:C7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 bfdec53e8792e54e53643d1c679eab5f707ed9c7..118b7e9bf970dff69779b68917d099ea93ad8e02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.11",
+      "mac": "00:11:25:91:48:52",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:99",
-      "mac": "172.24.4.11",
+      "ip": "172.24.4.11",
+      "mac": "00:11:25:C4:35:99",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-47.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:9A",
-      "mac": "172.24.131.11",
+      "ip": "172.24.131.11",
+      "mac": "00:11:25:C4:35:9A",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c115bb8fbec250ba5687dc4ebf22ee532420c4ad..aa716b54c67453cf4a389422680ed06c8dcddeab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.131.12",
+      "mac": "00:11:25:91:46:06",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:6C",
-      "mac": "172.24.4.12",
+      "ip": "172.24.4.12",
+      "mac": "00:11:25:C4:2D:6C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-48.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:6D",
-      "mac": "172.24.131.12",
+      "ip": "172.24.131.12",
+      "mac": "00:11:25:C4:2D:6D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7dc442d958c92ef95b385ecae118189d2ee0604f..7ff92dedcc4cf22e72a37a1e0e13b400c5c14616 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.13",
+      "mac": "00:11:25:91:49:11",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:16",
-      "mac": "172.24.5.13",
+      "ip": "172.24.5.13",
+      "mac": "00:11:25:C4:33:16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-49.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:17",
-      "mac": "172.24.132.13",
+      "ip": "172.24.132.13",
+      "mac": "00:11:25:C4:33:17",
       "management": false,
       "mountable": false,
       "mounted": false,
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 cf39492a36d927992daa0881fef268f0c4d884f7..24ca7bca42c31094be6f1cd662e000e12cee38cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.5",
+      "mac": "00:11:25:91:47:B0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:52",
-      "mac": "172.24.1.5",
+      "ip": "172.24.1.5",
+      "mac": "00:11:25:C4:33:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:53",
-      "mac": "172.24.128.5",
+      "ip": "172.24.128.5",
+      "mac": "00:11:25:C4:33:53",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0ac5fc8336c99d8dc5c7f96f211eefbf3feebdc9..2aa06c464a5371638bc0149f436a1f4d95815163 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.14",
+      "mac": "00:11:25:91:49:3C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:92",
-      "mac": "172.24.5.14",
+      "ip": "172.24.5.14",
+      "mac": "00:11:25:C4:33:92",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-50.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:33:93",
-      "mac": "172.24.132.14",
+      "ip": "172.24.132.14",
+      "mac": "00:11:25:C4:33:93",
       "management": false,
       "mountable": false,
       "mounted": false,
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 11222f7aa56692c4982d57b267db9c5d0760f506..4f3420268116ccdf07d4a626e9a004293bf3b690 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.15",
+      "mac": "00:11:25:91:45:C1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:49:8E",
-      "mac": "172.24.5.15",
+      "ip": "172.24.5.15",
+      "mac": "00:11:25:C4:49:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-51.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:49:8F",
-      "mac": "172.24.132.15",
+      "ip": "172.24.132.15",
+      "mac": "00:11:25:C4:49:8F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c9fb5c3c131eebac5f703a91e42828d75ac9bb1d..f349b846abf028a86ec051eb689d09c22a74e4f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.16",
+      "mac": "00:11:25:91:47:21",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:97",
-      "mac": "172.24.5.16",
+      "ip": "172.24.5.16",
+      "mac": "00:11:25:C4:35:97",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-52.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:98",
-      "mac": "172.24.132.16",
+      "ip": "172.24.132.16",
+      "mac": "00:11:25:C4:35:98",
       "management": false,
       "mountable": false,
       "mounted": false,
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 671bddb180836aece6f50fd4d23caf609c419600..0d964fba3189c8fe2beedc0a9fb0ae015c0188f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -4,6 +4,7 @@
     "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
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.17",
+      "mac": "00:11:25:91:47:B1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:F6",
-      "mac": "172.24.5.17",
+      "ip": "172.24.5.17",
+      "mac": "00:11:25:C4:3B:F6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-53.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:F7",
-      "mac": "172.24.132.17",
+      "ip": "172.24.132.17",
+      "mac": "00:11:25:C4:3B:F7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c18f07ae57174e100521defb36262c08d0deda9b..63b9f63f0934a7191e51eeb309ceceff55c1bd99 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.18",
+      "mac": "00:11:25:91:45:93",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:BC",
-      "mac": "172.24.5.18",
+      "ip": "172.24.5.18",
+      "mac": "00:11:25:C4:35:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-54.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:BD",
-      "mac": "172.24.132.18",
+      "ip": "172.24.132.18",
+      "mac": "00:11:25:C4:35:BD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1e520f78334e90bf13785a5bf19fe77e78c5a9d9..5f0e2f6837599e707e8eedf554ad04e80895105d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.19",
+      "mac": "00:11:25:91:49:0B",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:BC",
-      "mac": "172.24.5.19",
+      "ip": "172.24.5.19",
+      "mac": "00:11:25:C4:3B:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-55.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:BD",
-      "mac": "172.24.132.19",
+      "ip": "172.24.132.19",
+      "mac": "00:11:25:C4:3B:BD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b5180f57d3f09c7193c10060185de9762745e8b8..64297d80cf2c1e608647673dc3d5fd43c22a5051 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.20",
+      "mac": "00:11:25:91:47:96",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:7C",
-      "mac": "172.24.5.20",
+      "ip": "172.24.5.20",
+      "mac": "00:11:25:C4:3C:7C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-56.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:7D",
-      "mac": "172.24.132.20",
+      "ip": "172.24.132.20",
+      "mac": "00:11:25:C4:3C:7D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e57482a40a6d115ec8316db95b480c35d86a87fa..d326782a71db76e357c06968a21e5ea425d739ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.21",
+      "mac": "00:11:25:91:49:50",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:24",
-      "mac": "172.24.5.21",
+      "ip": "172.24.5.21",
+      "mac": "00:11:25:C4:3C:24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-57.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:25",
-      "mac": "172.24.132.21",
+      "ip": "172.24.132.21",
+      "mac": "00:11:25:C4:3C:25",
       "management": false,
       "mountable": false,
       "mounted": false,
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 db7f1904de1953a54c1ea2aa8e718649f86ef75e..448fdf9a15ed7a5ca1148d2a4338519c4e7ba298 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.22",
+      "mac": "00:11:25:91:46:51",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:3E",
-      "mac": "172.24.5.22",
+      "ip": "172.24.5.22",
+      "mac": "00:11:25:C4:39:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-58.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:3F",
-      "mac": "172.24.132.22",
+      "ip": "172.24.132.22",
+      "mac": "00:11:25:C4:39:3F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 46cd39aea47d4f7afd0244a52ad2ae9882c8fa6c..692d92cb5ac8708be5b2d7a6480ab996a117c2a8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.23",
+      "mac": "00:11:25:91:49:03",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2E:30",
-      "mac": "172.24.5.23",
+      "ip": "172.24.5.23",
+      "mac": "00:11:25:C4:2E:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-59.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2E:31",
-      "mac": "172.24.132.23",
+      "ip": "172.24.132.23",
+      "mac": "00:11:25:C4:2E:31",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3f0f90a1c43d401489cdffd8b1770158487472f2..2d6b3738523f9df83884d1538ac784ef2d156fb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.6",
+      "mac": "00:11:25:91:48:17",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +26,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:1E",
-      "mac": "172.24.1.6",
+      "ip": "172.24.1.6",
+      "mac": "00:11:25:C4:35:1E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:1F",
-      "mac": "172.24.128.6",
+      "ip": "172.24.128.6",
+      "mac": "00:11:25:C4:35:1F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7f0837d63f2869e0869d32be32704e8c896bcd20..f0d831cbde851a9ebea63077df3f0ac7a49b463d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.132.24",
+      "mac": "00:11:25:91:46:57",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:2C",
-      "mac": "172.24.5.24",
+      "ip": "172.24.5.24",
+      "mac": "00:11:25:C4:3E:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-60.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:2D",
-      "mac": "172.24.132.24",
+      "ip": "172.24.132.24",
+      "mac": "00:11:25:C4:3E:2D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 08647b42db9d10cbc7ce9249284d9ed137b6f634..a1a3e8203c1bb8b0c93779fa271d8604073a06e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.25",
+      "mac": "00:11:25:91:48:B3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:10",
-      "mac": "172.24.6.25",
+      "ip": "172.24.6.25",
+      "mac": "00:11:25:C4:4E:10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-61.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:11",
-      "mac": "172.24.133.25",
+      "ip": "172.24.133.25",
+      "mac": "00:11:25:C4:4E:11",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c195e09f4b95a14d11675594c4f27d5464cc69d9..92f835f75d231233a528f70ba5dac5c702a893e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.26",
+      "mac": "00:11:25:91:45:BB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:62",
-      "mac": "172.24.6.26",
+      "ip": "172.24.6.26",
+      "mac": "00:11:25:C4:3C:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-62.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:63",
-      "mac": "172.24.133.26",
+      "ip": "172.24.133.26",
+      "mac": "00:11:25:C4:3C:63",
       "management": false,
       "mountable": false,
       "mounted": false,
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 aa35f5f9772a10ee65da69737a6ba3822919d722..2f36b7d9523063dfa700fb0a3cfa8398ac2902dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.27",
+      "mac": "00:11:25:91:45:B2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:B4",
-      "mac": "172.24.6.27",
+      "ip": "172.24.6.27",
+      "mac": "00:11:25:C4:3B:B4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-63.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:B5",
-      "mac": "172.24.133.27",
+      "ip": "172.24.133.27",
+      "mac": "00:11:25:C4:3B:B5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 17fbdee4bfe3397c9727d9ce45ea989f52526620..99b7c86467f3aaef3b9feee4c6c396162ddcb9e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.28",
+      "mac": "00:11:25:91:45:AF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:86",
-      "mac": "172.24.6.28",
+      "ip": "172.24.6.28",
+      "mac": "00:11:25:C4:39:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-64.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:87",
-      "mac": "172.24.133.28",
+      "ip": "172.24.133.28",
+      "mac": "00:11:25:C4:39:87",
       "management": false,
       "mountable": false,
       "mounted": false,
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 70361bca0dd04820cbb1615ca7a086240d9a1a9d..42bc451d0dc19a6700adeedeafc68085e6920e3a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.29",
+      "mac": "00:11:25:91:46:C0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:4C",
-      "mac": "172.24.6.29",
+      "ip": "172.24.6.29",
+      "mac": "00:11:25:C4:3C:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-65.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:4D",
-      "mac": "172.24.133.29",
+      "ip": "172.24.133.29",
+      "mac": "00:11:25:C4:3C:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 970a16856e66bc786b47b0247c1fcbde55e48c81..b5b19454babdf13036047974d7c0f35f29ac2e83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.30",
+      "mac": "00:11:25:91:46:E1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:E0",
-      "mac": "172.24.6.30",
+      "ip": "172.24.6.30",
+      "mac": "00:11:25:C4:3B:E0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-66.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:E1",
-      "mac": "172.24.133.30",
+      "ip": "172.24.133.30",
+      "mac": "00:11:25:C4:3B:E1",
       "management": false,
       "mountable": false,
       "mounted": false,
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 87c0b199fc15063136f74da6a03c53bfa61f85c3..7f7641ef3dcf5718b14d6ad7a231f42e4e0a423b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Unexisting or detroyed nodes",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.31",
+      "mac": "00:11:25:91:47:09",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:66",
-      "mac": "172.24.6.31",
+      "ip": "172.24.6.31",
+      "mac": "00:11:25:C4:35:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-67.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:67",
-      "mac": "172.24.133.31",
+      "ip": "172.24.133.31",
+      "mac": "00:11:25:C4:35:67",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b0eb6a60925348dbc68d1c5e58a14d891015cd81..d68d5b8e6bb7f846e2d0f8d5bc2bec754492312d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.32",
+      "mac": "00:11:25:91:48:9E",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:18",
-      "mac": "172.24.6.32",
+      "ip": "172.24.6.32",
+      "mac": "00:11:25:C4:3C:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-68.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:19",
-      "mac": "172.24.133.32",
+      "ip": "172.24.133.32",
+      "mac": "00:11:25:C4:3C:19",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7b0f19ea4f78f4ad7d2e7a5f513409de8195c234..96b39af82deb2c5516cdde83e59a657bb038cb9d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.33",
+      "mac": "00:11:25:91:47:B3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:82",
-      "mac": "172.24.6.33",
+      "ip": "172.24.6.33",
+      "mac": "00:11:25:C4:34:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-69.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:83",
-      "mac": "172.24.133.33",
+      "ip": "172.24.133.33",
+      "mac": "00:11:25:C4:34:83",
       "management": false,
       "mountable": false,
       "mounted": false,
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 067d3ccc3c3dc9be2dab4ffd438b48b1d2dea154..f4c2731258bc1264cb6260137e08e3457bb68de6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.7",
+      "mac": "00:11:25:91:46:05",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +27,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:92",
-      "mac": "172.24.1.7",
+      "ip": "172.24.1.7",
+      "mac": "00:11:25:C4:35:92",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:93",
-      "mac": "172.24.128.7",
+      "ip": "172.24.128.7",
+      "mac": "00:11:25:C4:35:93",
       "management": false,
       "mountable": false,
       "mounted": false,
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 85ef396998f9051b3aac543859c881d56238eb1c..f4b2f8f854813eb30e8d32a69dd583b0fe7427f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.34",
+      "mac": "00:11:25:91:46:77",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:4A",
-      "mac": "172.24.6.34",
+      "ip": "172.24.6.34",
+      "mac": "00:11:25:C4:3C:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-70.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3C:4B",
-      "mac": "172.24.133.34",
+      "ip": "172.24.133.34",
+      "mac": "00:11:25:C4:3C:4B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 680b71216ec6c866a8655897cac4195ea84d92cd..d0e8049cb0c205beb7204aa95c8ca8bd26eedcbc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.35",
+      "mac": "00:11:25:91:49:1F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +24,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:78",
-      "mac": "172.24.6.35",
+      "ip": "172.24.6.35",
+      "mac": "00:11:25:C4:35:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-71.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:79",
-      "mac": "172.24.133.35",
+      "ip": "172.24.133.35",
+      "mac": "00:11:25:C4:35:79",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ca20d2e533acc7dec7776995d6b834d9219ae959..ca81cf334a4412628e9829500692109527459588 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.133.36",
+      "mac": "00:11:25:91:46:3D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,26 +25,44 @@
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.202",
-      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_console_mac": "00:A0:9C:00:16:41",
       "switch_ip": "172.26.120.152",
-      "switch_mac": "00:22:3f:e6:f8:ce",
+      "switch_mac": "00:22:3F:E6:F8:CE",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:3C",
-      "mac": "172.24.6.36",
+      "ip": "172.24.6.36",
+      "mac": "00:11:25:C4:3E:3C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-72.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3E:3D",
-      "mac": "172.24.133.36",
+      "ip": "172.24.133.36",
+      "mac": "00:11:25:C4:3E:3D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 caae2fb04219983e7d48091360a15e78160cfb46..8657bc272f7604094fd311683b38de5b1f7c5c9a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.1",
+      "mac": "00:11:25:91:46:80",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:9E",
-      "mac": "172.24.7.1",
+      "ip": "172.24.7.1",
+      "mac": "00:11:25:C4:35:9E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-73.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:9F",
-      "mac": "172.24.134.1",
+      "ip": "172.24.134.1",
+      "mac": "00:11:25:C4:35:9F",
       "management": false,
       "mountable": false,
       "mounted": false,
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 38d3ef0ce2dd3add8593b54854fb9b3bc6d35881..befc3c86f5c363ed52fbba44b25ccb1e2a245e5c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.2",
+      "mac": "00:11:25:91:48:46",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:0A",
-      "mac": "172.24.7.2",
+      "ip": "172.24.7.2",
+      "mac": "00:11:25:C4:2D:0A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-74.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2D:0B",
-      "mac": "172.24.134.2",
+      "ip": "172.24.134.2",
+      "mac": "00:11:25:C4:2D:0B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d0e2d5e7086f74ccff6a4eef2041afaf26647ed8..62a62619b90386da244a6dce25c98a0551d0f258 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.3",
+      "mac": "00:11:25:91:49:00",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:AE",
-      "mac": "172.24.7.3",
+      "ip": "172.24.7.3",
+      "mac": "00:11:25:C4:39:AE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-75.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:39:AF",
-      "mac": "172.24.134.3",
+      "ip": "172.24.134.3",
+      "mac": "00:11:25:C4:39:AF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0497b8b15d22e187103c1fe8402db55a71914940..57369d42c4ed62d0e3e347300705eefd8e3904d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.4",
+      "mac": "00:11:25:91:49:37",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:2C",
-      "mac": "172.24.7.4",
+      "ip": "172.24.7.4",
+      "mac": "00:11:25:C4:2B:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-76.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:2B:2D",
-      "mac": "172.24.134.4",
+      "ip": "172.24.134.4",
+      "mac": "00:11:25:C4:2B:2D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 2b9b1103b4f9faca1e0bf3db4dffdfac63df743b..dd9943bf6bb376edfb101edc5c7fd355886de1b6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.5",
+      "mac": "00:11:25:91:46:46",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:94",
-      "mac": "172.24.7.5",
+      "ip": "172.24.7.5",
+      "mac": "00:11:25:C4:38:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-77.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:38:95",
-      "mac": "172.24.134.5",
+      "ip": "172.24.134.5",
+      "mac": "00:11:25:C4:38:95",
       "management": false,
       "mountable": false,
       "mounted": false,
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 32ebba63ef2d7504ba53c0f58eda717d1bfd2862..384dc4b03414445dc35035f2fb69a6fba7f1a8ce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.6",
+      "mac": "00:11:25:91:47:F1",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:56",
-      "mac": "172.24.7.6",
+      "ip": "172.24.7.6",
+      "mac": "00:11:25:C4:26:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-78.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:57",
-      "mac": "172.24.134.6",
+      "ip": "172.24.134.6",
+      "mac": "00:11:25:C4:26:57",
       "management": false,
       "mountable": false,
       "mounted": false,
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 ab9435f4641f6f5b0f49b91bf61e981573183c06..885f7ade5736428b5cf1f38cf9523e53d7ec677b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.7",
+      "mac": "00:11:25:91:48:4D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:76",
-      "mac": "172.24.7.7",
+      "ip": "172.24.7.7",
+      "mac": "00:11:25:C4:35:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-79.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:77",
-      "mac": "172.24.134.7",
+      "ip": "172.24.134.7",
+      "mac": "00:11:25:C4:35:77",
       "management": false,
       "mountable": false,
       "mounted": false,
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 7e6ada357fc5b2f17512c0e626a043660be4f68c..8025c2b498050c48b896832cff2dfc8a7402cc52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.8",
+      "mac": "00:11:25:91:46:3F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +27,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:C2",
-      "mac": "172.24.1.8",
+      "ip": "172.24.1.8",
+      "mac": "00:11:25:C4:35:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:35:C3",
-      "mac": "172.24.128.8",
+      "ip": "172.24.128.8",
+      "mac": "00:11:25:C4:35:C3",
       "management": false,
       "mountable": false,
       "mounted": false,
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 833fd81838fd466a956c185042ebeb5b47a41966..1514445726af764c8b965e1a7f290342719ed848 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.8",
+      "mac": "00:11:25:91:45:A3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:BE",
-      "mac": "172.24.7.8",
+      "ip": "172.24.7.8",
+      "mac": "00:11:25:C4:3A:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-80.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:BF",
-      "mac": "172.24.134.8",
+      "ip": "172.24.134.8",
+      "mac": "00:11:25:C4:3A:BF",
       "management": false,
       "mountable": false,
       "mounted": false,
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 42ab99953e14a7bed08de43d91da1294218721b9..08b7245da0c7c1e709f20b7e21bdfaf7e311d363 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.9",
+      "mac": "00:11:25:91:46:0A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:50",
-      "mac": "172.24.7.9",
+      "ip": "172.24.7.9",
+      "mac": "00:11:25:C4:26:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-81.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:51",
-      "mac": "172.24.134.9",
+      "ip": "172.24.134.9",
+      "mac": "00:11:25:C4:26:51",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c9f3e8211c3f1777f7b8f0b567b8e10961490771..67d29674211e5461b8776dd969f8bdbdead200a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.10",
+      "mac": "00:11:25:91:45:D5",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:24:04",
-      "mac": "172.24.7.10",
+      "ip": "172.24.7.10",
+      "mac": "00:11:25:C4:24:04",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-82.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:24:05",
-      "mac": "172.24.134.10",
+      "ip": "172.24.134.10",
+      "mac": "00:11:25:C4:24:05",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d0d3d5555aab902410c1b5b0ecdf1372c263f5b9..e36a6300a1a6ee3b98c0d53b811b5bb1ed4d297f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Keeps restarting every 3 seconds.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.11",
+      "mac": "00:11:25:91:46:03",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:8A",
-      "mac": "172.24.7.11",
+      "ip": "172.24.7.11",
+      "mac": "00:11:25:C4:26:8A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-83.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:8B",
-      "mac": "172.24.134.11",
+      "ip": "172.24.134.11",
+      "mac": "00:11:25:C4:26:8B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 dba153d1eb5aec06fd07ac60c8263d1b4c254cb6..cca8e426d3413c4a980f761d7c6477bb0731a109 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.134.12",
+      "mac": "00:11:25:91:46:1A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:86",
-      "mac": "172.24.7.12",
+      "ip": "172.24.7.12",
+      "mac": "00:11:25:C4:3A:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-84.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3A:87",
-      "mac": "172.24.134.12",
+      "ip": "172.24.134.12",
+      "mac": "00:11:25:C4:3A:87",
       "management": false,
       "mountable": false,
       "mounted": false,
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 713b55210e831617362930844a0be66554834c23..2e7591aca46974131042dc0dbd3abce0fb37bc8d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.13",
+      "mac": "00:11:25:91:48:93",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:44",
-      "mac": "172.24.8.13",
+      "ip": "172.24.8.13",
+      "mac": "00:11:25:C4:3B:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-85.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:3B:45",
-      "mac": "172.24.135.13",
+      "ip": "172.24.135.13",
+      "mac": "00:11:25:C4:3B:45",
       "management": false,
       "mountable": false,
       "mounted": false,
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 e7d52d4d3847416f780011921596c8cd79070c69..ec390146d230ba674a375047438b820583a0b61e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.14",
+      "mac": "00:11:25:91:49:47",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:4C",
-      "mac": "172.24.8.14",
+      "ip": "172.24.8.14",
+      "mac": "00:11:25:C4:26:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-86.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:26:4D",
-      "mac": "172.24.135.14",
+      "ip": "172.24.135.14",
+      "mac": "00:11:25:C4:26:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 3d1e34d67ca5e3d38f13e65ecf3e9dbe525ce1c0..35aef18959d133e118e073dc28a07038b60d54d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.15",
+      "mac": "00:11:25:91:48:B4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:F4",
-      "mac": "172.24.8.15",
+      "ip": "172.24.8.15",
+      "mac": "00:11:25:C4:4D:F4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-87.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:F5",
-      "mac": "172.24.135.15",
+      "ip": "172.24.135.15",
+      "mac": "00:11:25:C4:4D:F5",
       "management": false,
       "mountable": false,
       "mounted": false,
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 c2b829bd144945e014a91f20b41721ea0b176237..dd5c560602d38fba103b4e34b29b7d8ded701573 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.16",
+      "mac": "00:11:25:91:46:3A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:28",
-      "mac": "172.24.8.16",
+      "ip": "172.24.8.16",
+      "mac": "00:11:25:C4:4E:28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-88.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:29",
-      "mac": "172.24.135.16",
+      "ip": "172.24.135.16",
+      "mac": "00:11:25:C4:4E:29",
       "management": false,
       "mountable": false,
       "mounted": false,
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 862c7e5b965f839ed63622b27ee011c1cef34bea..b7e8a08cc4f10867962314d4054f3cfc040f3a5f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.17",
+      "mac": "00:11:25:91:45:CE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:5C",
-      "mac": "172.24.8.17",
+      "ip": "172.24.8.17",
+      "mac": "00:11:25:C4:4E:5C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-89.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:5D",
-      "mac": "172.24.135.17",
+      "ip": "172.24.135.17",
+      "mac": "00:11:25:C4:4E:5D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 45c69183d1272bf5b9198739dd743621616f121b..a59c2606b1f4d468571ea90f6eb7799e52ba48e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.128.9",
+      "mac": "00:11:25:91:48:AC",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -26,25 +27,43 @@
       "switch_console_ip": "172.26.120.201",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
-      "switch_mac": "00:0f:b5:fc:0d:26",
+      "switch_mac": "00:0F:B5:FC:0D:26",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6A",
-      "mac": "172.24.1.9",
+      "ip": "172.24.1.9",
+      "mac": "00:11:25:C4:34:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
-      "switch_mac": "00:12:01:73:21:C2",
+      "switch": "switch01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.101",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:34:6B",
-      "mac": "172.24.128.9",
+      "ip": "172.24.128.9",
+      "mac": "00:11:25:C4:34:6B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 0fc30de7d04c57576cdf90f5633795d7efcaed7e..11af46ee3edc68c6bed5b9cbd278bff01f68bebf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.18",
+      "mac": "00:11:25:91:49:5A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:02",
-      "mac": "172.24.8.18",
+      "ip": "172.24.8.18",
+      "mac": "00:11:25:C4:51:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-90.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
-      "switch_mac": "00:24:f9:3e:e7:42",
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:03",
-      "mac": "172.24.135.18",
+      "ip": "172.24.135.18",
+      "mac": "00:11:25:C4:51:03",
       "management": false,
       "mountable": false,
       "mounted": false,
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 38b6660290d7fc61f7576ce3011cd23dda138b0b..350995d8ef417f7a30b0ac387c02c71aeb2a67f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.19",
+      "mac": "00:11:25:91:46:1C",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:4C",
-      "mac": "172.24.8.19",
+      "ip": "172.24.8.19",
+      "mac": "00:11:25:C4:51:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-91.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:51:4D",
-      "mac": "172.24.135.19",
+      "ip": "172.24.135.19",
+      "mac": "00:11:25:C4:51:4D",
       "management": false,
       "mountable": false,
       "mounted": false,
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 d2687cbb558532b72a1307ce9facfb79e8509a50..749244921949a0f20febe3654ab7898f6b078bf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -14,8 +14,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.20",
+      "mac": "00:11:25:91:46:4D",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +24,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:82",
-      "mac": "172.24.8.20",
+      "ip": "172.24.8.20",
+      "mac": "00:11:25:C4:4D:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-92.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +71,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4D:83",
-      "mac": "172.24.135.20",
+      "ip": "172.24.135.20",
+      "mac": "00:11:25:C4:4D:83",
       "management": false,
       "mountable": false,
       "mounted": false,
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 1bf54369ca598a2b05168bfa1bd6c95b902f5936..f7c4e6a51e3e9325db760b170b7b056d6ad9d22b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.21",
+      "mac": "00:11:25:91:48:2F",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:A6",
-      "mac": "172.24.8.21",
+      "ip": "172.24.8.21",
+      "mac": "00:11:25:C4:4F:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-93.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:A7",
-      "mac": "172.24.135.21",
+      "ip": "172.24.135.21",
+      "mac": "00:11:25:C4:4F:A7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 4cf92de9fb16ea52cf110e31137c2d0334ab6046..a91990284c291a5b3a7749a5bac2a78bc2f4638d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.22",
+      "mac": "00:11:25:91:48:05",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:FC",
-      "mac": "172.24.8.22",
+      "ip": "172.24.8.22",
+      "mac": "00:11:25:C4:53:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-94.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:53:FD",
-      "mac": "172.24.135.22",
+      "ip": "172.24.135.22",
+      "mac": "00:11:25:C4:53:FD",
       "management": false,
       "mountable": false,
       "mounted": false,
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 390ca6495f3db6f00984cd0174f61c559540328b..1f2acbe2d6dfa669ba1dece995b0753224304be4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.23",
+      "mac": "00:11:25:91:45:F7",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:30",
-      "mac": "172.24.8.23",
+      "ip": "172.24.8.23",
+      "mac": "00:11:25:C4:4F:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-95.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:31",
-      "mac": "172.24.135.23",
+      "ip": "172.24.135.23",
+      "mac": "00:11:25:C4:4F:31",
       "management": false,
       "mountable": false,
       "mounted": false,
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 270b00b222cac56305689051a35f15a16ee53280..ae6ec79f2cdfcec2bd7c52699f660a0525c74be3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.135.24",
+      "mac": "00:11:25:91:45:EE",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A6",
-      "mac": "172.24.8.24",
+      "ip": "172.24.8.24",
+      "mac": "00:11:25:C4:50:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-96.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:50:A7",
-      "mac": "172.24.135.24",
+      "ip": "172.24.135.24",
+      "mac": "00:11:25:C4:50:A7",
       "management": false,
       "mountable": false,
       "mounted": false,
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 72a055a210dd5cea091541c2c49adb214ebf07d5..f82a6f87c94d05202a456e2f6689fc09bb97654c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.25",
+      "mac": "00:11:25:91:45:7A",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:06",
-      "mac": "172.24.9.25",
+      "ip": "172.24.9.25",
+      "mac": "00:11:25:C4:4F:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-97.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:07",
-      "mac": "172.24.136.25",
+      "ip": "172.24.136.25",
+      "mac": "00:11:25:C4:4F:07",
       "management": false,
       "mountable": false,
       "mounted": false,
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 20b03c2b324a55e4e11f6eac952b1588feff4dda..dbedbb83488b2d8cccd5edfff1f25682e38b84c5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.26",
+      "mac": "00:11:25:91:47:BB",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:1A",
-      "mac": "172.24.9.26",
+      "ip": "172.24.9.26",
+      "mac": "00:11:25:C4:4E:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-98.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4E:1B",
-      "mac": "172.24.136.26",
+      "ip": "172.24.136.26",
+      "mac": "00:11:25:C4:4E:1B",
       "management": false,
       "mountable": false,
       "mounted": false,
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 b0d18e2be8eb8acd311e4341774e0553c95dabf0..708ba9a314c46ede8217e2bb728fafcccded2036 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Hard disks not detected at boot, turned to dead.",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -14,8 +15,8 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.26.136.27",
+      "mac": "00:11:25:91:45:C2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -24,27 +25,45 @@
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.203",
-      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_console_mac": "00:A0:9C:00:12:DD",
       "switch_ip": "172.26.120.153",
-      "switch_mac": "00:0f:b5:fb:70:89",
+      "switch_mac": "00:0F:B5:FB:70:89",
       "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": "myri.orsay.grid5000.fr",
+      "switch_ip": "172.26.121.100",
+      "switch_mac": "00:60:DD:47:1E:66",
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:3E",
-      "mac": "172.24.9.27",
+      "ip": "172.24.9.27",
+      "mac": "00:11:25:C4:4F:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-99.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
-      "switch_mac": 155681622,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,8 +72,8 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "ip": "00:11:25:C4:4F:3F",
-      "mac": "172.24.136.27",
+      "ip": "172.24.136.27",
+      "mac": "00:11:25:C4:4F:3F",
       "management": false,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index dfb56f9d4ec7f2eddbdf020cb529167410870e33..74ffb5eb6a9833601823cb7cb56a027f9a6e0bac 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.1",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.1",
       "mac": "00:11:25:c4:4f:63",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.1",
-      "mac": "00:11:25:c4:4f:62",
+      "mac": "00:10:18:16:4f:2e",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index 968da476fc1a2b97dd074fc576f0a65bf7f5e6fe..a99260cea68b82e7a06f1304a6d3acb01f671acc 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.10",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.10",
       "mac": "00:11:25:c4:28:43",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.10",
-      "mac": "00:11:25:c4:28:42",
+      "mac": "00:10:18:16:4d:f9",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index 052024c001336e18c414f4642f361ff307f4cf0a..6ef4bb1bda839e078eb076c5f19b53abf08a2a9d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.11",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.11",
       "mac": "00:11:25:c4:4f:57",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.11",
-      "mac": "00:11:25:c4:4f:56",
+      "mac": "00:10:18:16:4d:dc",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index 7ed2c426e0dfdfc3ec6dd7f24abeaf8d9cccef18..f6934227fa268cffe5cc9cadda41c6398dcf0538 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.12",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.12",
       "mac": "00:11:25:c4:4d:eb",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.12",
-      "mac": "00:11:25:c4:4d:ea",
+      "mac": "00:10:18:16:4d:57",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index 5d1cd68aa109a5324a906570cfb3201c68072a9f..fd5778ce33355114b325cb9e76ce9234218b580d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.13",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.13",
       "mac": "00:11:25:c4:52:b7",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.13",
-      "mac": "00:11:25:c4:52:b6",
+      "mac": "00:10:18:16:4d:cb",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index b202b4b4437e1ee8c5e64f45fae854ce8d089001..db7541871d6cc530a7f47c3526079659a6629c66 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.14",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.14",
       "mac": "00:11:25:c4:52:63",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.14",
-      "mac": "00:11:25:c4:52:62",
+      "mac": "00:10:18:16:4f:d9",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index 12ab891a7f16c40ab12c57f4b0d1f786a4fe6468..1576bc4ee834136d461e6dc3621c5169e09de14a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.15",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.15",
       "mac": "00:11:25:c4:4f:77",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.15",
-      "mac": "00:11:25:c4:4f:76",
+      "mac": "00:10:18:16:4f:0b",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index ae660734613f1c848d15b055a0474df296ac1cf3..90fc04602a9fce36b265a1cfcee01779d020fcc0 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.16",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.16",
       "mac": "00:11:25:c4:4f:49",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.16",
-      "mac": "00:11:25:c4:4f:48",
+      "mac": "00:10:18:16:4f:0e",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index c6949a0f1798e618a434794c58f4e098b5278da3..522ecef8955dca97baa9918d98c260d13108c177 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.17",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.17",
       "mac": "00:11:25:c4:42:e1",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.17",
-      "mac": "00:11:25:c4:42:e0",
+      "mac": "00:10:18:16:4f:23",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 196f20351a9ddd8df1ef4e91c439eea36a4e8bdf..ec09299613753aa3a6fe8bbe8f47f341b3487b77 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.18",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.18",
       "mac": "00:11:25:c4:4e:c7",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.18",
-      "mac": "00:11:25:c4:4e:c6",
+      "mac": "00:10:18:16:28:1c",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index d33b7b564fd5af5a9784c83bbb8685708cf69ed5..c9220441ba6cc7fc0facefa94f2acb1ae0ee65d5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.19",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.19",
       "mac": "00:11:25:c4:4f:8b",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.19",
-      "mac": "00:11:25:c4:4f:8a",
+      "mac": "00:10:18:16:4f:74",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index 54670c265b1a92e82d428901a543b1698662fee5..82a89aaa8ac406b81032090e751aa8d3f1ca7c92 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.2",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.2",
       "mac": "00:11:25:c4:52:bd",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.2",
-      "mac": "00:11:25:c4:52:bc",
+      "mac": "00:10:18:16:50:6c",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index f1446182b2075bd4d0338e3d6674664b61bc1bc0..ff0250f88d12ee16e5c632a53ddd932cd01336c8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.20",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.20",
       "mac": "00:11:25:c4:4d:7d",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.20",
-      "mac": "00:11:25:c4:4d:7c",
+      "mac": "00:10:18:16:4e:ec",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index f40aa48c628142427ba4363ac76e9af9d418b2b1..4b2d0a34712df43d3c202d5be7ef64704ec3f0bd 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.21",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.21",
       "mac": "00:11:25:c4:50:2f",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.21",
-      "mac": "00:11:25:c4:50:2e",
+      "mac": "00:10:18:0b:e2:c2",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index 65147ffe5115f54b8812bd561895ac47ad044d4c..f6a3387f1d56465f4067d2be3f4766bb7451e94e 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.22",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.22",
       "mac": "00:11:25:c4:4f:7f",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.22",
-      "mac": "00:11:25:c4:4f:7e",
+      "mac": "00:10:18:0b:d8:a3",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index 9c80328f65be1c757f6e2031a8973be171fa3a9c..2f12e4e1d5eed1662c07231fad80406cadbbb3b4 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.23",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.23",
       "mac": "00:11:25:c4:4f:ff",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.23",
-      "mac": "00:11:25:c4:4f:fe",
+      "mac": "00:10:18:00:fa:12",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index b8388ee0c5aa02b4af9753123d7e2845fa387834..5e972d50718d613818e21d4701ae79c47b1379b0 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.24",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.24",
       "mac": "00:11:25:c4:54:8b",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.24",
-      "mac": "00:11:25:c4:54:8a",
+      "mac": "00:10:18:06:4f:a5",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 1329cf1f2c172e62151cab21b24d7953e7223ccf..c1163ba766e0f4cb29a6fc93bd54c2aa9d43199b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.25",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.25",
       "mac": "00:11:25:c4:52:69",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.25",
-      "mac": "00:11:25:c4:52:68",
+      "mac": "00:10:18:06:4f:e8",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index ae42ce910f1933b378b0f447e94808b0f63bbdad..30c04eada25c889469d5b432b6dde443040e85e5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.26",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.26",
       "mac": "00:11:25:c4:52:bb",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.26",
-      "mac": "00:11:25:c4:52:ba",
+      "mac": "00:10:18:06:4e:db",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index 66d8c12361c09a7b6b18030553bfb182041e9ef5..dc526a3264d4c22c236f975f3bf094fa71c586cd 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -4,6 +4,7 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "comments": "Boot aborts because of tg3 driver : 'could not obtain valid ethernet address, aborting. probe of 0000:03:02.0 failed with error -22'",
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
@@ -11,10 +12,11 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.27",
-      "mac": null,
+      "mac": "00:11:25:91:46:34",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -23,9 +25,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -35,7 +37,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.27",
-      "mac": null,
+      "mac": "00:11:25:1E:79:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -50,13 +52,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.27",
-      "mac": null,
+      "mac": "00:11:25:1E:79:09",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +73,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.27",
-      "mac": null,
+      "mac": "00:10:18:06:4F:A7",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index 02e9065d56e93cd57dae6a650fed4f3ddfe7a7e9..f14d6a3c2659c24984f4deaa6b403fe5b6567c73 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.28",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.28",
       "mac": "00:11:25:c4:4d:29",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.28",
-      "mac": "00:11:25:c4:4d:28",
+      "mac": "00:10:18:06:4f:ae",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index 6214d52564c6e588d7b56a7300ebab6943769140..0e31841bb0cc00480dac4e540de62775abee8e40 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.29",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.29",
       "mac": "00:11:25:c4:4f:9f",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.29",
-      "mac": "00:11:25:c4:4f:9e",
+      "mac": "00:10:18:06:4f:b5",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 4fb4d8bb283895a95df7f82cb6b4617a97fe2b49..00ca5f06a8873df35a7c0b1b2f7e7a477ee1a570 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.3",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.3",
       "mac": "00:11:25:c4:4f:67",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.3",
-      "mac": "00:11:25:c4:4f:66",
+      "mac": "00:10:18:16:4a:f0",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 4d4e8b6480f5315e5e8f851d4cabe4418f8495c8..d9bb32a592c46be2d95aa705e8c9861ab0249cc4 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.30",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.30",
       "mac": "00:11:25:c4:4f:39",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.30",
-      "mac": "00:11:25:c4:4f:38",
+      "mac": "00:10:18:06:4f:b0",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index 1f4527f766f5f61bf1fbe726d76fef7200ad4168..15808a84678e7444121061c1701470f21f52314f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.4",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.4",
       "mac": "00:11:25:c4:50:95",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.4",
-      "mac": "00:11:25:c4:50:94",
+      "mac": "00:10:18:16:4f:31",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index 078a2819e8b9c9e8afcefa691ed809388b9e1b0a..4ca5dad42c10e59dd5869e3d6218b0aefaf9c632 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.5",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.5",
       "mac": "00:11:25:c4:50:91",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.5",
-      "mac": "00:11:25:c4:50:90",
+      "mac": "00:10:18:16:4e:c9",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index 5670fdf8f97c7dce12b6096e9ed55f3b270965ca..da7b8a0246106e38d0aebe30c7576a2fb2992d6c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.6",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.6",
       "mac": null,
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -73,15 +74,15 @@
       "ip": "172.24.190.6",
       "mac": null,
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index cacce56863e3d318edbb9c81188287b33894773d..7dc4d9497c80ab9c20de5274d4f15b41b8de75c4 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.7",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.7",
       "mac": "00:11:25:c4:4f:61",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.7",
-      "mac": "00:11:25:c4:4f:60",
+      "mac": "00:10:18:16:4d:86",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index 8b282afbd3289f363dc101036c436b7965d6c22b..94ed3f6c84645061dabb875c633a04ddbb46b218 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.8",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.8",
       "mac": "00:11:25:c4:4f:d5",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.8",
-      "mac": "00:11:25:c4:4f:d4",
+      "mac": "00:10:18:16:4e:f0",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index ac1d842b01174596def12bf7244affb6ecfb150d..996b69234214cb51728e132baa09b3e8d4e9456f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "bmc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.26.240.9",
@@ -23,9 +24,9 @@
       "switch": "netgear10.orsay.grid5000.fr",
       "switch_console": "mrv00.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.200",
-      "switch_console_mac": "00:a0:9c:00:12:fa",
+      "switch_console_mac": "00:A0:9C:00:12:FA",
       "switch_ip": "172.26.120.160",
-      "switch_mac": "00:0f:b5:fc:0d:a8",
+      "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -50,13 +51,13 @@
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.240.9",
       "mac": "00:11:25:c4:54:5d",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
@@ -71,17 +72,17 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.9",
-      "mac": "00:11:25:c4:54:5c",
+      "mac": "00:10:18:16:4f:91",
       "management": false,
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
       "switch_ip": "172.24.120.10",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
-      "version": "NetXtreme BCM5703"
+      "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {