diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index adc797f44d0798d79c43d9472270e03b0f131340..52ece1174f9eea8575a20c24cd9543527d8473c1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 82bfc6f89edc56317d01a48157f881303db36184..75cce6c96e9c8670d0ceeaf509f85a8e9fa66c10 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 3b8a7267cf3ba49685b54143c20ae7ceb50ecb30..93f87d97255fee46b2d7a61fcf33e71aed6e2c66 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 0b08c6c0a5d36cc0b2c29231e64496120e3d8988..b55663fd6dc84d1efcc388fde5ebb5d9d355b669 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 7744b1825b39e22ac8e5331f908dba22dda9127e..b4f5d386f16ae2cfc44d65359a1fdcd9e0001c5a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index fee04a8aabe54f66f2ae329c9da3a41e32685c37..df2a4044990cbfd04985b463cd25b294d9801e03 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 4662002d3a181d8d60c96cfa49660380f9e10153..8ab1ba3e2ac9c2183be481de1dbe05d1f77d1a95 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index b1917b99e31d0783c1445954166760ccc7dd1dab..5a8bafd794f7a039398a7a18770f87f1669211ad 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index f8e24c5e1c027d22d497dc28e73fd36d0fe13ad5..754adc61166804284385734dfc096abf87692bcf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index b86127c4046084e87b4c5b50a16238225b618ec1..9c6c7022d3f5fc11133d49363505f9550423b080 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -62,9 +62,7 @@
       "network_address": "edel-18.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-18-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 76a4266358e6f303eb7fdd13140fb86ab98137a0..e2ffb0c3cefd4ed5f1013dbeb19fa13d478a0852 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index e56bba6f0fd01156da29df15eddec118a98c5fff..f0e438712211b64ff62fd92baed79f00f1cb15d2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 9e47ecb52f417e37b0c6f8ab7789e64009dfa79c..ed465feafa6c397832e4189c63a5066336a69e4a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index 88be171f49052db7ba80333ae377e925244645bd..33a7f9c49641eff6fc2ef5e62716d006d5e58d95 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index de7f0fdb5eb25980efcb94dcbd78104490f7a999..dfa0f19529a7f8e801573408c0456c22642fc838 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index c2d866d994b6d6aa2b477c6b2868633ea07bd24e..8b18164da6f610d3d0f2e5483640afce6796f447 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 233a9a48c0940bbd46ffd5b3ba404d6fb656c91e..ca41c94250050a017c2f03f2956906450c2b8ff8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -62,9 +62,7 @@
       "network_address": "edel-24.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -76,10 +74,7 @@
       "mac": "08:00:38:35:ac:27",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "mounted": false
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "edel-24-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index 141ecb68a22e0aff4d51570d5525290f2c81d4ae..4025e3e3331d134e6319cbcc21d93ca866e8e5be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -62,9 +62,7 @@
       "network_address": "edel-25.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-25-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 1f6d7223e6d3f4156a5c14c861e93b1d3d9c388f..4036cf6c32e31a91764ab392fc9d08c33519e90d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index 65eee6ed9533a0a07cb26524e4b42165414ebaea..3e2e360a367ad0cc45d74c1dc77fc4da963fdfac 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index bd1da7c4cff4e457a871072e9cc48e04e216f5df..84f681a518b2a9ae7f4a6c96b4f147096a87fa3a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index bcdd4a2c1e862a5298a546da65b78656f07e94a4..00c1f3e7a017e5d2e3d9457e2088e6d8ae40ac3d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index bf9fef6cf6b2b0fe46a3f070f421c006071f8966..cbdf3c16629c89bd19b7b57fba8036360f4b843d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index a47957639e52550ab412bc01ee9475bdfa81b077..1442c96a0d97e02c84054ffc39095e21d101285c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -62,9 +62,7 @@
       "network_address": "edel-31.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-31-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 225c20e0cb0a73c5ea25b4149ae68eb60e7ecc3b..65069771136d9a481c8301a5217082b4810b26bc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index d7feca69dbdb7982e28211682cb3de1bf4696307..07ea50706284e346bc6f160921b04d9b1f43f222 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -62,9 +62,7 @@
       "network_address": "edel-33.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-33-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index 61cb4e7f93572919c78ff1a5f557d63a9135255d..1c9848d4b2b6b9ceb9d74f84d2e7901250e91425 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index e7b5c4dea7215baa382b1b851f6c007f26f544f5..d2aca803f6a70e840e4e9ece04d606359636180b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -62,9 +62,7 @@
       "network_address": "edel-35.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-35-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 2ba2adbe90ef92b2e524b905ac3af4dff801f357..0f6d2bda14075ecbe4442cbd2696fc01eaf35ea8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-2",
       "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 2b50581fd722ac910c4e952df27b144a1c4c46f8..0b3ab9e4ded302becf6cfc8381be9f7500e03a7e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index d8109ddf65395905caf0391e1ba3fc5d0cb6927d..17273b8fcdc74ef1cc6ae68c3ef2fbdb1b02b0a5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index f3adec79cce8f331dafda0cdb06fdbdde5ef9ae8..c53228b691e56bbbb7a9f8861a9ac78bedb28847 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 098e3219e5743838804a93c788c4ea93f9cc63a4..c798e927095cf389999142b86cdfb8b484a0246a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -62,9 +62,7 @@
       "network_address": "edel-4.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 458d75e4f0b7584c4e43e573569a9d2a565295ee..7873c96e37f46d6a7bc1f32d5699e2e93f0d74a7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index 77a295dc9d2f2228681be24cfccb3e3201e38791..a96f63cd920ff399ee2d238b15981fda237c1994 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -62,9 +62,7 @@
       "network_address": "edel-41.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -76,10 +74,7 @@
       "mac": "08:00:38:36:f5:a5",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "mounted": false
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "edel-41-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -108,7 +102,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 8f5c85a5c9107ba6aff1308a5c2b6e414d9f2f7f..096c06667e0ca0cd59f997ab6cc8a306ed3aa14e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 8eff6a55f6d67a056ffc240f2bf278f14dca15a8..66e8d0306949ab3b439184d26fed7ea151e0c9e0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index db76efbbf018bd977ba52703fcfe82df701b36ed..8c8d055d617ae0afab934595b96f8c581a07818b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index d3a359206381b1e8e03055243430457a1cc54427..fc25a122ef33059f5de04d0b7f5446a5ed7d2abc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -62,9 +62,7 @@
       "network_address": "edel-46.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-46-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index d83d528fa971a488136fb62e0ddf0ad88273c71e..760b08afcc891a00fef777acaba87fe80cbcb960 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 01460adea9d24a99a4a485696eaabe57d0790216..bf264501d9d67e41be67d02f60086bc8a8fd7aad 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index c47c1bd38229b75e7362764cab39cd8cfb73b6d5..e9310f3a2e0b61985c2c4fa6b0b2010e9ca5f30d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 7bc2470df6b8caf4bc5ba51e5cfdd2e890ff5e9a..5c43e707866e987b6b1705f239795df69822c9e3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 8c6bdcd061d425715208d34267d54e4fff63ff14..86ba8d5cfe965f5e239a2f86e565338da3316863 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -62,9 +62,7 @@
       "network_address": "edel-50.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-50-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 3be64bd69ce8458638a2bf9ec541e8cb7552dee3..c37ef6fc36fa96e0e004fc8e7291d3c898f13446 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index c1ecddc6430ac3c36fb5047124c044fc697c2c86..5f4b7aece79572bc60dbd96d65a4e6d32ee6dd03 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index b989a5476d5ca2d120271d690887b08110fea3eb..1d40c8a6dc5dfaad86226881a57462f9cbed5e04 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-3",
       "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index bf7e2a10f31157fae3538c7f59de6375591de515..a09a1c8880729dace9fc035ea55a281db971862c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 56047d9d8b82bde45426e30533fede4e7e99f2d1..8ef17e9e65b15425778180d8c52419d53cd1aed8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 83e3aafdc87907129d9f59b51877acbdf9df4e21..80183b798e4c3ceddefd449ff791cc334c552021 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index c87da3c81480a93833b16ef5a5a1a659904ce270..166790e2ba22675a25caf189a132cb30bab2280c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 21cdbc1e511aff2d38caf3a24075d8920e42fade..d180e04182af6de3fc8e45bfc2008d66c36923cd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index dd9802c492f179e74a6d47f92d898e9a665aa35c..49f19ef131686c1ace7d156d08ffb69cfb497106 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
