diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
index de961acdcbc76d4278067a1829d8a1182175ed99..accec728027730621b71a735326979ad6061d616 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.74",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-1.lille.grid5000.fr",
+      "network_address": "chicon-1-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.74",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/34"
+      "switch_port": "Gi3\/34",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.74",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-1-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.74",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-1-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
index 2ad44f4666e18a36fad72cd2b04d099fa215f93c..52c08ee5e361dd142490ba911f4d161d39c188a1 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.83",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-10.lille.grid5000.fr",
+      "network_address": "chicon-10-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.83",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/3"
+      "switch_port": "Gi4\/3",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.83",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-10-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.83",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-10-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
index 617e30360c75b6768a92d4c693412ea45cc7e006..df4e6bcf87c4c29c32b24dcebb558dd1cb39ceda 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.84",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-11.lille.grid5000.fr",
+      "network_address": "chicon-11-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.84",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/4"
+      "switch_port": "Gi4\/4",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.84",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-11-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.84",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-11-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
index 801b83c4f3c8a0982084a372814941339e1dd260..2e42aea7f1743c8d2705246b844a8803c70494a5 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.85",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-12.lille.grid5000.fr",
+      "network_address": "chicon-12-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.85",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/5"
+      "switch_port": "Gi4\/5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.85",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-12-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.85",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-12-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
index 0384da577dd05c0ee8f146e249907a16c59feb2e..46e2c2e6435496496942cb18b9b384e566f32898 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.86",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-13.lille.grid5000.fr",
+      "network_address": "chicon-13-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.86",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/6"
+      "switch_port": "Gi4\/6",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.86",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-13-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.86",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-13-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
index d998b65e2ee9b7b813313d331cd732ec5ff54a30..c595c99f8648134205c354119d0655af2cea0a89 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.87",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-14.lille.grid5000.fr",
+      "network_address": "chicon-14-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.87",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/7"
+      "switch_port": "Gi4\/7",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.87",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-14-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.87",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-14-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
index 74b613eed3e2ef0cb169cd18671a161313bfc696..9727ec42943f6a383d1932d453a33885296d1787 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.88",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-15.lille.grid5000.fr",
+      "network_address": "chicon-15-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.88",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/8"
+      "switch_port": "Gi4\/8",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.88",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-15-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.88",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-15-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
index 9d2bd2bab3126652434ca67bf18896d90b063f18..4834cbac9a887aa3c7dfd8f96cae02193afbab3f 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.89",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-16.lille.grid5000.fr",
+      "network_address": "chicon-16-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.89",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/9"
+      "switch_port": "Gi4\/9",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.89",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-16-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.89",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-16-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
index d85dfc4d596e8c358bc51af6f63cb95f8bfab139..1d9fb27581e0dd4ec64f9951b84de7dc0a0dacad 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.90",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-17.lille.grid5000.fr",
+      "network_address": "chicon-17-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.90",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/10"
+      "switch_port": "Gi4\/10",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.90",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-17-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.90",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-17-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
index e97af7db58a0257c40f7dc07ae4e0bb9fe20be3f..3baf5258d55062c6631e6d4987d2989302cc318c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.91",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-18.lille.grid5000.fr",
+      "network_address": "chicon-18-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.91",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/11"
+      "switch_port": "Gi4\/11",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.91",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-18-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.91",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-18-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
index f3c17bc07fef74cd555612ef50f55aaa7b02e1e1..8e85064fd28060d728bbec056ae9a670bf854436 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.92",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-19.lille.grid5000.fr",
+      "network_address": "chicon-19-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.92",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/12"
+      "switch_port": "Gi4\/12",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.92",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-19-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.92",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-19-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
index 12ab9fd559816aad807a0825cddc5d795f26a8a5..9bd0ab6efb91f25a44813dcca33d4d97a02f4c6c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.75",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-2.lille.grid5000.fr",
+      "network_address": "chicon-2-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.75",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/35"
+      "switch_port": "Gi3\/35",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.75",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-2-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.75",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-2-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
index 0c70e2309518ce63942ec658eec70e699ca2edbd..3a4dbdf7c9df84a2b178975bd29a4f6062fa3849 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.93",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-20.lille.grid5000.fr",
+      "network_address": "chicon-20-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.93",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/13"
+      "switch_port": "Gi4\/13",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.93",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-20-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.93",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-20-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
index bc60b266aadb23b13bdc705122c62dab7ea68d54..d462b1b2ad86faf9a9473ea068e7f3086c96b04f 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.94",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-21.lille.grid5000.fr",
+      "network_address": "chicon-21-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.94",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-21.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/14"
+      "switch_port": "Gi4\/14",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.94",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-21-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.94",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-21-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
index 98051ff45377726cc6aea73d919277beba0e14df..0c2076ead743e6f83fb243304c63cff6a2f5f9e7 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.95",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-22.lille.grid5000.fr",
+      "network_address": "chicon-22-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.95",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-22.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/15"
+      "switch_port": "Gi4\/15",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.95",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-22-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.95",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-22-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
index 73735e869641411013b0307807ad55c831787c90..355a82c980afc4f874b9fb00413ce3a8fc3ab339 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.96",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-23.lille.grid5000.fr",
+      "network_address": "chicon-23-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.96",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-23.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/16"
+      "switch_port": "Gi4\/16",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.96",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-23-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.96",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-23-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
index a49e8d0f8b8f918c86e5fd0b5de83785da835eca..178369d95a40e87300dcea0c2a64e845d9e198b6 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.97",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-24.lille.grid5000.fr",
+      "network_address": "chicon-24-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.97",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-24.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/17"
+      "switch_port": "Gi4\/17",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.97",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-24-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.97",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-24-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
index 79d909c9ce9836d504de65d7e9b82245362b44c0..98bad7f1afcdb9879e0fb2f9e906e1db81c295c3 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.98",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-25.lille.grid5000.fr",
+      "network_address": "chicon-25-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.98",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-25.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/18"
+      "switch_port": "Gi4\/18",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.98",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-25-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.98",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-25-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
index 0fcfa06ccd89cc0c5b580e66832f014f556b4c93..f39532370df40eb8076f45f736f7ef694236e5fb 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.99",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-26.lille.grid5000.fr",
+      "network_address": "chicon-26-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.99",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-26.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/19"
+      "switch_port": "Gi4\/19",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.99",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-26-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.99",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-26-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
index d74843f99a121e059969e73a33bb49116b212466..917915c02fdc78657ed51bcbbf2cd4256d54ca28 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.76",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-3.lille.grid5000.fr",
+      "network_address": "chicon-3-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.76",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/36"
+      "switch_port": "Gi3\/36",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.76",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-3-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.76",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-3-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
index 70b56a1872ff3f282aa342e0a108805259752801..ee559a57e87c20355a90eb9690887d2bb79b3c5e 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.77",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-4.lille.grid5000.fr",
+      "network_address": "chicon-4-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.77",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/37"
+      "switch_port": "Gi3\/37",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.77",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-4-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.77",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-4-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
index 626195c14d95152e740021743777db75ffdd8032..009a686d0457d1802edbc34738fb5f3e02a57066 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.78",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-5.lille.grid5000.fr",
+      "network_address": "chicon-5-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.78",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/38"
+      "switch_port": "Gi3\/38",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.78",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-5-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.78",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-5-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
index 9e55d25a9eb2051255182e3fd35b4398bffed073..f1539bbfa4c7912e3b7b232d94a993f667c21be3 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.79",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-6.lille.grid5000.fr",
+      "network_address": "chicon-6-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.79",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/39"
+      "switch_port": "Gi3\/39",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.79",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-6-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.79",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-6-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
index 1cc6bab3f24f273c551098434c36a12e73472776..5164a0be450283f4bfb9d7d1d16213708d8fddf7 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.80",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-7.lille.grid5000.fr",
+      "network_address": "chicon-7-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.80",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/40"
+      "switch_port": "Gi3\/40",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.80",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-7-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.80",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-7-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
index cb52885f4b918d6a990e5cda402e7cf5e1187427..de7415955b2fd9af8ecb2fb968829af51c674659 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.81",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-8.lille.grid5000.fr",
+      "network_address": "chicon-8-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.81",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/1"
+      "switch_port": "Gi4\/1",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.81",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-8-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.81",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-8-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
index 0d62cc9dd33b429fb1839001a4e3110204ee7b3f..af29a08225452a3756ebadd3ffabae5a26b8085f 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.82",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chicon-9.lille.grid5000.fr",
+      "network_address": "chicon-9-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.82",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/2"
+      "switch_port": "Gi4\/2",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.82",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chicon-9-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.82",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chicon-9-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index 26e9fc228891d39a5fecd8e358d8736f71db9c72..8c68ea536931d038232bb5c007cbe29e01e61916 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.100",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-1.lille.grid5000.fr",
+      "network_address": "chinqchint-1-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.100",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/1"
+      "switch_port": "Gi2\/1",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.100",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-1-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.100",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-1-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 617b41508b7f43c909e28f211a75a0d5a6231ed1..27199ee4b677ece281edbfa6f3e56d8e675c1dfc 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.109",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-10.lille.grid5000.fr",
+      "network_address": "chinqchint-10-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.109",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/10"
+      "switch_port": "Gi2\/10",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.109",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-10-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.109",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-10-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index 4af9d877398c46ed88c15ed9182837f97ca4f669..5e55d2268e95b2bc59236c3faf0fb887e5f93896 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.110",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-11.lille.grid5000.fr",
+      "network_address": "chinqchint-11-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.110",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/11"
+      "switch_port": "Gi2\/11",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.110",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-11-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.110",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-11-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index 3872a953216c6057024d719eb6600302c4f75834..40a774c0854f10ad7aad5ce81db6a34012a5ffe7 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.111",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-12.lille.grid5000.fr",
+      "network_address": "chinqchint-12-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.111",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/12"
+      "switch_port": "Gi2\/12",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.111",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-12-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.111",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-12-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index 007914e2b1a50f7c15b7421552e3792187c5f2bf..5def79df0f88df9df8486e1a051145bc2d948c4d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.112",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-13.lille.grid5000.fr",
+      "network_address": "chinqchint-13-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.112",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/13"
+      "switch_port": "Gi2\/13",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.112",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-13-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.112",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-13-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index 2895824ac9b873cbc9732406dfa231530e9050e4..17cd5e91618689954bb62b9118985d881aabb54b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.113",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-14.lille.grid5000.fr",
+      "network_address": "chinqchint-14-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.113",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.113",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-14-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.113",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-14-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index baffb1ef50d70541383979bef7d3f865aae1d803..b7122c92d0caebbbfda3f8b62fd876d7c224dbb8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.114",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-15.lille.grid5000.fr",
+      "network_address": "chinqchint-15-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.114",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/15"
+      "switch_port": "Gi2\/15",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.114",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-15-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.114",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-15-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index 4157a476df2a1a204eae2f8d49a917921f02929c..a354a13b92e78a4d55af63fb18afda3abfd3773f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.115",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-16.lille.grid5000.fr",
+      "network_address": "chinqchint-16-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.115",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/16"
+      "switch_port": "Gi2\/16",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.115",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-16-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.115",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-16-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index 4bce3ef50bcdbdd776e23f0b9d1689080c02208f..a594ecca597a7f947ce67129fe083aaa6e179a1a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.116",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-17.lille.grid5000.fr",
+      "network_address": "chinqchint-17-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.116",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/17"
+      "switch_port": "Gi2\/17",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.116",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-17-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.116",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-17-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index e92a01fb42f2f051759f0b8d647fa259f8f9fb5d..82ec5d821b32bfeb415652afb6364ddabc319850 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.117",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-18.lille.grid5000.fr",
+      "network_address": "chinqchint-18-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.117",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/18"
+      "switch_port": "Gi2\/18",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.117",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-18-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.117",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-18-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index e1c8fbab4bc6d0f326b00a5497b14154875de341..1513682c20f89def6a57fefa76b04928b4e66abf 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.118",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-19.lille.grid5000.fr",
+      "network_address": "chinqchint-19-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.118",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/19"
+      "switch_port": "Gi2\/19",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.118",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-19-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.118",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-19-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index 8a3dbdfd038df823694fda770e031c34b5c9f88a..b341c083a1e6886113ed5577a50f66f4165f4e57 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.101",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-2.lille.grid5000.fr",
+      "network_address": "chinqchint-2-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.101",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/2"
+      "switch_port": "Gi2\/2",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.101",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-2-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.101",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-2-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index 9cf3d6f4efc9fbecc178b6b07ecc87ead67b372b..5b46e1d1e46129bf91347f75ae3febf0ea181fc3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.119",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-20.lille.grid5000.fr",
+      "network_address": "chinqchint-20-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.119",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/20"
+      "switch_port": "Gi2\/20",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.119",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-20-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.119",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-20-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index 847b05728df5d7a3d903c3f78ef7cbe4ac89f9e2..0b5c1855c8bac961d3cf216f20d7b955fea236ff 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.120",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-21.lille.grid5000.fr",
+      "network_address": "chinqchint-21-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.120",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-21.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/21"
+      "switch_port": "Gi2\/21",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.120",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-21-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.120",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-21-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index f53933b67a633510988cee9a2ffc9625018feb10..86ad7d7c85c0f4ca11904832450244c4ddc84922 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.121",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-22.lille.grid5000.fr",
+      "network_address": "chinqchint-22-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.121",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-22.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/22"
+      "switch_port": "Gi2\/22",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.121",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-22-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.121",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-22-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
index 96189f3d453074b2c5b9ecb4fb7b1a2fc1b671f1..3ee10331ef3ba58e478b2be567bc6750d42d9b7f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.122",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-23.lille.grid5000.fr",
+      "network_address": "chinqchint-23-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.122",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-23.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/23"
+      "switch_port": "Gi2\/23",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.122",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-23-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.122",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-23-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index 9a74d966ed73c3e1f13911bc23832aebfce138ab..82eff9fcb23781e8ba8fff93a802dd3d36ec5ce3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.123",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-24.lille.grid5000.fr",
+      "network_address": "chinqchint-24-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.123",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-24.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/24"
+      "switch_port": "Gi2\/24",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.123",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-24-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.123",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-24-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index 7cdf301dce56dae4f4645ea1129238f7360a028b..b537ed82a09c03a1321391aa09857048dd81b026 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.124",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-25.lille.grid5000.fr",
+      "network_address": "chinqchint-25-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.124",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-25.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/25"
+      "switch_port": "Gi2\/25",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.124",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-25-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.124",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-25-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index 45d76300dd92951471b7ebe13b1f09ee51e76789..026e4352f9bf07203ee0b500e84e000c63cc84dc 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.125",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-26.lille.grid5000.fr",
+      "network_address": "chinqchint-26-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.125",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-26.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/26"
+      "switch_port": "Gi2\/26",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.125",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-26-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.125",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-26-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index b822c3d0f1ae24e153b5353fbed4347c81972076..ed344916ad1b516ad83411e53c82c40671d363fc 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.126",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-27.lille.grid5000.fr",
+      "network_address": "chinqchint-27-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.126",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-27.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/27"
+      "switch_port": "Gi2\/27",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.126",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-27-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.126",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-27-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index d8f2274c437bd70c664b63c59a85ed1a3418a8d7..1204e5d3d856cc643eaf6037d1d2b65f2b796a5a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.127",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-28.lille.grid5000.fr",
+      "network_address": "chinqchint-28-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.127",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-28.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/28"
+      "switch_port": "Gi2\/28",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.127",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-28-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.127",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-28-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 0730520954798b6698de6797bb38c58732db9421..beec95281c028efd57b91c27ebd3071930691743 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.128",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-29.lille.grid5000.fr",
+      "network_address": "chinqchint-29-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.128",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-29.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/29"
+      "switch_port": "Gi2\/29",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.128",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-29-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.128",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-29-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index c1a8b47faf028e7a6ceee2a41c2a0abb4ca67902..7cb38d9691f26d72201ab061ea805a526ce44857 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.102",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-3.lille.grid5000.fr",
+      "network_address": "chinqchint-3-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.102",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/3"
+      "switch_port": "Gi2\/3",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.102",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-3-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.102",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-3-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index bc375a03c7df936071dd6e74b6ccf727b4c16c5b..5d6ec89731e649d6749bf2d0c4612c3d66ea1892 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.129",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-30.lille.grid5000.fr",
+      "network_address": "chinqchint-30-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.129",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-30.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/30"
+      "switch_port": "Gi2\/30",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.129",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-30-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.129",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-30-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index e6106f5757b9b136ae86269c2a7376a398223e7e..4f8665e50e1efc9583eede76be4b7d3dd5d05e53 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.130",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-31.lille.grid5000.fr",
+      "network_address": "chinqchint-31-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.130",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-31.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/31"
+      "switch_port": "Gi2\/31",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.130",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-31-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.130",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-31-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index d155e634fb5c800f2ef19e0e9dca8a3a9c15f589..74ebe9319892e793abd80c62f1e8d8c2697164f3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.131",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-32.lille.grid5000.fr",
+      "network_address": "chinqchint-32-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.131",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-32.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/32"
+      "switch_port": "Gi2\/32",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.131",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-32-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.131",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-32-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
index 6261a8aa1c5b9b0736f88c0817adc0c156ca86ee..288020d26bc872f9420d5f02817721f8310fd9ab 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.132",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-33.lille.grid5000.fr",
+      "network_address": "chinqchint-33-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.132",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-33.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.132",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-33-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.132",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-33-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index 5ab882574f3d191cfbc95f7303ce1311fa139a61..dc4412544523eea86b27758cb679d508ca8b0da0 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.133",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-34.lille.grid5000.fr",
+      "network_address": "chinqchint-34-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.133",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-34.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/34"
+      "switch_port": "Gi2\/34",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.133",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-34-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.133",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-34-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index d789e1f940ef4bcfc40f61ba9e42047d885f2c03..1a54d3ff39b4747f18475696c3e99201bd6a1c08 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.134",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-35.lille.grid5000.fr",
+      "network_address": "chinqchint-35-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.134",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-35.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/35"
+      "switch_port": "Gi2\/35",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.134",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-35-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.134",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-35-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index 7a7fe98a14b28f8aadbe3eb5f463e8af45fe1abf..9a00112cd00ad31a3c6cda4100453cb0aae0464e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.135",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-36.lille.grid5000.fr",
+      "network_address": "chinqchint-36-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.135",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-36.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/36"
+      "switch_port": "Gi2\/36",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.135",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-36-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.135",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-36-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index 762f732ff428e23dd194a9c006be712584336914..b5d7adb380a682b07031a298e93d716326287692 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.136",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-37.lille.grid5000.fr",
+      "network_address": "chinqchint-37-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.136",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-37.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/37"
+      "switch_port": "Gi2\/37",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.136",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-37-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.136",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-37-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index 14e57a5b26d84e041863c260b11c09903f033e09..14ba5e255f9ba2bcb1065c7dcdde852a875c550e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.137",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-38.lille.grid5000.fr",
+      "network_address": "chinqchint-38-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.137",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-38.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/38"
+      "switch_port": "Gi2\/38",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.137",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-38-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.137",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-38-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index ea1a9c5bddb4abbdb49ff010bc188b3c8e6da4b9..1b7f5d8e2a46828fe21991908c5d6f53d0cfa813 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.138",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-39.lille.grid5000.fr",
+      "network_address": "chinqchint-39-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.138",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-39.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/39"
+      "switch_port": "Gi2\/39",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.138",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-39-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.138",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-39-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index 4b363be436821494c8610e5c96ff1bceb9cc1f1e..4f3a7adf8fc721877014b56d46cb9105d194a1b3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.103",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-4.lille.grid5000.fr",
+      "network_address": "chinqchint-4-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.103",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/4"
+      "switch_port": "Gi2\/4",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.103",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-4-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.103",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-4-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index 2f214c05f8b0815e8eb54a68f57b68c599dfccfe..863d5a740a7f28b46a4f7dc4fd860bd57fbb4ed2 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.139",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-40.lille.grid5000.fr",
+      "network_address": "chinqchint-40-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.139",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-40.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/40"
+      "switch_port": "Gi2\/40",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.139",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-40-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.139",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-40-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index cdda141803d7f2a70126956453f9d21e306cc58f..fa705b409bd57635f5c6e9ee0cc07beed21e1c3b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.140",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-41.lille.grid5000.fr",
+      "network_address": "chinqchint-41-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.140",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-41.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/1"
+      "switch_port": "Gi3\/1",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.140",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-41-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.140",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-41-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index 91afc57a188d28f4237cc418bbbc3b06b01f6d44..e2dd63efd45cccbbea69ea437128ceacee24c898 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.141",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-42.lille.grid5000.fr",
+      "network_address": "chinqchint-42-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.141",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-42.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/2"
+      "switch_port": "Gi3\/2",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.141",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-42-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.141",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-42-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index e42d7d62b3cfa7a0bd35259a7925426f11b4a0ed..c37d17233dcf281ae69c21027e6bd2df4bf9e4a8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.142",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-43.lille.grid5000.fr",
+      "network_address": "chinqchint-43-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.142",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-43.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/3"
+      "switch_port": "Gi3\/3",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.142",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-43-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.142",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-43-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index 4c4ec912110744b34651646e1197de49f0379309..2f3734d77c8ee6c2bb4c6810ebcbb312083f4c43 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.143",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-44.lille.grid5000.fr",
+      "network_address": "chinqchint-44-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.143",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-44.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/4"
+      "switch_port": "Gi3\/4",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.143",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-44-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.143",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-44-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index 098480960ee4ff512a647c2a8234a8e97ce47668..7f360a3e8eff94588e21459309208c955f737a9c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.144",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-45.lille.grid5000.fr",
+      "network_address": "chinqchint-45-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.144",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-45.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/5"
+      "switch_port": "Gi3\/5",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.144",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-45-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.144",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-45-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
index 081300fd47106412481a9974de3f9f34c840fb4d..a4328aa910611b5f833e96b75b42dfa91e848f51 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.145",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-46.lille.grid5000.fr",
+      "network_address": "chinqchint-46-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.145",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-46.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/6"
+      "switch_port": "Gi3\/6",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.145",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-46-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.145",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-46-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index b0261aa2d41255dffaf6eb4fb409132d54f14b92..aefa1e64db4a879a90d0aa53624f99532c9a2be1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.104",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-5.lille.grid5000.fr",
+      "network_address": "chinqchint-5-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.104",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/5"
+      "switch_port": "Gi2\/5",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.104",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-5-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.104",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-5-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index 4c01ed1861bbc0455c7e83f3370ac2b3b53d4165..3cd8f6992b3d22951b2238d22a03c3fe6ca4e6ca 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.105",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-6.lille.grid5000.fr",
+      "network_address": "chinqchint-6-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.105",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/6"
+      "switch_port": "Gi2\/6",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.105",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-6-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.105",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-6-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index a6ccd787f5f9b9649022e7bf60ac490891a8ce56..790be4449dd9e06337b945b2e9a2b0d736d37879 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.106",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-7.lille.grid5000.fr",
+      "network_address": "chinqchint-7-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.106",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/7"
+      "switch_port": "Gi2\/7",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.106",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-7-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.106",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-7-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
index 828bca7623d4b02cff40fc2891e76c3a83c398de..aca8cd380f63d76a9e43d54cb699d234de7b3ef8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.107",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-8.lille.grid5000.fr",
+      "network_address": "chinqchint-8-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.107",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/8"
+      "switch_port": "Gi2\/8",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.107",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-8-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.107",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-8-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index 2cdcb7b46c52473ecc4c285dc927f03c852c0468..f5a0347d03bad09120cd91ce0e2bc4f2ae5d3f44 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -11,54 +11,64 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.108",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-9.lille.grid5000.fr",
+      "network_address": "chinqchint-9-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
       "device": "eth1",
