From e8ecf7ada0572f1575a558c0115489ea08bef594 Mon Sep 17 00:00:00 2001
From: Philippe Combes <pcombes@mail.lille.grid5000.fr>
Date: Wed, 29 Sep 2010 15:10:11 +0200
Subject: [PATCH] [lille] Improve compliance with wiki rules - should be OK for
 g5k-checks 0.3.

---
 .../lille/clusters/chicon/nodes/chicon-1.json |  26 +-
 .../clusters/chicon/nodes/chicon-10.json      |  26 +-
 .../clusters/chicon/nodes/chicon-11.json      |  26 +-
 .../clusters/chicon/nodes/chicon-12.json      |  26 +-
 .../clusters/chicon/nodes/chicon-13.json      |  26 +-
 .../clusters/chicon/nodes/chicon-14.json      |  26 +-
 .../clusters/chicon/nodes/chicon-15.json      |  26 +-
 .../clusters/chicon/nodes/chicon-16.json      |  26 +-
 .../clusters/chicon/nodes/chicon-17.json      |  26 +-
 .../clusters/chicon/nodes/chicon-18.json      |  26 +-
 .../clusters/chicon/nodes/chicon-19.json      |  26 +-
 .../lille/clusters/chicon/nodes/chicon-2.json |  26 +-
 .../clusters/chicon/nodes/chicon-20.json      |  26 +-
 .../clusters/chicon/nodes/chicon-21.json      |  26 +-
 .../clusters/chicon/nodes/chicon-22.json      |  26 +-
 .../clusters/chicon/nodes/chicon-23.json      |  26 +-
 .../clusters/chicon/nodes/chicon-24.json      |  26 +-
 .../clusters/chicon/nodes/chicon-25.json      |  26 +-
 .../clusters/chicon/nodes/chicon-26.json      |  26 +-
 .../lille/clusters/chicon/nodes/chicon-3.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-4.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-5.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-6.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-7.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-8.json |  26 +-
 .../lille/clusters/chicon/nodes/chicon-9.json |  26 +-
 .../chinqchint/nodes/chinqchint-1.json        |  30 +-
 .../chinqchint/nodes/chinqchint-10.json       |  30 +-
 .../chinqchint/nodes/chinqchint-11.json       |  30 +-
 .../chinqchint/nodes/chinqchint-12.json       |  30 +-
 .../chinqchint/nodes/chinqchint-13.json       |  30 +-
 .../chinqchint/nodes/chinqchint-14.json       |  30 +-
 .../chinqchint/nodes/chinqchint-15.json       |  30 +-
 .../chinqchint/nodes/chinqchint-16.json       |  30 +-
 .../chinqchint/nodes/chinqchint-17.json       |  30 +-
 .../chinqchint/nodes/chinqchint-18.json       |  30 +-
 .../chinqchint/nodes/chinqchint-19.json       |  30 +-
 .../chinqchint/nodes/chinqchint-2.json        |  30 +-
 .../chinqchint/nodes/chinqchint-20.json       |  30 +-
 .../chinqchint/nodes/chinqchint-21.json       |  30 +-
 .../chinqchint/nodes/chinqchint-22.json       |  30 +-
 .../chinqchint/nodes/chinqchint-23.json       |  30 +-
 .../chinqchint/nodes/chinqchint-24.json       |  30 +-
 .../chinqchint/nodes/chinqchint-25.json       |  30 +-
 .../chinqchint/nodes/chinqchint-26.json       |  30 +-
 .../chinqchint/nodes/chinqchint-27.json       |  30 +-
 .../chinqchint/nodes/chinqchint-28.json       |  30 +-
 .../chinqchint/nodes/chinqchint-29.json       |  30 +-
 .../chinqchint/nodes/chinqchint-3.json        |  30 +-
 .../chinqchint/nodes/chinqchint-30.json       |  30 +-
 .../chinqchint/nodes/chinqchint-31.json       |  30 +-
 .../chinqchint/nodes/chinqchint-32.json       |  30 +-
 .../chinqchint/nodes/chinqchint-33.json       |  30 +-
 .../chinqchint/nodes/chinqchint-34.json       |  30 +-
 .../chinqchint/nodes/chinqchint-35.json       |  30 +-
 .../chinqchint/nodes/chinqchint-36.json       |  30 +-
 .../chinqchint/nodes/chinqchint-37.json       |  30 +-
 .../chinqchint/nodes/chinqchint-38.json       |  30 +-
 .../chinqchint/nodes/chinqchint-39.json       |  30 +-
 .../chinqchint/nodes/chinqchint-4.json        |  30 +-
 .../chinqchint/nodes/chinqchint-40.json       |  30 +-
 .../chinqchint/nodes/chinqchint-41.json       |  30 +-
 .../chinqchint/nodes/chinqchint-42.json       |  30 +-
 .../chinqchint/nodes/chinqchint-43.json       |  30 +-
 .../chinqchint/nodes/chinqchint-44.json       |  30 +-
 .../chinqchint/nodes/chinqchint-45.json       |  30 +-
 .../chinqchint/nodes/chinqchint-46.json       |  30 +-
 .../chinqchint/nodes/chinqchint-5.json        |  30 +-
 .../chinqchint/nodes/chinqchint-6.json        |  30 +-
 .../chinqchint/nodes/chinqchint-7.json        |  30 +-
 .../chinqchint/nodes/chinqchint-8.json        |  30 +-
 .../chinqchint/nodes/chinqchint-9.json        |  30 +-
 .../lille/clusters/chti/nodes/chti-1.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-10.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-11.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-12.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-13.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-14.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-15.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-16.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-17.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-18.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-19.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-2.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-20.json    |  26 +-
 .../lille/clusters/chti/nodes/chti-3.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-4.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-5.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-6.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-7.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-8.json     |  26 +-
 .../lille/clusters/chti/nodes/chti-9.json     |  26 +-
 .../lille/clusters/chuque/nodes/chuque-1.json |  18 +-
 .../clusters/chuque/nodes/chuque-10.json      |  18 +-
 .../clusters/chuque/nodes/chuque-11.json      |  18 +-
 .../clusters/chuque/nodes/chuque-12.json      |  18 +-
 .../clusters/chuque/nodes/chuque-13.json      |  18 +-
 .../clusters/chuque/nodes/chuque-14.json      |  18 +-
 .../clusters/chuque/nodes/chuque-15.json      |  18 +-
 .../clusters/chuque/nodes/chuque-16.json      |  18 +-
 .../clusters/chuque/nodes/chuque-17.json      |  18 +-
 .../clusters/chuque/nodes/chuque-18.json      |  18 +-
 .../clusters/chuque/nodes/chuque-19.json      |  18 +-
 .../lille/clusters/chuque/nodes/chuque-2.json |  18 +-
 .../clusters/chuque/nodes/chuque-20.json      |  18 +-
 .../clusters/chuque/nodes/chuque-21.json      |  18 +-
 .../clusters/chuque/nodes/chuque-22.json      |  18 +-
 .../clusters/chuque/nodes/chuque-23.json      |  18 +-
 .../clusters/chuque/nodes/chuque-24.json      |  18 +-
 .../clusters/chuque/nodes/chuque-25.json      |  18 +-
 .../clusters/chuque/nodes/chuque-26.json      |  18 +-
 .../clusters/chuque/nodes/chuque-27.json      |  18 +-
 .../clusters/chuque/nodes/chuque-28.json      |  18 +-
 .../clusters/chuque/nodes/chuque-29.json      |  18 +-
 .../lille/clusters/chuque/nodes/chuque-3.json |  18 +-
 .../clusters/chuque/nodes/chuque-30.json      |  18 +-
 .../clusters/chuque/nodes/chuque-31.json      |  18 +-
 .../clusters/chuque/nodes/chuque-32.json      |  18 +-
 .../clusters/chuque/nodes/chuque-33.json      |  18 +-
 .../clusters/chuque/nodes/chuque-34.json      |  18 +-
 .../clusters/chuque/nodes/chuque-35.json      |  18 +-
 .../clusters/chuque/nodes/chuque-36.json      |  18 +-
 .../clusters/chuque/nodes/chuque-37.json      |  18 +-
 .../clusters/chuque/nodes/chuque-38.json      |  18 +-
 .../clusters/chuque/nodes/chuque-39.json      |  18 +-
 .../lille/clusters/chuque/nodes/chuque-4.json |  18 +-
 .../clusters/chuque/nodes/chuque-40.json      |  18 +-
 .../clusters/chuque/nodes/chuque-41.json      |  18 +-
 .../clusters/chuque/nodes/chuque-42.json      |  18 +-
 .../clusters/chuque/nodes/chuque-43.json      |  18 +-
 .../clusters/chuque/nodes/chuque-44.json      |  18 +-
 .../clusters/chuque/nodes/chuque-45.json      |  18 +-
 .../clusters/chuque/nodes/chuque-46.json      |  18 +-
 .../clusters/chuque/nodes/chuque-47.json      |  18 +-
 .../clusters/chuque/nodes/chuque-48.json      |  18 +-
 .../clusters/chuque/nodes/chuque-49.json      |  18 +-
 .../lille/clusters/chuque/nodes/chuque-5.json |  18 +-
 .../clusters/chuque/nodes/chuque-50.json      |  18 +-
 .../clusters/chuque/nodes/chuque-51.json      |  18 +-
 .../clusters/chuque/nodes/chuque-52.json      |  18 +-
 .../clusters/chuque/nodes/chuque-53.json      |  18 +-
 .../lille/clusters/chuque/nodes/chuque-6.json |  18 +-
 .../lille/clusters/chuque/nodes/chuque-7.json |  18 +-
 .../lille/clusters/chuque/nodes/chuque-8.json |  18 +-
 .../lille/clusters/chuque/nodes/chuque-9.json |  18 +-
 generators/input/lille.rb                     | 273 ++++++++++++++----
 146 files changed, 2657 insertions(+), 1146 deletions(-)

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 de961acdcb..accec72802 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 2ad44f4666..52c08ee5e3 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 617e30360c..df4e6bcf87 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 801b83c4f3..2e42aea7f1 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 0384da577d..46e2c2e643 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 d998b65e2e..c595c99f86 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 74b613eed3..9727ec4294 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 9d2bd2bab3..4834cbac9a 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 d85dfc4d59..1d9fb27581 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 e97af7db58..3baf5258d5 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 f3c17bc07f..8e85064fd2 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 12ab9fd559..9bd0ab6efb 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 0c70e23095..3a4dbdf7c9 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 bc60b266aa..d462b1b2ad 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 98051ff453..0c2076ead7 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 73735e8696..355a82c980 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 a49e8d0f8b..178369d95a 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 79d909c9ce..98bad7f1af 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 0fcfa06ccd..f39532370d 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 d74843f99a..917915c02f 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 70b56a1872..ee559a57e8 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 626195c14d..009a686d04 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 9e55d25a9e..f1539bbfa4 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 1cc6bab3f2..5164a0be45 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 cb52885f4b..de7415955b 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 0d62cc9dd3..af29a08225 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 26e9fc2288..8c68ea5369 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 617b41508b..27199ee4b6 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 4af9d87739..5e55d2268e 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 3872a95321..40a774c085 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 007914e2b1..5def79df0f 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 2895824ac9..17cd5e9161 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 baffb1ef50..b7122c92d0 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 4157a476df..a354a13b92 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 4bce3ef50b..a594ecca59 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 e92a01fb42..82ec5d821b 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 e1c8fbab4b..1513682c20 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 8a3dbdfd03..b341c083a1 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 9cf3d6f4ef..5b46e1d1e4 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 847b05728d..0b5c1855c8 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 f53933b67a..86ad7d7c85 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 96189f3d45..3ee10331ef 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 9a74d966ed..82eff9fcb2 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 7cdf301dce..b537ed82a0 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 45d76300dd..026e4352f9 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 b822c3d0f1..ed344916ad 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 d8f2274c43..1204e5d3d8 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 0730520954..beec95281c 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 c1a8b47faf..7cb38d9691 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 bc375a03c7..5d6ec89731 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 e6106f5757..4f8665e50e 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 d155e634fb..74ebe93198 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 6261a8aa1c..288020d26b 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 5ab882574f..dc44125445 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 d789e1f940..1a54d3ff39 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 7a7fe98a14..9a00112cd0 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 762f732ff4..b5d7adb380 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 14e57a5b26..14ba5e255f 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 ea1a9c5bdd..1b7f5d8e2a 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 4b363be436..4f3a7adf8f 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 2f214c05f8..863d5a740a 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 cdda141803..fa705b409b 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 91afc57a18..e2dd63efd4 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 e42d7d62b3..c37d17233d 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 4c4ec91211..2f3734d77c 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 098480960e..7f360a3e8e 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 081300fd47..a4328aa910 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 b0261aa2d4..aefa1e64db 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 4c01ed1861..3cd8f6992b 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 a6ccd787f5..790be4449d 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 828bca7623..aca8cd380f 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 2cdcb7b46c..f5a0347d03 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 106290acae..c8cf73c7bb 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 4a6e7af4ca..94a392bd42 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 f3fd37cfb1..0b10e59893 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 b46e0ffe69..e0dcbaec5a 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 82d95efc79..1106aac0e6 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 51eea15b14..65e1b0faa7 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 80c26e5f92..7ce54cbfad 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 70b6ba6676..943736e196 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 ac9f1348d8..c202d7d6b6 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 e960e04fec..f7adf4eaa7 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 6e7d094ce7..1efd352fa8 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 a2b0044466..6eb5dccf25 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 222bbdd98d..68d87228a6 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 325b1aebb8..f1e36224da 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 1558833374..247f75928d 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 9a8070d493..074ab10971 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 a59059e135..8ebbb6bdd4 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 10b858f993..d12f2152a6 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 d2d2e9a80d..273b1881f5 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 75b675a46b..2d51ee1408 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 25b98f9b2b..b9205d072d 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 c52de30896..30e498ceb0 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 862f1b1da5..cdeaf0a785 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 9da7081a01..a09ca6de94 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 3decf769b5..08270ea915 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 39375f3d92..90d220102f 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 2f50aeaa40..62e9674d60 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 bd56414eb3..56edd58528 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 a6535fe645..fb9d66cfca 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 b00c7b4e57..06b50f8d99 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 ab9ac8f782..b3336d1d7d 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 9c1b647f91..1ee50c600b 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 03161e9c1a..eee58971f1 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 2c9a4e1e41..0a390085c1 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 a75308fa27..371ec82cb5 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 273eb1966d..b6b0e22220 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 4e377924e8..6352a806d5 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 b727e196f9..59d0845b05 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 3ae930014f..72e7cdc643 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 0bff7c521a..9e8c2aa3f3 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 22ef879bcf..2623566251 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 ae53f7a9b5..036a2c998d 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 2b2e739f1f..9e9d584f53 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 eab3e09aae..e6a11ac712 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 8b95dbc10d..acbfc43220 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 3080c5b9bf..c65aacd54e 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 850e8f89f1..baba6ace87 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 340b23291a..685825a031 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 7249b2ea98..1393d4a832 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 d1eb2926f0..b7e1692b26 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 81a3f127f3..9f8b4653c7 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 ff627dd0c4..8710e7c477 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 5e9aa46718..06db983407 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 2720c8e476..920b130bc1 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 1b81bf7e13..46463dbafb 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 09baa9ab94..72063ea2ab 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 6fab2fd9c4..37cc24fce2 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 d798cceff9..ad1ab6a6e8 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 cabbffc7a2..7f063187b7 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 b572965dd2..991f3e2032 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 12dae023d8..ba4a119a1a 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 003e78b986..ce1501c461 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 096c62bfac..9aee9b7663 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 51349a8bc9..36b07542b1 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 884854045e..91bcf774c0 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 9662e75b49..ca2b9156aa 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 c8f9cadad4..5648035577 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 506d3cce22..f99c94b560 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 50d30cb98f..7778a2a503 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 b69500e6c0..f4b366a08f 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 857e3142aa..f299b0385a 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 62cf02b9f8..6f33cd6c13 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 33fbe1fe60..e6a2953be7 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/generators/input/lille.rb b/generators/input/lille.rb
index 3515f35e9e..3134bde820 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
-- 
GitLab