@@ -113,7 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index a89f2014fc391f29333e9481aa546a84f74b4b9d..2ae7fb4e3b1d4bfd21e7b965f593311b37719854 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index db4389adf4d5341661015a1bb0a780162e3b5c09..2b432761c6aba0f560a493d0bb638ce78e15ad16 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index ac30e78e3f4a361e6d6bd1c540cef9bad4be914c..1f80551135e21b6e37772550a873e693ce8b8fe2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -62,9 +62,7 @@
       "network_address": "edel-63.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-63-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 374ee0127b37f59506f4e4e4d59e7f46cd1e0582..89d613016b58625b24370a0d5f30919ad986c3a6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index b46c35471c08d98d41dcd55cf4bb1944335c28d0..71512fd505fc6d80ddf11841c5df1bf9ce8201ef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index 44d703a2fe11d96a739d6e0ad13d42123d568324..190c25cf583dcc079e39cf69d75ae2b67b2e626a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index acf4c6ebd2a26ddf5e4919ad17218dfd117817ff..e51092418ba1097e1516979498de790bb05301e8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index c3fcd56805bccbfdc6b452d5c77971362f1c6e9c..1f1e6b7d8f494db3b5c3d94db353d5821e2fc033 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 4a2640ce5497d23ff4c48d11130cd5c6e6304ace..8046ebe6368ce69eee28919931fe6854029ef498 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index 4fb5e6bae2ca6997ebdcf46a50edbc74a56408af..06b370f6a219d314c75562a1ab05b48e2df2c1bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index dbb33ec88b73e741e46e7c7c1e44bf5425c0cadf..13d89eb9b51770ca2fdfe4c01f0dfbba3cfbae85 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -62,9 +62,7 @@
       "network_address": "edel-70.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -76,10 +74,7 @@
       "mac": "08:00:38:35:ac:67",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "mounted": false
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "edel-70-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index dd3c28d406a99481da0d1557fcdcc5d132965c2b..89721aa40a6dcdc5b14c352928fe6f442a566b30 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-4",
       "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 5447d46186446418c5f79fa9d58638a33cf8b8a7..33643b434c4756a8f7d54a1047bc14594ae91a53 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -62,9 +62,7 @@
       "network_address": "edel-72.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level"
     },
     {
       "bridged": false,
@@ -77,9 +75,7 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "rate": 1000000000
     },
     {
       "device": "ib0",
@@ -95,7 +91,6 @@
       "mounted": true,
       "network_address": "edel-72-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
@@ -109,7 +104,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26428"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 0f5ee0a5e690877c93de5504d4816b5c8ff01cb1..3c9b8119e44eb485dcab3c68d46084192d5877e9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index f29b5a4107bb7d11c06bb0550683365ca03fc4d6..6cd76ac37a7ba78a40379a92ae016ec5b1bba42e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -66,8 +66,7 @@
       "rate": 1000000000,
       "switch": "sw-edel-1",
       "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -84,8 +83,7 @@
       "mounted": false,
       "name": "enp1s0f1",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "82576 Gigabit Network Connection"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 988000fb46b3d832b2dfbfc7c476451aabb1874d..e8dd71fc95d147052fd03a40f0fe3f908e6cf825 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:22",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 30dd37368e26d0ab461ae23fd38e49132bf2dbd2..88a6e451cf22099ebe5fd243ab609332b1bf791c 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -57,10 +57,7 @@
       "mac": "00:30:48:7f:41:fc",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "mounted": false
     },
     {
       "bridged": true,
@@ -77,9 +74,7 @@
       "network_address": "genepi-10.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:37",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "switch_port": "BD-8810 Port 3:37"
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "genepi-10-ib0.grenoble.grid5000.fr",
       "rate": 20000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
@@ -109,7 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index d7182c4e10d332bf357817fdf28e2398e9c29e50..5379e61b008330479bf46f24fc3ea820c4347200 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:9",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 78dd19fcb0c257b410bebe00bdee2b2eb7524d35..6f8175fc7825e5afde15ed4834271a8767d285b9 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:38",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 400aeb4a8b54f2cc90442ca81ae8bed96bbf56b6..9c78199d372760e503ab2af21d4f35ee1916aaef 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:17",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index ae40df9ed051f54b8de9447430d3e793f85abe13..8866efb9990c6d7e7342d17ac50254fea6de167f 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:29",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 95533bd4a15fb653603fbe99fdc7e7d5dfe2cd76..1f7cb60c49c86f9708ae7584aba67db3e3e8d284 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:7",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index 0ec843bce1bb52425faa5707618f947667c86bf0..d4321cf47a577628ce345327c7c1ed01becaf392 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:25",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 0b64fb263bb2f9866b6cf846b002f81ff6c08bd8..0f09b7ea007e06d9cfd967cf199a971d32167bae 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:6",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index 9b1e13bfff0dcbf0fc907ce8d9191bf0a867a8fe..54108f11a0b5d68d4408bd20135c3e3ceaf76321 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:27",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index ad9abbe1ebb9ac82f9e08396c54d925546fece46..b5e05901adfa40e59f178e53e4fbdbe3ad98563d 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:16",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 42e5e55fbea1be784897ac8098a8d3581ae52f78..3abd32b4df78219201da993533a7c3e93eb97b94 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:42",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 4c53f385a221831417fc57f1a0c8345c4564b637..602a3c49a24788236d81275d2f6ce132ac45a933 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:31",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 594f8925ef5a877a1eb1e837f0f3db220b28e429..f479de6c1060c24460baaf82933418c4050629dd 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:10",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 6a69521d690e5921bb58a8e5c9fe5985741b8fb8..3589050de9cddadf699e0d975580f23254318593 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:32",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 7dbae937a2f28e01b84dd289879bac95e4f0faf9..db54341fc8b994dda440f17856aa85c27148942b 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:14",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index b3b48110ec2fce43603ec6d4f728cff207f296be..b2f7fd8550ded9ae21bfe881be5110206780cecf 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -57,10 +57,7 @@
       "mac": "00:30:48:7f:29:de",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "mounted": false
     },
     {
       "bridged": true,
@@ -77,9 +74,7 @@
       "network_address": "genepi-24.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:30",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "switch_port": "BD-8810 Port 3:30"
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "genepi-24-ib0.grenoble.grid5000.fr",
       "rate": 20000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
@@ -109,7 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index f9f77e7e1e5800bfdab48897ae87b366c1dd4362..b8941e862f2abe8f367ab34d20b777c035151f35 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -57,10 +57,7 @@
       "mac": "00:30:48:7f:41:5a",
       "management": false,
       "mountable": false,
-      "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "mounted": false
     },
     {
       "bridged": true,
@@ -77,9 +74,7 @@
       "network_address": "genepi-25.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:15",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "switch_port": "BD-8810 Port 4:15"
     },
     {
       "device": "ib0",
@@ -95,7 +90,6 @@
       "mounted": true,
       "network_address": "genepi-25-ib0.grenoble.grid5000.fr",
       "rate": 20000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
@@ -109,7 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 2544dea9f500ef0e9f7edbb237132651c95064d6..294ec70b3aaa0e301f4060c45f4c13fd5923a3ea 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:8",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 8aa0797ef500bcd1cca8467db142edd84db556bf..68f2e6407fbc7224f9023070d410e679cf9ccaec 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:3",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index 8ef1da40f610d46d12e0a98afb38ce7513645d0e..2105d7245044714b99e972f0cc2cab83b206706f 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:21",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index 8ccab738864148457c02831197097afc7f2f3314..453657519951b63ff306bd39e7c46e2b230ef21f 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:28",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 810a211d1e547e3b5f133d7337a00a6d38e869ad..b91ec3560558cb5fb7e56b2fbaf59408501a1b3e 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:13",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index 6ed618153ffe73563820f84faa44e3e7cb14e600..3d4457e0f79cf8e997e507a11c3bda7586952349 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:34",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index e543b5559f0a6ca4215110924a8092f77e70a48d..28db5efec502b13ba1afd55a3f3eac21d7ab0174 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:5",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 258e53acfa909b271e46353e33111ffed6b27040..d61b22543c737bdd81e72e47e9048f1edd662ae2 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:40",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 1a0514eabdccb3fa02070dfe301c3072496637d9..d3e8a2e6504e6b402e90a1ae527b2d901eb1a962 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:19",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index 089971802a946bc04f0a3a59564a89c11fc36968..c797f0488b85c087329ec7848dc0563e77f4fba0 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:41",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index 3bf612a1bdd4e03bd18f6da87e78630f23c4bd1c..93cea63f830623b686bbfaabf4f2927cab491697 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:20",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index a0f7edcb7bcbc083eb952026e958869bed59c0e3..681fa443a2ae6888bf7424c12a9761725b121a33 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 3:39",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index 09f7d103ed43f46d63cd3c04e5243ce1df5c679a..33a3a9c47115e96bdd93933617dd70e30d5c40b9 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -62,8 +62,7 @@
       "mounted": false,
       "name": "enp5s0f0",
       "rate": 0,
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "bridged": true,
@@ -84,8 +83,7 @@
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "BD-8810 Port 4:18",
-      "vendor": "Intel",
-      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+      "vendor": "Intel"
     },
     {
       "device": "ib0",
diff --git a/grid5000-all.json b/grid5000-all.json
index 49550f6dda606d4a44f345150754c7d6f7e1c58b..208a4e3f88552341aaee17a148dd973ca9d60b7b 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -291,8 +291,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -309,8 +308,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -338,7 +336,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -495,8 +492,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -513,8 +509,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -701,8 +696,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -719,8 +713,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -907,8 +900,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -925,8 +917,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -1113,8 +1104,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -1131,8 +1121,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -1319,8 +1308,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -1337,8 +1325,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -1525,8 +1512,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -1543,8 +1529,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -1731,8 +1716,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -1749,8 +1733,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -1778,7 +1761,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -1935,8 +1917,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -1953,8 +1934,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -2137,9 +2117,7 @@
                   "network_address": "edel-18.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -2152,9 +2130,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -2170,7 +2146,6 @@
                   "mounted": true,
                   "network_address": "edel-18-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -2184,7 +2159,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -2341,8 +2315,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -2359,8 +2332,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -2547,8 +2519,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -2565,8 +2536,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -2594,7 +2564,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -2751,8 +2720,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -2769,8 +2737,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -2957,8 +2924,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -2975,8 +2941,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -3163,8 +3128,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -3181,8 +3145,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -3369,8 +3332,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -3387,8 +3349,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -3571,9 +3532,7 @@
                   "network_address": "edel-24.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -3585,10 +3544,7 @@
                   "mac": "08:00:38:35:ac:27",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "mounted": false
                 },
                 {
                   "device": "ib0",
@@ -3604,7 +3560,6 @@
                   "mounted": true,
                   "network_address": "edel-24-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -3618,7 +3573,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -3771,9 +3725,7 @@
                   "network_address": "edel-25.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -3786,9 +3738,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -3804,7 +3754,6 @@
                   "mounted": true,
                   "network_address": "edel-25-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -3818,7 +3767,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -3975,8 +3923,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -3993,8 +3940,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -4185,9 +4131,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Gi1/0/13",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Gi1/0/13"
                 },
                 "eth1": {
                   "bridged": false,
@@ -4198,9 +4142,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -4213,7 +4155,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 "ib1": {
@@ -4225,7 +4166,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 }
               },