-      "driver": "e1000",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.108",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/9"
+      "switch_port": "Gi2\/9",
+      "vendor": "Intel",
+      "version": "80003ES2LAN"
     },
     {
-      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.161.108",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chinqchint-9-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.108",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chinqchint-9-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
index 106290acae56b5526d837745637503b6a1653cf0..c8cf73c7bb1e98be8ca4ee2f59901bbdfca111bd 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.54",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-1.lille.grid5000.fr",
+      "network_address": "chti-1-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.54",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/14"
+      "switch_port": "Gi3\/14",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.54",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-1-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.54",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-1-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
index 4a6e7af4ca067bd73c32cb9a248640731a2a4fe5..94a392bd422e16ae851936c33bc2f0e3a7a0947c 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.63",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-10.lille.grid5000.fr",
+      "network_address": "chti-10-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.63",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/24"
+      "switch_port": "Gi3\/24",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.63",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-10-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.63",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-10-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
index f3fd37cfb10bf001d04ab91f31b17887cecd140f..0b10e5989323b910059d21a5192027eb05f3ef01 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.64",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-11.lille.grid5000.fr",
+      "network_address": "chti-11-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.64",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/23"
+      "switch_port": "Gi3\/23",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.64",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-11-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.64",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-11-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
index b46e0ffe6949032b226680f58605f86cdd6a1d8f..e0dcbaec5a3610e7594f7683705e7039d7782489 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.65",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-12.lille.grid5000.fr",
+      "network_address": "chti-12-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.65",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/25"
+      "switch_port": "Gi3\/25",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.65",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-12-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.65",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-12-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
index 82d95efc79a5f1ebc179ccfbc02ef062ab993caf..1106aac0e6e7dc7b08fe6c85c25c91aefe930294 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.66",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-13.lille.grid5000.fr",
+      "network_address": "chti-13-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.66",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/26"
+      "switch_port": "Gi3\/26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.66",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-13-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.66",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-13-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
index 51eea15b14998fba0f7b740f307b9200ee71e455..65e1b0faa7fb7d2fbc60644801c4b9059387aa22 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.67",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-14.lille.grid5000.fr",
+      "network_address": "chti-14-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.67",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/27"
+      "switch_port": "Gi3\/27",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.67",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-14-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.67",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-14-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
index 80c26e5f92c994e754fac252e3b1e3c2f704eb9e..7ce54cbfad3f0850f5a305c39c110cf5e597f41f 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.68",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-15.lille.grid5000.fr",
+      "network_address": "chti-15-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.68",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/28"
+      "switch_port": "Gi3\/28",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.68",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-15-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.68",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-15-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
index 70b6ba6676dbc0c63463ceeae911e60cc836b7a4..943736e19621d1543e4330f9ef4c17db220d9a75 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.69",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-16.lille.grid5000.fr",
+      "network_address": "chti-16-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.69",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/29"
+      "switch_port": "Gi3\/29",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.69",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-16-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.69",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-16-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
index ac9f1348d8e52ed24748f31636df3e307d3d7c66..c202d7d6b64d1021caf067b787ea259328393c0f 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.70",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-17.lille.grid5000.fr",
+      "network_address": "chti-17-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.70",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/30"
+      "switch_port": "Gi3\/30",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.70",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-17-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.70",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-17-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
index e960e04fec07caae743b17e75ef35a6eba94b317..f7adf4eaa76b188f80bd2e68e3862f861b5546ed 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.71",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-18.lille.grid5000.fr",
+      "network_address": "chti-18-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.71",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/31"
+      "switch_port": "Gi3\/31",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.71",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-18-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.71",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-18-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
index 6e7d094ce7d981d6c7a485287b3e964e7cee2346..1efd352fa8cbd328fb7a644f60608e36b084ade3 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.72",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-19.lille.grid5000.fr",
+      "network_address": "chti-19-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.72",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/32"
+      "switch_port": "Gi3\/32",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.72",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-19-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.72",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-19-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
index a2b00444665a8b2f1a25898511b865e7664c6cbe..6eb5dccf258653ed2a59234b84fc76875b7cf970 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.55",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-2.lille.grid5000.fr",
+      "network_address": "chti-2-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.55",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/15"
+      "switch_port": "Gi3\/15",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.55",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-2-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.55",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-2-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
index 222bbdd98d5a87b3d64a68c49577c3f0aefa08a4..68d87228a607e446e9fed36b7d0fc76e9f784b79 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.73",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-20.lille.grid5000.fr",
+      "network_address": "chti-20-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.73",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/33"
+      "switch_port": "Gi3\/33",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.73",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-20-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.73",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-20-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
index 325b1aebb8e2eb05e49dba0f4d41f15de1293fc8..f1e36224dabb6f8d4adbbd861fcc0f2360d38cb3 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.56",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-3.lille.grid5000.fr",
+      "network_address": "chti-3-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.56",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/16"
+      "switch_port": "Gi3\/16",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.56",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-3-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.56",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-3-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
index 1558833374305d86529217093a1bcd14a4914b66..247f75928db87df94a2867afa012985b19b16f65 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.57",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-4.lille.grid5000.fr",
+      "network_address": "chti-4-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.57",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/17"
+      "switch_port": "Gi3\/17",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.57",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-4-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.57",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-4-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
index 9a8070d4931a1f22245cddcc7174d480cbe130a7..074ab1097151bb59b7e5c63efdf7d88a64a7a14a 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.58",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-5.lille.grid5000.fr",
+      "network_address": "chti-5-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.58",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/18"
+      "switch_port": "Gi3\/18",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.58",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-5-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.58",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-5-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
index a59059e13508e28ab72964602028e8d523bc57f8..8ebbb6bdd47d26b596acb8b1f88b55894abfd811 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.59",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-6.lille.grid5000.fr",
+      "network_address": "chti-6-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.59",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/19"
+      "switch_port": "Gi3\/19",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.59",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-6-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.59",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-6-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
index 10b858f9936e564bf3387837237d02df833a6ed4..d12f2152a63357f5de6dd19c2f6a3e8e44882dfd 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.60",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-7.lille.grid5000.fr",
+      "network_address": "chti-7-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.60",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/20"
+      "switch_port": "Gi3\/20",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.60",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-7-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.60",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-7-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
index d2d2e9a80d2dd44dc47e0ca36fb305097a604094..273b1881f5e25bbbcc0c273d7b75ba9e5f7918ce 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.61",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-8.lille.grid5000.fr",
+      "network_address": "chti-8-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.61",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/21"
+      "switch_port": "Gi3\/21",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.61",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-8-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.61",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-8-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
index 75b675a46b206fa36bd668858cb5e2baa4fc3610..2d51ee1408839b2d73f6c4ba3dbb0248ce1b70dc 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.62",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "chti-9.lille.grid5000.fr",
+      "network_address": "chti-9-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
@@ -28,37 +31,44 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.62",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/22"
+      "switch_port": "Gi3\/22",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.62",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chti-9-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     },
     {
       "device": "myri0",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.162.62",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chti-9-myri0.lille.grid5000.fr",
       "rate": 10000000000,
       "switch": null,
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
     }
   ],
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
index 25b98f9b2badfbabf07b99edca263a6348e62b81..b9205d072daff10dc77b071eff6db44367b54e44 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.1",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-1-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.1",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-1.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.1",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-1-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
index c52de308969d14712f74fdd3d1e7f3e2056e0073..30e498ceb0caeaf9aeca23185535a83e24c38b20 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.10",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-10-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.10",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-10.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.10",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-10-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
index 862f1b1da57237d64704a854b23ebc9edb2f55d4..cdeaf0a78574d1d831f08fdb135f8af5d9436b8b 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.11",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-11-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.11",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-11.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.11",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-11-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
index 9da7081a01609ee268ab6052e97daf6438a0962c..a09ca6de946083fcacca7bbff040c6f928946407 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.12",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-12-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.12",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-12.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.12",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-12-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
index 3decf769b560bf0579bcaa84ffcce708519b1c0d..08270ea915cb912db741aee063824d2608faa287 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.13",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-13-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.13",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-13.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.13",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-13-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
index 39375f3d92bbf3d849f09509949fd978cc1615ad..90d220102fc26d3832152617a8965b7df3215cc8 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.14",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-14-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.14",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-14.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.14",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-14-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
index 2f50aeaa405d7bd3c34793fe9553f84f2589eec0..62e9674d60df9f09a6c741837471770d9c039571 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.15",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-15-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.15",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-15.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.15",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-15-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
index bd56414eb3284e1e18de0b288335e6616f633291..56edd5852826d7399d1512d9c2b465fbe0e2d9b5 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.16",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-16-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.16",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-16.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.16",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-16-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
index a6535fe6456eaf7e6fe93c0ff2d7ea4c3742f7cc..fb9d66cfca37dd0dc4a564db771d934035e81d90 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.17",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-17-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.17",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-17.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.17",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-17-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
index b00c7b4e57d4fada512f50fa0f39a93e76a2fbd6..06b50f8d995eb68e6cd071212e9d0e1d27b07c78 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.18",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-18-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.18",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-18.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.18",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-18-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
index ab9ac8f782e9a7c69a4e7ee315052f4c46efb098..b3336d1d7d06550d38ace86da51501185fe6c31c 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.19",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-19-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.19",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-19.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.19",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-19-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
index 9c1b647f91255f7e667ba75bb33c62850e54fc8f..1ee50c600b0874a6381760f38ab8c614ad13ef11 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.2",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-2-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.2",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-2.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.2",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-2-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
index 03161e9c1acab413ae0e92180ae6bfd96c4ea869..eee58971f16e0054c1f38aa278a8d1c9f084ca6d 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.20",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-20-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.20",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-20.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.20",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-20-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
index 2c9a4e1e416f3496f2ab82131846fef47de2817c..0a390085c183ff736db20dbd72e5ca2acf2c0d2c 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.21",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-21-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.21",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-21.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.21",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-21-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
index a75308fa2777a67d24f814e871128bb29fe26c03..371ec82cb5f4a6ac016b2726c8f2f7ae11112838 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.22",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-22-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.22",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-22.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.22",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-22-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
index 273eb1966de7977b387b4993cc2716bd7b895619..b6b0e22220c7189bfcb73bb45317c1478f7b283b 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.23",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-23-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.23",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-23.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.23",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-23-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
index 4e377924e8bca4d082ab488be28398fde027c72f..6352a806d55c0ca367bb3f24f5dc0c234c4778ae 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.24",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-24-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.24",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-24.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.24",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-24-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
index b727e196f92519b28311439f6f57ab2e94c5b2b7..59d0845b05b9aa0c69c5a4676b48f60c84b15f45 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.25",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-25-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.25",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-25.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.25",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-25-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
index 3ae930014f4903cf7ed8406d2b639cd277c64d9f..72e7cdc6433c844d73cc0b99964df5bcb1ffaf7e 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.26",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-26-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.26",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-26.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.26",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-26-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
index 0bff7c521a13fa14457937080a7834693a447af5..9e8c2aa3f3911c2a3ad3dca40a690ed6b415db40 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.27",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-27-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.27",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-27.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.27",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-27-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
index 22ef879bcffc812cb2e9c1b19c2efc8119bcbc5d..262356625169c175633bd19c63222908068bb1b3 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.28",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-28-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.28",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-28.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.28",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-28-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
index ae53f7a9b55e2b3f850407e2b62602b3a45873a8..036a2c998d99c7c4f1fa67f7d3feb9a4959e59f0 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.29",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-29-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.29",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-29.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.29",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-29-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
index 2b2e739f1f06173f730701d7035bbc48757756d6..9e9d584f53000a1cbfe49faeec56244bd8d48bfa 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.3",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-3-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.3",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-3.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.3",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-3-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
index eab3e09aae3980cbb1e6c7e8262b93147f819390..e6a11ac7124167badba4564dabacd4a00db44d16 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.30",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-30-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.30",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-30.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.30",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-30-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
index 8b95dbc10ddf35366c97027c2b6016909b82464d..acbfc432205ceb43506b6c438d222ff03112c63a 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.31",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-31-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.31",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-31.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.31",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-31-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
index 3080c5b9bfa323e5cf83ef9e66072b50a2bc5bf5..c65aacd54e91aab5dfe67e125db5879a2d45bfb2 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.32",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-32-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.32",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-32.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.32",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-32-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
index 850e8f89f1d80635c0b0e420d8cb34a9d8d213b3..baba6ace874e773233e88d81a1bc8f9030227020 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.33",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-33-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.33",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-33.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.33",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-33-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
index 340b23291a95033f240d297b2062890c313c4663..685825a0319e956d0d722ef679b0a47727dcd753 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.34",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-34-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.34",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-34.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.34",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-34-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
index 7249b2ea9889cb9ee35c86ea72508656550cf91c..1393d4a8321699e38bac71fd4c85ddd07600f9b1 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.35",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-35-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.35",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-35.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.35",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-35-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
index d1eb2926f0dc22fd9608ee8181737c73721dd4ef..b7e1692b26e5a438bd46bfbb40ca1b56cc5de9b5 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.36",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-36-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.36",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-36.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.36",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-36-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
index 81a3f127f389315817ee2687da6ab9f18f322c8f..9f8b4653c7bd9b3186eef282f46a8409f041f309 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.37",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-37-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.37",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-37.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.37",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-37-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
index ff627dd0c47c1da667452fc1e8bd133b17dc78ab..8710e7c47787e825b3dce0a778d9723f905281c0 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.38",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-38-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.38",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-38.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.38",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-38-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
index 5e9aa4671845b94d23f31407e3f07fb169da2dbf..06db9834070e75326210b4d95adccb15dfa30567 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.39",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-39-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.39",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-39.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.39",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-39-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
index 2720c8e476abcfe44c33b0f4abb355fe6b5c6160..920b130bc1624adc89d139d4ba45c3e814e9c467 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.4",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-4-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-4.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.4",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-4-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
index 1b81bf7e1309e9ad0cbc64297a246ee0a5f7972d..46463dbafbb64aef0b75daba9fbc0139b3ce7140 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.40",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-40-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.40",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-40.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.40",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-40-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
index 09baa9ab94924c2eeea0c620a9d1b9d4d9fe71aa..72063ea2abff8edf7c29c5769ab5afedaf6431ad 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.41",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-41-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.41",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-41.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.41",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-41-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
index 6fab2fd9c455d0bc059e660bca0f6c885c609f56..37cc24fce251fb806ba30800311930ec1a26ebf1 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.42",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-42-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.42",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-42.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.42",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-42-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
index d798cceff975102588da2851b94f8af437780121..ad1ab6a6e84c01b373d1c9dd6fb2c3ac53019e19 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.43",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-43-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.43",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-43.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.43",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-43-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
index cabbffc7a215d320ee307cb13bb06667f490802f..7f063187b7def50308c999921dc9d74422a9fb4f 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.44",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-44-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.44",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-44.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.44",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-44-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
index b572965dd28401cf366516053aa74dcfc56d22f9..991f3e2032ba0d79e93dc9f0e7b77c2469da6d7c 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.45",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-45-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.45",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-45.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.45",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-45-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
index 12dae023d8a5ef1136f6459f73921eed9491bdec..ba4a119a1a265784117646eb7c6db87b329c56e7 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.46",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-46-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.46",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-46.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.46",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-46-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
index 003e78b9868f2905415f295a8c2799f022a1e458..ce1501c461c666eef31a8c12145e1b2f46120b87 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.47",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-47-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.47",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-47.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.47",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-47-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
index 096c62bfac51e1b67643b8a75bc64d52391f363c..9aee9b76632f07723409a662f7978a4fad40ae95 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.48",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-48-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.48",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-48.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.48",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-48-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
index 51349a8bc9df5278ac50a63fb7d664afff4cb677..36b07542b1cc494b79b28c9bf869401cb33d5af0 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.49",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-49-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.49",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-49.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.49",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-49-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
index 884854045e66802c0ed215a4ff4663d272862724..91bcf774c0bfff28623fb2ff07b9d26aa12ebe5e 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.5",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-5-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.5",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-5.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.5",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-5-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
index 9662e75b49d0d50b44008768be161e0ee03dac70..ca2b9156aa2e0e59e912dfe635ba430931cd7ab0 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.50",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-50-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.50",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-50.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.50",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-50-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
index c8f9cadad4b1b56d62ce86251d354f7465390a71..56480355773a49c8ac316c6d5a0a0f2c076460b8 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.51",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-51-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.51",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-51.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.51",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-51-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
index 506d3cce220260b656154fb98ec9da4f6184b31d..f99c94b560563c51d47c19f78be50e056fc487b6 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.52",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-52-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.52",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-52.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.52",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-52-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
index 50d30cb98f91a564ea5036d4e1bb9129659489e6..7778a2a503ff122cb4a349f14c14a85fcd0b956f 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.53",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-53-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.53",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-53.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.53",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-53-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
index b69500e6c086177e453c24a65d1f636bd1da4e60..f4b366a08f6c6353de29b95ccfe43731c67b998e 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.6",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-6-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.6",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-6.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.6",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-6-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
index 857e3142aa8089465ed6719a600d5b21f9ccb418..f299b0385a7b1f1253a06360645d96c7250f091c 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.7",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-7-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.7",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-7.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.7",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-7-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
index 62cf02b9f83283056a7584cb20ced3939bdff064..6f33cd6c13569d3c3f57b489f4c38b522681c4b2 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.8",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-8-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-8.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.8",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-8-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
index 33fbe1fe600bd2c504ad89d10e52911c6a3f90dd..e6a2953be705e8f01531a0ca6f3a7ae9904691e8 100755
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
@@ -15,12 +15,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.160.9",
-      "management": true,
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-9-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
       "device": "eth1",