@@ -4364,8 +4304,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -4382,8 +4321,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -4570,8 +4508,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -4588,8 +4525,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -4776,8 +4712,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -4794,8 +4729,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -4982,8 +4916,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -5000,8 +4933,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -5184,9 +5116,7 @@
                   "network_address": "edel-31.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -5199,9 +5129,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -5217,7 +5145,6 @@
                   "mounted": true,
                   "network_address": "edel-31-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -5231,7 +5158,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -5388,8 +5314,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -5406,8 +5331,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -5590,9 +5514,7 @@
                   "network_address": "edel-33.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -5605,9 +5527,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -5623,7 +5543,6 @@
                   "mounted": true,
                   "network_address": "edel-33-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -5637,7 +5556,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -5794,8 +5712,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -5812,8 +5729,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -5996,9 +5912,7 @@
                   "network_address": "edel-35.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -6011,9 +5925,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -6029,7 +5941,6 @@
                   "mounted": true,
                   "network_address": "edel-35-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -6043,7 +5954,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -6200,8 +6110,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-2",
                   "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -6218,8 +6127,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -6406,8 +6314,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -6424,8 +6331,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -6453,7 +6359,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -6610,8 +6515,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -6628,8 +6532,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -6816,8 +6719,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -6834,8 +6736,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -7018,9 +6919,7 @@
                   "network_address": "edel-4.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -7033,9 +6932,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -7051,7 +6948,6 @@
                   "mounted": true,
                   "network_address": "edel-4-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -7065,7 +6961,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -7222,8 +7117,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -7240,8 +7134,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -7424,9 +7317,7 @@
                   "network_address": "edel-41.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -7438,10 +7329,7 @@
                   "mac": "08:00:38:36:f5:a5",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "mounted": false
                 },
                 {
                   "device": "ib0",
@@ -7457,7 +7345,6 @@
                   "mounted": true,
                   "network_address": "edel-41-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -7470,7 +7357,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -7627,8 +7513,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -7645,8 +7530,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -7674,7 +7558,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -7831,8 +7714,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -7849,8 +7731,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -8037,8 +7918,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -8055,8 +7935,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -8247,9 +8126,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
-                  "switch_port": "Gi1/0/13",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Gi1/0/13"
                 },
                 "eth1": {
                   "bridged": false,
@@ -8260,9 +8137,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -8275,7 +8150,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 "ib1": {
@@ -8287,7 +8161,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 }
               },
@@ -8422,9 +8295,7 @@
                   "network_address": "edel-46.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -8437,9 +8308,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -8455,7 +8324,6 @@
                   "mounted": true,
                   "network_address": "edel-46-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -8469,7 +8337,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -8626,8 +8493,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -8644,8 +8510,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -8832,8 +8697,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -8850,8 +8714,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -9038,8 +8901,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -9056,8 +8918,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -9244,8 +9105,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -9262,8 +9122,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -9291,7 +9150,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -9444,9 +9302,7 @@
                   "network_address": "edel-50.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -9459,9 +9315,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -9477,7 +9331,6 @@
                   "mounted": true,
                   "network_address": "edel-50-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -9491,7 +9344,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -9648,8 +9500,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -9666,8 +9517,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -9854,8 +9704,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -9872,8 +9721,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -10060,8 +9908,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
                   "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -10078,8 +9925,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -10270,9 +10116,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "sw-edel-3",
-                  "switch_port": "Gi1/0/22",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Gi1/0/22"
                 },
                 "eth1": {
                   "bridged": false,
@@ -10283,9 +10127,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -10298,7 +10140,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 "ib1": {
@@ -10310,7 +10151,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 }
               },
@@ -10449,8 +10289,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -10467,8 +10306,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -10655,8 +10493,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -10673,8 +10510,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -10861,8 +10697,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -10879,8 +10714,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -11067,8 +10901,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -11085,8 +10918,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -11273,8 +11105,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -11291,8 +11122,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -11479,8 +11309,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -11497,8 +11326,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -11526,7 +11354,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -11683,8 +11510,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -11701,8 +11527,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -11893,9 +11718,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
-                  "switch_port": "Gi1/0/11",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Gi1/0/11"
                 },
                 "eth1": {
                   "bridged": false,
@@ -11906,9 +11729,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -11921,7 +11742,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 "ib1": {
@@ -11933,7 +11753,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 }
               },