@@ -28,23 +31,28 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.159.9",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "chuque-9.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5704"
     },
     {
-      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.158.9",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "chuque-9-rsa.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw"
+      "switch": "gw",
+      "vendor": null,
+      "version": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
index 7fcbb3e4965bf56ba6b7296f8e28ff653ba698ba..c79c19a9c730b2ff5d6e56806c8bb051a5980571 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.1",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-1.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.1",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-1-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
index 630e51f09feada8f6223aa5bf7de34726d517e9e..d5cc5caf7b92f2efc5f4cd2e9c0aeadf65bfad60 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.10",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-10.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.10",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-10-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
index 5e643384db2d7d917b90842caeecbb16e6fc931e..5a476ee00bc4997bb63edd632aefaa38cf56305b 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.11",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-11.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.11",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-11-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
index e23de31d7c446f4fe74014f063af0ffc86d96340..47dc13b87d910928ee3fc30e4352b7b10f8d5bba 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.12",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-12.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.12",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-12-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
index cdbf1df83f9bb619b5f270755280c75ae77c9897..7112446ce66716482d013402c68208d9b3e9c429 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.13",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-13.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.13",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-13-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
index 9c622a2eac58c491e8d7d1bfbfa25d6f245a74e8..fdef1715f6ab6d532fab0cc4f8b0a59873b7da6b 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.14",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-14.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.14",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-14-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
index 98b521209a4ae26e1a996d492112d81ed4cc2a4b..f6a4d40512ce17fab197ae8292b95cef8468527b 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.15",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-15.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.15",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-15-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
index e83af8d13d143c8fb4dfc6240d199e1e133f6e4e..fd4c7044b5ed12933a8b62c080f857747d0c24a4 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.16",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-16.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.16",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-16-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
index 024ba88f114081ddc27d7a036de5329f2610be81..dbd17de240cbe0c96ae5bbde420fdf24655c2642 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.17",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-17.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.17",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-17-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
index f67c94a8c740423980d819f4ec4ecc8172f0fd25..c1a7c0008bd3401b03ba7b61844f5b32557faba4 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.18",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-18.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.18",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-18-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
index ec216136a1b6bc45fc4fe9ff7f65dbac57f16c7c..7ec0ea97bdd218968e6f2fcdcb4be52dad9ea541 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.2",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-2.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.2",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-2-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
index 51cea630d8654684ad43830d562e1f27d6f8ba97..240416480a7e82ffe4dae557a128944c45ee6251 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.3",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-3.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.3",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-3-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
index be931460beb0ecb7ca893e0085988552cb9f5118..96231bd7d7e661436ba4e1e63e7f89d440930b21 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.37",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-37.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.37",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-37-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
index 66ef1bbb1b7c761e1dea7ceade1b51a0a443eb77..e084412f395d312297c0923ea64f0827c73eee3f 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.38",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-38.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.38",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-38-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
index 60e30708279b12f607eb15ebe3625de7907290ff..83e078f7a341212f01791eb98dc79c2807d3b5af 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.39",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-39.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.39",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-39-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
index c6f929f5b2cdf3afd9e65553b1257de308e03370..ba3c37c7b8ed69ffb3a44661eddeef149956bde5 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.4",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-4.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.4",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-4-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
index 2885da99eeb3d7969f1828563768f37b955ba603..a536f595e90bb8747c492c92db2ccfabff308421 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.40",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-40.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.40",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-40-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
index d866eac0aa5e6aeb0cbcf19694122469eda14935..2d41b114c31fcafbc0c3e151066bae6e297853e7 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.41",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-41.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.41",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-41-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
index 4a92b70c7d48cf167b7ce94f182bcc0108c88f72..65fc04b9c0fe140bcb3171568b990ed4d99f9a0a 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.42",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-42.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.42",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-42-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
index 9f6e5ba10a74ca3564b9bad08d5e25f512f301ac..7c0e9ca0bf59c0461a0cabf2604876a6b291ebd3 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.43",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-43.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.43",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-43-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
index a226bab0c76007b5050704381036abc525ea2b3e..c3d605c80d19ac51ba3894fbffd6f6e5942280b8 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.44",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-44.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.44",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-44-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
index ffcd27caeee38a6b73d08a87ea239f9fe523afc0..11176b5052d459bca7394fe6f816b536cd58097e 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.45",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-45.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.45",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-45-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
index f5e6b99da6f16efe9b87e45b9a1eef989e1315a9..4ee4142c8881b2a76b3bbfe4f85319405e858ac5 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.46",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-46.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.46",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-46-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
index 6bbd2916936c05f27556e8afeb684147fac8b7cf..26f57f360455a7e5647a20b149f29e5b6b0b8bea 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.47",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-47.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.47",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-47-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
index a459491230cd336a430081fd334ee8ee94ab90ac..ad6b03e0cbf0d40e43d7b273546edb5e2ffeba5e 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.48",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-48.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.48",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-48-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
index a5c40f03473e1fc2141c9d769802706bf1e72594..e5bf3fdeef74f9a0d9337b74d9a3c7f496aabb17 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.49",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-49.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.49",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-49-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
index 7dac7db2cf5b00cb533cfd1c996e274f58123d7c..f295d132e198411c024e0c77e7689f10e8492e20 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.5",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-5.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.5",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-5-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
index bc33c95b6a2c4a24f481013ded7e5ae800596d44..867f3003b3b40165dcf5500b070534cf4bfe58c2 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.50",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-50.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.50",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-50-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
index d8b7fe897c455823bb6f76b4c5f140f5f95cb9b5..8dafefc06c79137909e402a1c24cf5c77a852640 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.51",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-51.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.51",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-51-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
index 203383d7c8967c0bb4613164e6230bee678fd88f..f89813fb19a8377e63aa8489e5c3c44caff02b15 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.52",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-52.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.52",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-52-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
index e385c1c9560305ae75b02382d5ea36de16cb9a08..bf8fd80cd6ad23230bf4e396e29fb677bb2809ca 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.53",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-53.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.53",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-53-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
index 9a92c72df845e5c49ad94d72cae9d6a364ae8541..52cf1092bbf77a5623da93e96e6d5b89debc4030 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.54",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-54.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.54",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-54-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
index df77e2a72a2b0a648c14d0d1f813f51243b0fcf4..0628cde513aa3fe3ef7843ccfaa3d8aa8f22b8bf 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.55",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-55.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.55",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-55-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
index 6ffd941d6e65e0d579ce8eef4c4e612fcf3e7742..b68eb34f2276edbfd3056714d0d0ce9fc5eac42a 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.56",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-56.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.56",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-56-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
index 4a1c20c3663f3b05c72d0448f279aefba12dfd0c..600782a39346aef822758daaf79a5624c23addb2 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.57",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-57.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.57",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-57-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
index 9cee4cb7e1819c757cbcb2f91588441f817c6255..4dc2b926b14a7d510b8b1b7e991ac427d3b044a4 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.58",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-58.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.58",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-58-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
index 23bc324674d5efec94ccae89f743a533d2eab447..bed285cab1bd72ffb281c51098d5d1a6b1d82c26 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.59",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-59.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.59",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-59-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
index 5257c8e0c199c66729290e38cdb1a869fff18ce2..7bfb2675258dfc3e057538d29acfddf58c8105e1 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.6",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-6.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.6",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-6-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
index dfcd3e531a8a05c127c81c0e6d4ceb0f5f6602a0..72c6bfaf1a0a244ff5661226ad72ab826c9e2f18 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.60",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-60.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.60",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-60-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
index 43030f8337459b1e649c3731ed3b64e1ce2f8b60..8652890f642fb0dea4fd17832bcedbb2460f014c 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.61",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-61.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.61",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-61-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
index df8a5af6a0a67a67fafc6ec4724d896f0142fdfb..71f4da89988e83f9de00370de62f0fdfdda1ab81 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.62",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-62.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.62",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-62-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
index 0ceedca5a4c31a6b07f5f062766d9fe261514caf..48d98b18b485b0baa8f4690bd789036e3b37aefb 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.63",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-63.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.63",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-63-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
index 34cc36349d1285cbd1b30a45339a38e730117ee1..ede664b4254262d6ed8330ae8f60edc5b1630626 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.64",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-64.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.64",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-64-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
index d81267365bd9752221e047d9f2b6d3e775abe713..73191d919a836ad9a743fdf299fb593cf81308c5 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.7",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-7.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.7",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-7-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
index e03ad0ae1fa6668cddcf32e43aef712980db4c2d..004e85724ee0a6fceb4b9aeaaa96aaef27686499 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.8",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-8.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.8",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-8-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
index a8970b7d2d9e4940bb4db00ba6d689cf4dc9745c..e130dc149916dbde49f03f442741a6fafba641b8 100755
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.20.9",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-9.sophia.grid5000.fr",
@@ -26,8 +28,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom Corporation",
       "version": "NetXtreme BCM5704"
@@ -38,12 +39,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.9",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "azur-9-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "cisco1",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index 0dce4eaf9d4dcc27f3050b045a86021a51e979f8..c355dd8770f457fb37778b7b835e698e20cfda55 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.1",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-1.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.73",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-1-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index 21f7122dffaf7a9216c6bf8a8d7f6db4d5f9bd29..c031f705443b6a675551b3449130cadb16c993d0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.10",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-10.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.82",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-10-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index 11ac04c72f980108e245ac4da24c9bed470e8b4c..fbd98cc2ef2758032ec5d43e6478e81767c0b8a5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.11",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-11.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.83",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-11-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 84e3c01a79206a07f34d5995665349026c4def90..86ad83c27e79c87662a14b25e3c194320bacbfd7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.12",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-12.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.84",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-12-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index e9c8b0091cf45529670a4450a7facf379838e5df..274b527ea3010689b63fac1e5ac9f20b4ec2837e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.13",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-13.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.85",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-13-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index a26d8b78a226757d392745417fe270c7b8e1b1e7..853da05135ee91039918e24cbd59433d78ee28b0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.14",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-14.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.86",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-14-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index 8655bd071288d59ffc228ef04c1a96d9f0603c74..f42cfc03ce09f92389668517483a45a7325b1897 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.15",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-15.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.87",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-15-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index eac74fcfa3d396b763a3ff85e88945895f4d2f30..32f085e350869509607bea4a00f6d42c1f2361f8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.16",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-16.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.88",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-16-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index 388b83e75cda07b10b218a8da1802460441c2470..036afac23b0d8e0600a8cc440af933cab7c631ab 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.17",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-17.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.89",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-17-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index 4349d71dfa5c25000921515925bc91e4cb40463f..32ae7dcd601c57735ac0339438ef0605ce18e06c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.18",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-18.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.90",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-18-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index 8aae0f86cc4ba2ec39eded9eb82484d792d9ef87..1ba0028dd3d6111a7b360cca6ea1c199a005b75c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.19",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-19.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.91",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-19-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index 7718104a49c22d085d03263ea149b2848366653e..43318f025ee61ef50f637442574b6c29c1b9425d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.2",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-2.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.74",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-2-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index 529731b8fdfcc75f08d165d63b2a1bc200d10eb4..53f49c84bd64737c2e4df21a2621880a904ea45a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.20",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-20.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.92",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-20-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index 26af4e8af2e2c012511c95373de34704a0a595c3..24bdfa7e385f02da4ce05e3966bd0c2f130f4b2f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.21",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-21.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.93",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-21-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index e10b9625f8d53d2605bbb3e7a8f9427dd5a4ce8e..e882616d665de860f89bead3cbda6854a0af0703 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.22",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-22.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.94",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-22-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index 6ca314a845e700a7e094543b32fac9cfe438dc12..568d154cccea074bfd8a0bbbd1b2caa8ebbb3e0f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.23",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-23.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.95",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-23-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index f838902b7c17ed56b24213580811d2370c1ce0d2..823be14b6f6c617225f41ceb00660bd2ab3beb69 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.24",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-24.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.96",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-24-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index 637c99713976c5ed3fb5ace7e45fca9bc61c0145..85a504431f514fbcde7c2fac0223fdbc73560c87 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.25",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-25.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.97",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-25-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index fa4796acc36fba2e4c61729e82fa5702dc3bf4d6..38d8d0e9f646cc46e166b21bb5b9c4cb9b46f680 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.26",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-26.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.98",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-26-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index 3204509f0e12ca649354190f3344c1fba5bfd5cf..de680cb8b12e6b6e30b2b0430d8557792150925c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.27",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-27.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.99",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-27-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index 39aacbbdf5a0c52a852bc7534c453f5b3a09aede..6fb5d108f62d272a1c398856b6313b3447ed9d33 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.28",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-28.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.100",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-28-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index 1665386b3278ba9dcb213dac879ee54854b9c629..e31af02a6bc874e1b2f82bc024bfae04605ebd5f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.29",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-29.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.101",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-29-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index 32d118ee93a11b402935c1ac52dfb73d6bb192f6..0591b1259b1f1b714d330dca6dc16e9c7370bdcf 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.3",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-3.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.75",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-3-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index 822c1ef57479b8503275444e5fd4a49204646aef..2f9c73a6d4b03705b7958063221e6efc452c46ab 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.30",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-30.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.102",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-30-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index bd0596497cc460e96f0f1f3dad4bccb4d48e1adb..b29fe022552ce3a9c27588b559141f8556053d70 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.31",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-31.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.103",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-31-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index 24b6ee45d8dd4874e07fb73bf2fe79e8050ad9c5..d3aac50403358b6499b5a4450fd0cf11ef09e005 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.32",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-32.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.104",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-32-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index 9458006f7df7bf353ec876a7869a7454bbadb2d4..956b49c7a6d85c2299de753e07e970e3fc0e407c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.33",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-33.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.105",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-33-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index d8ab75a37c2e81eac179522817e61a22328bcf65..4b56ce695e01e9f5e0356413c56de7c3301ca69c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.34",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-34.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.106",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-34-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index d77590a4deee4bbdd8913393bcb30ce2fdb27562..f87e49976136a8518687bca969ebfab478cbf0ef 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.35",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-35.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.107",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-35-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index e58c516242be84dec635fb018b28eb29ad10715d..0852432a552808f1fc42cd8e4e6d5c433786d777 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.36",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-36.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.108",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-36-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index b4be59c853b36ee3c0e6a2bef86211497425a10e..9734c73dd2748a7ee2e73423fe6d18f5a4e9c587 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.37",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-37.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.109",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-37-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index ee3c8b262f21422edfe2f530812ab7bf0a9c480d..01dde4db110509bd3cd666e95bc13bd8b1345880 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.38",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-38.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.110",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-38-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index 6cde6c135861ef07a7f88cd7ba3c5bf2c13e3497..8cd8459a22dfc9ab57114d9f7278c1d5dd785fe3 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.39",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-39.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.111",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-39-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index cf7d653d9d51a559db1c3809a5410ac449821281..a71a79bb38f037ac1be57d83e4121825abca082c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.4",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-4.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.76",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-4-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index c1aee1117d919104f7e70ce1ea0ca677434fcf91..28d931fb04bd418b590f8ffe9e7a976d8ba69a6d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.40",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-40.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.112",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-40-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index 75d5fdbb5763df0ed82728a94ab5be731b5f9641..626073635e8fe11f9c46265eb39c1b828e5106f7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.41",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-41.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.113",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-41-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index 4aa1f404c5b9c741029458d19efabeb3641ed173..18fef186069b4353098fa9dce4db79830b6bd107 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.42",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-42.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.114",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-42-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index 474a5129a4e00ec8cf82f09cd767971fb116d741..2545796af5cd041a286cdf6628ae9a34769d7f3f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.43",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-43.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.115",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-43-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index 07338bffddb6367877a3064c5ab1c726409f03b5..227bb3deced3a967d96f46e88479feb13cab9aab 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.44",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-44.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.116",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-44-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index c5c3ab23c58f8a88a6d06f7b82c64a4f54faeaae..3872f6065b7a544885f04b1bbcda78721968e7c0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.45",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-45.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.117",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-45-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index 70ddc0b00f0fca592a3f171bf17c6305531bb441..4458abf87d8412d09e0dd65d4ef8611eeded960d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.46",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-46.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.118",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-46-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index 7f1ce7fb953464702baa79f0f4e25ca711edf0b2..618af4f3e90bf996cb399ffa6d16ca49b269e319 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.47",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-47.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.119",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-47-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index 8554aef0265fb257d1e2f2a88ae9b0e7fe5b0855..948baff93cc3de7681bff7e653e6dac2cc6f5599 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.48",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-48.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.120",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-48-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index 5e82a08ad2b65eb655ae3a5a3969a7349d31260c..86efe651d9a312d69fa918103d9dd46553d95c06 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.49",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-49.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.121",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-49-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index 28fd8a2441b4800546fb7ed5b92be0c9f18b6df3..d3037d856326df078d924ae7defec64d645dc9d4 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.5",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-5.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.77",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-5-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index 4df438311b1439e7db4b81a0b299c125806deb1b..158dafeea92f5f9486b6ea5db4d132567087bbf6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.50",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-50.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.122",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-50-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index 8e7ad25e3de6327f642caef6aced318b840dc639..6c09e8a4c00e02835782bb3f1501c0d1bccaa3ef 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.51",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-51.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.123",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-51-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index c15c531cf2d6c79ede27136c20ae8ee91a0e2232..c82e73b62a8122765d464f61c8989e20a83a5783 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.52",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-52.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.124",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-52-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index 99d5566fd916755c23344b2d84892fbb6836cbba..b15f4eb888df5b291efbe430f26677cf977c58c6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.53",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-53.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.125",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-53-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index 2eb1bb8f8bd83af5506b0f320de130c57044e7be..258a6035064988dccd75a92efad6c0cb846020ba 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.54",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-54.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.126",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-54-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index cf05b93d53a31b9e577d191633fd013ad262ae65..eebb2ad648e6c5ed8bcfa1dd4cc53a5ea1d4537c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.55",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-55.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.127",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-55-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index c350703b3e3fdcf81e51d4ad9cf240f0022a382f..1dee162b2f5b5fc280620cdd015438aaecb3baef 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.56",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-56.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.128",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-56-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index ab222a0eb3207ed689c9ffee394ea8a368cc1e7c..0dec999be13d3bd78efd86d7fc0e84cf938190ac 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.6",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-6.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.78",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-6-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index c69e97517ab1f4e136dd04eb6fe3570c77349097..fba770f99bfafcf970ae5d7128e044b4e559e6a8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.7",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-7.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.79",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-7-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index 0196c5ab6c4ce49268ebaf4afe241395bb1d92ba..b04513f92a6190c6c2793b86fc767eae11e4914e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.8",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-8.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.80",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-8-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index efb22ca626e16cd06349445781b47aeb340c249b..88a8ee99a5f22a18ca089ff5ef1010f11bdb6029 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.9",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-9.sophia.grid5000.fr",
@@ -23,31 +25,31 @@
       "version": "82546EB"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth2",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
     },
     {
+      "device": "eth3",
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -58,12 +60,14 @@
       "enabled": true,
       "interface": "Myrinet",
       "ip": "192.168.7.81",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "helios-9-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
       "switch": "edgeiron48gs",
-      "vendor": "Myrinet",
+      "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     }
   ],
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index 386b1be8d43c264b8061966d32a4a4476107d5dd..f3e8e2e2b34061bb08bc1f6c3f442a96fd7380ed 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.1",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-1.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index 333dfd11a2b55b697bda994fbe68a82d9c648e80..21441eb18b72b202bad2ae716fdc4167b441eb47 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.10",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-10.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index 3c2685d687f7500bb2c2bea833008302b9eac98b..4bd530b52d9ed7016dcecadd92326fbc5eec8c28 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.11",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-11.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index c47d93e2bcb2bf3321c85fd07c2463a957d7f6d8..61ffdacefc9cee3588f27e694a287a982c11b7a4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.12",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-12.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index 4b46311294c2e19adf08a78b2b71bc245379206d..d946fc782cdf59570a7933fbf567606dcd5c2007 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.13",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-13.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index 4f6f99d4b284620bc05839bbe3a38093bf17f0a3..b0716e0f43161f401aa3be5217cfd0104d9abac9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.14",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-14.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index eaea40ded625d7381e86c073fb55aa3313c14da5..0b6ee4cf24fa637e2b87388295a38fe0d711ec0f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.15",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-15.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index d67de9aded4887d0a6356b04d1c1cc631a9f37a6..5904ec77e8e1458757a06e9472e7f96ac663d922 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.16",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-16.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index 3224512bbd763382c86285e00996fb6868143065..52fdcb03e5cad0d19d04cb46d0d9d526d8f1d1b1 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.17",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-17.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 224b4032b3fd6ca78b14af5dbfe1959b5571bb97..227ad4a4f4ced45f08ff1f0e80a35aee345b191f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.18",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-18.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index c435bba7b96c175d5e85c742de6c7e01c0a1181f..873533eca511043f5f69b1bfea0a39d54582bb81 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.19",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-19.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index 52c26cf3d55be37633bad325b22a1d19d34fb738..fcf22b302754bcacf4293f27565f6e63c1ccb6b6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.2",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-2.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index a5e684867295d87823dbd2b5db5f19ca6e6744f6..115db114c12e5804f2583cda80694c37f6ac6576 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.20",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-20.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index 3edf72eb3c2401d7b2a5dea163a4687c9a1cacc2..69abb209ed0a65af3d90982d151aee556432a263 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.21",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-21.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index fee002e12a170dfb151617ba3bf2247fd3fb8a29..5d65de3eee76fbb162a7d749f0556e1b479ce979 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.22",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-22.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index 81af38f55f3a863152621dd93d3964f0eb121c7c..b4103910f16bc800313103977f698b2b723a53ce 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.23",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-23.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index fecddb5a5bc1436842c173f705d1fcb25b527c45..d43a5bc46db50bfe76d1e4677b7545f27237d162 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.24",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-24.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 86d6b5be00bfab94c4379768810cb199bab12455..8454235967c0c3e5d597c06230501e4aed2055f8 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.25",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-25.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index ada1ab5ad47b07e3405a075d478cb1f9b2b520e4..bd77e136b13e6df71a37934c481717e3e9964f61 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.26",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-26.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index 19985c34454a63aabc1ca71dc1c6e96a88f0e496..1650770c26273ce38259a55835e5cb5cde8f1da5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.27",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-27.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 5f9505738358118fff5775ba7762ad9fbc25020b..8ea322309e6bbf628ae27ecee32c77ea2d2e47da 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.28",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-28.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 061f18a640ed02783a4e5b7f31935c93742357cd..3bbdec755b8b6c232b0c71f7397fcdd3c8b8cea4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.29",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-29.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index 6bad9eb27359a75d7110b98e8f617064f917ac8f..a961602974a74d2d84786cf9508e376ca5876e70 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.3",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-3.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 43f3a2c2aa16c40ae2d3453ce2b0824532318c17..0e502a02e5e695ff2135fae73bc193bdc9613dcc 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.30",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-30.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 658f8c260da3e4d57e5dcb04dc2794f69d3e31fe..e5b65a99dd554fb87288440c49de26175eb47b42 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.31",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-31.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 2a8967e0d23a187171084b0c5b6515d17779ed13..1ed03a80cdd7b129997c03bfea40827631b8b9fa 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.32",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-32.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index ded979caa86d732c1f7ff25976e9d614e2949f4b..752562001d69f6b2cb22da28f112a3755c97e877 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.33",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-33.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index c139dc4ffe8dd3382fb51495ea3ec892985734a4..1f2a3e6de639119244e64d1711d633c1fee79dc9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.34",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-34.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 0f02623fa37dac823fc80c810c8ce533b0376d32..d5903091cea4b9da0191872c68493c33ded7ef72 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.35",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-35.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index 09a7186d57254a2ed14511e1fa8ff7d1d8c10be5..b8ab7a9a9cbc4ae356631668520ad8f93d19236e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.36",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-36.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index 6607cceff67b21aee6baabb19836d3a785899f8e..432113c1f18848ae5a03e963afa347c688113578 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.37",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-37.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index ef55285be91cbe1470b916b0a4c9b1ad7deb3ef3..f2288f3c29bc551b9193d413979705e5c47f18e7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.38",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-38.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index a06c9f4699b640d08ceec46cd89a73be07304c0a..6d45bc147edd675f982cb9babf3a5ae28ed554a9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.39",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-39.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index ea52353bd0476be4fa4762ae42fd81bfa68e381a..463901af293aa31cb7f946e2b39d5a9d615333bb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.4",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-4.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index 057193843e9e06c582c994a1c3c0c7da44ea4b32..66a4a9ad047d67de5a76a80f1f26542707bbe9e4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.40",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-40.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index ed113aaf5f92005289cc78fa27cd7e870d535156..3e06c26cd4406cdc530bb048e5a1ef81a77c6da7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.41",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-41.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index bc9923eac53ee8cf56fc5d498fe004d5c2e455e1..a4695978cedbef7dda45364453fb7bc06bd3dd8b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.42",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-42.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index 1c8094b49b03518f040304b514ec1ef63cac01bc..2653a95a56dbb56aff02b4116ef4ea5590e23257 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.43",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-43.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index 778d580bcf3bd69fde0c0a5a7751262952e39b90..d301f8682f7c882d6541f0a153c7dd73251d1e16 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.44",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-44.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index e582a28512556bd4b27c289eb58015195e45f46d..235da71a642d85f3f260bb7869c07012c8e34d46 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.45",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-45.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index e34517c436a311067089b16de79d55c5cf7c824a..b10e1e81df0d1b6570cddf493464616b9238d1b5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.46",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-46.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 920979faa7606559682d280e518b39c844091297..41b05b43481fc33ee3fd29c607d8754a27c938be 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.47",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-47.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index 7cdb14d296347bb8ebabc1815ebd340deaf27918..622a475791fb5a631ab38e0d3781c62d95c9d3ed 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.48",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-48.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index ac6ea1da2c3b87ffd183fd50fd8580d4eb516220..9af56e12969c9fe4cfb825aa36b03c0356820fd5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.49",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-49.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index f53a693f7c3d4be94e538429d106ddd286e282ba..199c08c3a734ff2bde3922e35495c50f16b29856 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.5",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-5.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 00ec7b0988dae83cd65c5c4f25f955954f7ffaae..1fc58640c3bed9c92afde86ba2687e330b5f9025 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.50",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-50.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index 969d80fff1a023b3fa01263c5b1c67034aa4b168..fbd942fbe78fd4d428e48bc8ed525853ad8c69cb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.6",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-6.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index 5d4bfb977e6ff0d62bf0128b33032b4d7fc97647..eb59864502b6c8751bc419cf54c2b1302ece3f38 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.7",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-7.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index 2e4e08b5383ff5ef57f4476476b930aa5fbf7ad8..8902d2d1c317b8e313b5d922b7c72f0b87ad9f65 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.8",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-8.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index c6e054def8fbb9fb680ef8e414372806ff0e43e5..62b3c040c79c9f01be05f45fb5248d056d3234bc 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -15,30 +15,31 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.9",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "sol-9.sophia.grid5000.fr",
       "rate": 1000000000,
       "switch": "fastiron",
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
+      "device": "eth1",
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
-      "vendor": "NVIDIA",
+      "vendor": "nVidia",
       "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