@@ -12072,8 +11891,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -12090,8 +11908,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -12274,9 +12091,7 @@
                   "network_address": "edel-63.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -12289,9 +12104,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -12307,7 +12120,6 @@
                   "mounted": true,
                   "network_address": "edel-63-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -12321,7 +12133,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -12478,8 +12289,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -12496,8 +12306,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -12684,8 +12493,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -12702,8 +12510,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -12890,8 +12697,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -12908,8 +12714,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -13096,8 +12901,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -13114,8 +12918,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -13302,8 +13105,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -13320,8 +13122,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -13508,8 +13309,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -13526,8 +13326,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -13714,8 +13513,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -13732,8 +13530,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -13916,9 +13713,7 @@
                   "network_address": "edel-70.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -13930,10 +13725,7 @@
                   "mac": "08:00:38:35:ac:67",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "mounted": false
                 },
                 {
                   "device": "ib0",
@@ -13949,7 +13741,6 @@
                   "mounted": true,
                   "network_address": "edel-70-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -13963,7 +13754,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -14120,8 +13910,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
                   "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -14138,8 +13927,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -14322,9 +14110,7 @@
                   "network_address": "edel-72.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sw-edel-4",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level"
                 },
                 {
                   "bridged": false,
@@ -14337,9 +14123,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "rate": 1000000000
                 },
                 {
                   "device": "ib0",
@@ -14355,7 +14139,6 @@
                   "mounted": true,
                   "network_address": "edel-72-ib0.grenoble.grid5000.fr",
                   "rate": 40000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -14369,7 +14152,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26428"
                 },
                 {
@@ -14526,8 +14308,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -14544,8 +14325,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -14732,8 +14512,7 @@
                   "rate": 1000000000,
                   "switch": "sw-edel-1",
                   "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
@@ -14750,8 +14529,7 @@
                   "mounted": false,
                   "name": "enp1s0f1",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "82576 Gigabit Network Connection"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -14947,8 +14725,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -14969,8 +14746,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:22",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -15137,10 +14913,7 @@
                   "mac": "00:30:48:7f:41:fc",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "mounted": false
                 },
                 {
                   "bridged": true,
@@ -15157,9 +14930,7 @@
                   "network_address": "genepi-10.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "BD-8810 Port 3:37",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "BD-8810 Port 3:37"
                 },
                 {
                   "device": "ib0",
@@ -15175,7 +14946,6 @@
                   "mounted": true,
                   "network_address": "genepi-10-ib0.grenoble.grid5000.fr",
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -15189,7 +14959,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -15332,8 +15101,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -15354,8 +15122,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:9",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -15527,8 +15294,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -15549,8 +15315,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:38",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -15722,8 +15487,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -15744,8 +15508,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:17",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -15917,8 +15680,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -15939,8 +15701,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:29",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -16112,8 +15873,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -16134,8 +15894,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:7",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -16307,8 +16066,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -16329,8 +16087,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:25",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -16502,8 +16259,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -16524,8 +16280,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:6",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -16697,8 +16452,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -16719,8 +16473,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:27",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -16892,8 +16645,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -16914,8 +16666,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:16",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -17087,8 +16838,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -17109,8 +16859,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:42",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -17282,8 +17031,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -17304,8 +17052,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:31",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -17477,8 +17224,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -17499,8 +17245,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:10",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -17672,8 +17417,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -17694,8 +17438,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:32",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -17867,8 +17610,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -17889,8 +17631,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:14",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -18057,10 +17798,7 @@
                   "mac": "00:30:48:7f:29:de",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "mounted": false
                 },
                 {
                   "bridged": true,
@@ -18077,9 +17815,7 @@
                   "network_address": "genepi-24.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "BD-8810 Port 3:30",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "BD-8810 Port 3:30"
                 },
                 {
                   "device": "ib0",
@@ -18095,7 +17831,6 @@
                   "mounted": true,
                   "network_address": "genepi-24-ib0.grenoble.grid5000.fr",
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -18109,7 +17844,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -18247,10 +17981,7 @@
                   "mac": "00:30:48:7f:41:5a",
                   "management": false,
                   "mountable": false,
-                  "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "mounted": false
                 },
                 {
                   "bridged": true,
@@ -18267,9 +17998,7 @@
                   "network_address": "genepi-25.grenoble.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "BD-8810 Port 4:15",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "BD-8810 Port 4:15"
                 },
                 {
                   "device": "ib0",
@@ -18285,7 +18014,6 @@
                   "mounted": true,
                   "network_address": "genepi-25-ib0.grenoble.grid5000.fr",
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -18299,7 +18027,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 {
@@ -18442,8 +18169,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -18464,8 +18190,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:8",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -18642,9 +18367,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "rate": 1000000000
                 },
                 "eth1": {
                   "bridged": true,
@@ -18658,9 +18381,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "4:4",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "4:4"
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -18673,7 +18394,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 "ib1": {
@@ -18685,7 +18405,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 }
               },
@@ -18813,9 +18532,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "rate": 1000000000
                 },
                 "eth1": {
                   "bridged": true,
@@ -18829,9 +18546,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "3:33",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "3:33"
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -18844,7 +18559,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 "ib1": {
@@ -18856,7 +18570,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 }
               },
@@ -18979,8 +18692,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19001,8 +18713,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:3",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -19174,8 +18885,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19196,8 +18906,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:21",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -19369,8 +19078,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19391,8 +19099,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:28",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -19564,8 +19271,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19586,8 +19292,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:13",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -19759,8 +19464,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19781,8 +19485,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:34",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -19954,8 +19657,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -19976,8 +19678,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:5",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -20154,9 +19855,7 @@
                   "management": false,
                   "mountable": false,
                   "mounted": false,
-                  "rate": 1000000000,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "rate": 1000000000
                 },
                 "eth1": {
                   "bridged": true,
@@ -20170,9 +19869,7 @@
                   "mounted": true,
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
-                  "switch_port": "3:26",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "switch_port": "3:26"
                 },
                 "ib0": {
                   "driver": "mlx4_core",
@@ -20185,7 +19882,6 @@
                   "mountable": true,
                   "mounted": true,
                   "rate": 20000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 },
                 "ib1": {
@@ -20197,7 +19893,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "vendor": "Mellanox",
                   "version": "MT26418"
                 }
               },
@@ -20320,8 +20015,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -20342,8 +20036,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:40",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -20515,8 +20208,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -20537,8 +20229,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:19",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -20710,8 +20401,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -20732,8 +20422,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:41",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -20905,8 +20594,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -20927,8 +20615,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:20",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -21100,8 +20787,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -21122,8 +20808,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 3:39",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
@@ -21295,8 +20980,7 @@
                   "mounted": false,
                   "name": "enp5s0f0",
                   "rate": 0,
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": true,
@@ -21317,8 +21001,7 @@
                   "rate": 1000000000,
                   "switch": "gw-grenoble",
                   "switch_port": "BD-8810 Port 4:18",