@@ -47,8 +48,7 @@
       "driver": "tg3",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5715c"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index ef59aa206ede6ebc6e02a6bd6d7652a7f061127e..03928a20865199bbc5724cef6e86b2a958cf05dc 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.101",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-1.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 47d0ca1ce181bd9f0df4146e40b295b567a4c58e..dd83aa1927492f3676877431b08ae66b147a82d3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.110",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-10.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 3212c2323565c947b4ba306594e8ccb586fa8181..65c47dbe6cb99860af7d7cfcfcc57bd83a2ac3bc 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.111",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-11.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index df4e9e7fd7b6eb5ef02c45b652584c246e6e743f..2dfab89ef45a4bce36c9ed518591c69334d2de21 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.112",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-12.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index 24031b86ec961fbd23eebbc8520bb32cbe272db0..c2152a408a52e14d62c5c465b9a69dd88040ffe2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.113",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-13.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index f0616f50d1a7905f3d776cb888e13d6f3d045cae..48b6ed4bd5eb8c30ee1a983c26e15fa8c1acf8fa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.114",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-14.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index fbd0ca08d939de1dbbf12df411cc8be8531d12a5..2daf0b37d837c89dd55bee6e92d1261cde3d47d2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.115",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-15.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index cf0986d02e72daa4cb2894cf5ebc89fdd36ecb0c..181850ef5ddc70ce5e7d30eb1da0aeeb89b83ffe 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.116",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-16.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index e71a96e74e74b764e6d0ac441419ba920f40d61a..e6edfa463cf2b8d211a4115317320d72fa750061 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.117",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-17.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 8917234e82589f6a80e14288ff3ab395c5671aac..8733fa36203dbf84e5e8f1e0f81b75e196a2990e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.118",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-18.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index b020b13d15befb2509e406a1943763c087da86ac..0a8846f1992287a9fef3e281259b3b0c56fe4ffa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.119",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-19.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 175d83d6530c6f77b1b3e3b5f29cc7b98b4af180..f9ee756aa11bd4864d4d6a41a811d7663bba1f5f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.102",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-2.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index e2b16ad273de016b0020ee1541779869a9c7580d..3465183a0949d225493c6c62894378d86bf96d8c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.120",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-20.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index f4c61aa2f4241970fb637767e5aee80a8ab689ca..af617cda08a0522ee705b77db10b5933a78bd88d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.121",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-21.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 64e99a2f159b5df914ed28c70e2ad587b8a0f961..3d6de7da81ddb998417812e1155c2ce27ab27acb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.122",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-22.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index 6ceb303df301000c974bc8188f0559f28bd9e937..cf3d1b5b024bdfa6002e4d241ce514534f70c509 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.123",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-23.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index c909311d5f8ccf0ab0c61682bebaf28ff00fab67..80937631b8238dc0d5dd46afa658cb7a0336a566 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.124",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-24.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 8f27da8a0629548b346fa24d4242e9cb7bcc8d92..7cbfa8cb54bd4ff2a1b2832c106e451a92891700 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.125",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-25.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 25c0c8b0b1418da6a9fae0c4aa313364939b74c0..eb03153c3df7c6d2e55041333e24d08d1ed50c5e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.126",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-26.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index dd3fd1c3abff1ae33015eb8eba51e6ab9d39202f..57dea573a809340f708c01ed0a69ded53e540259 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.127",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-27.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index d5316f2388c261ace1bd91c09ddc4c8315fea8de..185ec58dd7305fdbf8e138238edb378a0090e558 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.128",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-28.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index 5fcc3eb215437d41b9dc4949d0bb05316f52a399..4cf6ca94eece6d35f3d8d6d1046947c64a1ff22e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.129",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-29.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 2f59c5c39199547019ecb3761291370fba6e3767..4bf111279b56358179c23c03fbd28702aad233ed 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.103",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-3.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 54d4fc568c57c7c02c15e21d7afb6e2ab9d43025..b29c6032c2fb4be1a907b211822b3272ae695380 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.130",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-30.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 3e6f6f78794e17c8363a40edf454cdc681580c41..8ab3524068e932a272caf172ffe793e39c2d1d4b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.131",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-31.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index cdb2557f55d79ac8829c6a578d621d6b4fc3e935..06797a9bb097ec7ea9e5c0aab922f6a7fa8b81a3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.132",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-32.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 0fde9c5d6e99f2192083ed23ee34555a91b03812..8a19d2b801e72bdc2ae74750c72ab957a89e3f81 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.133",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-33.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 9566a8330565d149445ca9ffc3464dbffcc7abdc..f03a0179a99b9fcd020a9ed0bdbd71ddcb203b15 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.134",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-34.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index 03248d7993430ed6dbcefe396695d331bdd8ddee..135b97b7f4a39e90fb8029581655d16e55023b88 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.135",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-35.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index 0c7bcf9f3302201d27559a81a3f76783959b3c15..0fac1435c0c71b86343ce00010882e0b2d9b7906 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.136",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-36.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 58f03c1df69d2e978dc7e5f454cfb1e83c33de32..d3fe6169bbd1184429937660385b1eba2b5c2706 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.137",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-37.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index 5e6218f069a93d34c7acc80c37ee0329e243d1ea..a6217efc1096304caeed2469aacd07227948d2b9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.138",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-38.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index 33e15fa795955762df6f377ed39216c7f247d3e1..b361c478b36c265a578f3a0eefed88f2ec1d53d1 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.139",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-39.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index b56d5ac70b5d522dda0c7fb2b0a0b9e4d15df9b2..07998958c54e3fcf9f2b714829a2d0d9fc879324 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.104",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-4.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 5191e33cb6636b44328ac6a670653cdde4d694db..4fe9136ceb985354b8e2cdc8c95734a9a393efc7 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.140",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-40.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index c85458923617eb39995ef125074bfa4bc8710995..df69b0645547b4b34083b16a888c74e158368250 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.141",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-41.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index 7d36c37dd024ee3886cd70e60ee28c44dae4727c..cc7466ef6c2bb24ee4bdbb64f17ba58e0ab9c31c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.142",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-42.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index 92b385661e2c12545bc34b96e2b283ed1a45ba00..7be9e2b832eba62c08062b9871f3284e890b5f24 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.143",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-43.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 6a1c55e5eba7cc925bdd2e0ef472f70fe8501847..1eb08bda16fc5d9efffb6951bdc51afe74d4f5c0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.144",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-44.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index c11d1dd04a03dcd6ec21098a49dcf03ebf3bf05b..9693dee655602132de87b7ad9e988b81c3b46774 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.145",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-45.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 5f02b9c5cbb7a5246cad9c32c09aadb1cc88e3c1..6c11d9585854c04d3e2f8812affcc395e7ef0a76 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.105",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-5.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index e6ae344cac410bd9fae661e010dcddc2087f8f36..d09c450436a1c0b5b25af41fe65c53c8f5ee4928 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.106",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-6.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index 8580eee0aa8bff2664219bfb88dd1595f49cccc9..8612f4d0cfde245d17b0bf86f36f1f4d82b633b2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.107",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-7.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index d3f51164e418b2df6d424981708af50e20fcd82f..9e1cb1db0640cd1f382758a5b219498ef6242df8 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.108",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-8.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 15867eef73ecff02b92e19355ec2c66cbbc7170e..5a66997605788542102e69462a5a5617a9b6c9d2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -15,6 +15,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.109",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "suno-9.sophia.grid5000.fr",
@@ -24,11 +26,11 @@
       "version": "NetXtremeII BCM5716"
     },
     {
+      "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index 3515f35e9e8f7d9c8781543b1d69218425138c23..3134bde820e2202349394c5362bc75f78fe55f8e 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -48,17 +48,49 @@ site :lille do |site_uid|
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_sil"}
           ]
-        network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true, 
-            :switch => "gw", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :mountable => true, :mounted => true, :device => "eth0"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => false,
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :mountable => true, :mounted => true, :device => "eth1"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true,
-            :switch => "gw", :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
-            :driver => "tg3",:mountable => false}
-          ]  
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5704',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => "eth0",
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => "gw"
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5704',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :mounted => true,
+            :device => "eth1",
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :driver => "tg3",
+            :switch => "gw"
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
+            :switch => "gw"
+          }]  
       end
     end
   end # cluster chuque
@@ -98,20 +130,65 @@ site :lille do |site_uid|
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
           ]
-        network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :mountable => true, :mounted => true, :device => "eth0"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => false, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :switch_port => lookup('lille', "#{node_uid}", 'switch_port'), :mountable => true, :mounted => true, :device => "eth1"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true,
-            :switch => "gw", :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
-            :driver => "tg3",:mountable => false},
-          {:interface => 'Myrinet', :rate => 10.G, :enabled => true, :management => true,
-            :switch => nil, :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-            :vendor => "Myrinet", :version => "10G-PCIE-8A-C", :mountable => true, :mounted => true, :device => "myri0"}
-          ]        
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false, 
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false, 
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => 'eth1',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => "gw",
+            :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
+          },{
+            :interface => 'Ethernet', 
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Myrinet',
+            :rate => 10.G,
+            :mac => nil,
+            :vendor => "Myricom",
+            :version => "10G-PCIE-8A-C",
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'mx',
+            :mounted => true, 
+            :device => 'myri0',
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => nil
+          }]
       end
     end
   end # cluster chti   