-                  "vendor": "Intel",
-                  "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+                  "vendor": "Intel"
                 },
                 {
                   "device": "ib0",
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
index 466ecc83b292eb1d3708b66e56ebea9b68bfaa1f..47bd25ea29993292fcf72086e8999fc90bf9e707 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
@@ -60,17 +60,11 @@ nodes:
         mountable: true
         mounted: true
         bridged: true
-        rate: 1000000000
-        vendor: Intel
-        version: 82576 Gigabit Network Connection
       eth1:
         enabled: false
         mountable: false
         mounted: false
-        rate: 1000000000
         bridged: false
-        vendor: Intel
-        version: 82576 Gigabit Network Connection
       ib0:
         driver: mlx4_core
         enabled: true
@@ -79,7 +73,6 @@ nodes:
         mountable: true
         mounted: true
         rate: 40000000000
-        vendor: Mellanox
       ib1:
         driver: mlx4_core
         enabled: false
@@ -89,7 +82,6 @@ nodes:
         mounted: false
         rate: 10000000000
         version: MT26428
-        vendor: Mellanox
       bmc:
         interface: Ethernet
         rate: 100.0e+6
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
index 3ad17e197cb467f4bba5d8b231c0f105523d008e..98f84de98d107baf8642745df40ab561e1030298 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
@@ -38,30 +38,22 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
-        rate: 1000000000
         bridged: false
-        vendor: Intel
-        version: Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)
       eth1:
         enabled: true
         mountable: true
         mounted: true
-        rate: 1000000000
         bridged: true
-        vendor: Intel
-        version: Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)
       ib0:
         enabled: true
         mountable: true
         mounted: true
         rate: 20000000000
-        vendor: Mellanox
       ib1:
         enabled: false
         mountable: false
         mounted: false
         rate: 10000000000
-        vendor: Mellanox
       bmc:
         interface: Ethernet
         rate: 1.0e+9