@@ -151,20 +228,65 @@ site :lille do |site_uid|
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
           ]
-        network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :mountable => true, :mounted => true, :device => "eth0"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => false, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :switch_port => lookup('lille', "#{node_uid}", 'switch_port'), :mountable => true, :mounted => true, :device => "eth1"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true,
-            :switch => "gw", :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
-            :driver => "tg3",:mountable => false},
-          {:interface => 'Myrinet', :rate => 10.G, :enabled => true, :management => true,
-            :switch => nil, :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-            :vendor => "Myrinet", :version => "10G-PCIE-8A-C", :mountable => true, :mounted => true, :device => "myri0"}
-          ]        
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false, 
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false, 
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => 'eth1',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'gw',
+            :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
+          },{
+            :interface => 'Ethernet', 
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+         },{
+            :interface => 'Myrinet',
+            :rate => 10.G,
+            :mac => nil,
+            :vendor => "Myricom",
+            :version => "10G-PCIE-8A-C",
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'mx',
+            :mounted => true, 
+            :device => 'myri0',
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => nil
+          }]
       end
     end
   end # cluster chicon
@@ -204,20 +326,65 @@ site :lille do |site_uid|
         storage_devices [
           {:interface => 'SATA II', :size => 250.GB, :driver => "ahci"}
           ]
-        network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :driver => "e1000", :mountable => true, :mounted => true, :device => "eth0"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => false, 
-            :switch => "gw", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "e1000", :switch_port => lookup('lille', "#{node_uid}", 'switch_port'), :mountable => true, :mounted => true, :device => "eth1"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :management => true,
-            :switch => "gw", :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
-            :driver => "e1000",:mountable => false},
-          {:interface => 'Myrinet', :rate => 10.G, :enabled => true, :management => true,
-            :switch => nil, :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-            :vendor => "Myrinet", :version => "10G-PCIE-8A-C", :mountable => true, :mounted => true, :device => "myri0"}
-          ]
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel',
+            :version => '80003ES2LAN',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'e1000e',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel',
+            :version => '80003ES2LAN',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'e1000e',
+            :mounted => true,
+            :device => 'eth1',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'gw',
+            :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
+         },{
+            :interface => 'Ethernet', 
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Myrinet',
+            :rate => 10.G,
+            :mac => nil,
+            :vendor => 'Myricom',
+            :version => '10G-PCIE-8A-C',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'mx',
+            :mounted => true,
+            :device => 'myri0',
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => nil
+          }]
       end
     end
   end
diff --git a/generators/input/sophia.rb b/generators/input/sophia.rb
index 8f73134f723457991b01962743a46331120efef2..fc0dbc90c32067818e4e8a7eea8816627368bdfe 100755
--- a/generators/input/sophia.rb
+++ b/generators/input/sophia.rb
@@ -52,42 +52,43 @@ site :sophia do |site_uid|
           :driver => "amd74xx"
         }]
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => true,
-          :mountable => true,
-          :mounted => true,
-          :device => "eth0",
-          :driver => "tg3",
-          :vendor => 'Broadcom Corporation',
-          :version => 'NetXtreme BCM5704',
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :driver => "tg3",
-          :vendor => 'Broadcom Corporation',
-          :version => 'NetXtreme BCM5704'
-        },
-        {
-          :interface => 'Myrinet',
-          :rate => 2.G,
-          :enabled => true, 
-          :mountable => true,
-          :mounted => true,
-          :device => "myri0",
-          :switch => "cisco1",
-          :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-          :vendor => 'Myrinet',
-          :version => "M3F-PCIXF-2",
-          :driver => 'mx'
-        }]   
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom Corporation',
+            :version => 'NetXtreme BCM5704',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom Corporation',
+            :version => 'NetXtreme BCM5704',
+            :enabled => false,
+            :driver => 'tg3'
+          },{
+            :interface => 'Myrinet',
+            :rate => 2.G,
+            :mac => nil,
+            :vendor => 'Myricom',
+            :version => 'M3F-PCIXF-2',
+            :enabled => true, 
+            :management => false,
+            :mountable => true,
+            :driver => 'mx',
+            :mounted => true,
+            :device => 'myri0',
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => 'cisco1'
+          }]   
       end
     end
   end
@@ -137,62 +138,62 @@ site :sophia do |site_uid|
           :raid => "0"
         }]
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => true,
-          :mountable => true,
-          :mounted => true,
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :device => "eth0",
-          :driver => "e1000",
-          :vendor => 'Intel Corporation',
-          :version => '82546EB'
-        },  
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :driver => "e1000",
-          :vendor => 'Intel Corporation',
-          :version => '82546EB'
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :driver => "e1000",
-          :vendor => 'Intel Corporation',
-          :version => '82546EB'
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :driver => "e1000",
-          :vendor => 'Intel Corporation',
-          :version => '82546EB'
-        },
-        {
-          :interface => 'Myrinet',
-          :rate => 2.G,
-          :enabled => true,
-          :mountable => true,
-          :mounted => true,
-          :device => "myri0",
-          :switch => "edgeiron48gs",
-          :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-          :vendor => 'Myrinet',
-          :version => "M3F-PCIXF-2",
-          :driver => 'mx'
-        }]          
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel Corporation',
+            :version => '82546EB',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => "e1000",
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel Corporation',
+            :version => '82546EB',
+            :enabled => false,
+            :driver => 'e1000',
+            :device => 'eth1'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel Corporation',
+            :version => '82546EB',
+            :enabled => false,
+            :driver => 'e1000',
+            :device => 'eth2'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Intel Corporation',
+            :version => '82546EB',
+            :enabled => false,
+            :driver => 'e1000',
+            :device => 'eth3'
+          },{
+            :interface => 'Myrinet',
+            :rate => 2.G,
+            :mac => nil,
+            :vendor => 'Myricom',
+            :version => 'M3F-PCIXF-2',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'mx',
+            :mounted => true,
+            :device => 'myri0',
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => "edgeiron48gs"
+          }] 
       end
     end
   end
@@ -235,49 +236,46 @@ site :sophia do |site_uid|
           :driver => "sata_nv"
         }]
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => true,
-          :mountable => true,
-          :mounted => true,
-          :device => "eth0",
-          :switch => "fastiron",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :vendor => "NVIDIA",
-          :version => "MCP55 Pro",
-          :driver => "forcedeth"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :vendor => "NVIDIA",
-          :version => "MCP55 Pro",
-          :driver => "forcedeth"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :vendor => "Broadcom",
-          :version => "BCM5715c",
-          :driver => "tg3"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :vendor => "Broadcom",
-          :version => "BCM5715c",
-          :driver => "tg3"
-        }]          
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'nVidia',
+            :version => 'MCP55 Pro',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'forcedeth',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'fastiron'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'nVidia',
+            :version => 'MCP55 Pro',
+            :enabled => false,
+            :driver => 'forcedeth',
+            :device => 'eth1'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'BCM5715c',
+            :enabled => false,
+            :driver => 'tg3'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'BCM5715c',
+            :enabled => false,
+            :driver => 'tg3'
+          }]
       end
     end
   end
@@ -321,29 +319,30 @@ site :sophia do |site_uid|
           :raid => "0"
         }]
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => true,
-          :mountable => true,
-          :mounted => true,
-          :device => "eth0",
-          :switch => "fastiron",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :vendor => "Broadcom",
-          :version => "NetXtremeII BCM5716",
-          :driver => "bnx2"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          :mountable => false,
-          :mounted => false,
-          :vendor => "Broadcom",
-          :version => "NetXtremeII BCM5716",
-          :driver => "bnx2"
-        }]          
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtremeII BCM5716',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'bnx2',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'fastiron'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => nil,
+            :vendor => 'Broadcom',
+            :version => 'NetXtremeII BCM5716',
+            :enabled => false,
+            :driver => 'bnx2',
+            :device => 'eth1'
+          }]
       end
     end
   end