diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
index 8d78145cc1b0d9254eb34c399ef0462db54de02b..d3a544daf60e921ec77c9797c4eb3ace9561417b 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
@@ -72,61 +72,77 @@
       "device": "eth0",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "ip": "172.16.176.10",
       "kavlan": true,
       "mac": "00:22:19:6d:85:0a",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "eno1",
       "network_address": "granduc-10.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet2/10"
+      "switch_port": "GigabitEthernet2/10",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "kavlan": true,
       "mac": "00:22:19:6d:85:0c",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": false,
+      "name": "eno2",
       "network_address": "granduc-10-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet1/33"
+      "switch_port": "GigabitEthernet1/33",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:3d",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": true,
       "mounted": false,
+      "name": "enp13s0f0",
       "network_address": "granduc-10-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/11"
+      "switch_port": "Ethernet1/11",
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:3c",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp13s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
new file mode 100644
index 0000000000000000000000000000000000000000..03c22dde1a6a58d86ce1d8e15a7df8eb4ebff88c
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
@@ -0,0 +1,214 @@
+{
+  "architecture": {
+    "nb_cores": 8,
+    "nb_procs": 2,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "10/30/2010",
+    "vendor": "Dell Inc.",
+    "version": "2.7.0"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge 1950",
+    "serial": "30W883J"
+  },
+  "gpu": {
+    "gpu": false
+  },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.193.11",
+      "kavlan-11": "10.7.212.11",
+      "kavlan-12": "10.11.212.11",
+      "kavlan-13": "10.15.212.11",
+      "kavlan-14": "10.19.212.11",
+      "kavlan-16": "10.27.212.11",
+      "kavlan-18": "10.35.212.11",
+      "kavlan-19": "10.39.212.11",
+      "kavlan-2": "192.168.209.11",
+      "kavlan-20": "10.43.212.11",
+      "kavlan-21": "10.47.212.11",
+      "kavlan-3": "192.168.225.11",
+      "kavlan-4": "10.40.1.11",
+      "kavlan-5": "10.40.65.11",
+      "kavlan-6": "10.40.129.11",
+      "kavlan-7": "10.40.193.11",
+      "kavlan-8": "10.41.1.11",
+      "kavlan-9": "10.41.65.11"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.194.11",
+      "kavlan-11": "10.7.212.33",
+      "kavlan-12": "10.11.212.33",
+      "kavlan-13": "10.15.212.33",
+      "kavlan-14": "10.19.212.33",
+      "kavlan-16": "10.27.212.33",
+      "kavlan-18": "10.35.212.33",
+      "kavlan-19": "10.39.212.33",
+      "kavlan-2": "192.168.210.11",
+      "kavlan-20": "10.43.212.33",
+      "kavlan-21": "10.47.212.33",
+      "kavlan-3": "192.168.226.11",
+      "kavlan-4": "10.40.2.11",
+      "kavlan-5": "10.40.66.11",
+      "kavlan-6": "10.40.129.11",
+      "kavlan-7": "10.40.193.11",
+      "kavlan-8": "10.41.1.11",
+      "kavlan-9": "10.41.65.11"
+    }
+  },
+  "main_memory": {
+    "ram_size": 17179869184
+  },
+  "monitoring": {
+    "wattmeter": "false"
+  },
+  "network_adapters": [
+    {
+      "bridged": true,
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
+      "interface": "Ethernet",
+      "ip": "172.16.176.11",
+      "kavlan": true,
+      "mac": "00:19:b9:f2:0f:46",
+      "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "granduc-11.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "switch_port": null,
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
+      "interface": "Ethernet",
+      "kavlan": true,
+      "mac": "00:19:b9:f2:0f:48",
+      "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
+      "mountable": true,
+      "mounted": false,
+      "name": "eno2",
+      "network_address": "granduc-11-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch_port": "Gi1/34",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth2",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0xc7390000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:1b:21:34:e1:27",
+      "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
+      "mountable": true,
+      "mounted": false,
+      "name": "enp13s0f0",
+      "network_address": "granduc-11-eth2.luxembourg.grid5000.fr",
+      "rate": 10000000000,
+      "switch_port": "Eth1/12",
+      "vendor": "Intel"
+    },
+    {
+      "bridged": false,
+      "device": "eth3",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0xc7390000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:1b:21:34:e1:26",
+      "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp13s0f1",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.176.11",
+      "kavlan": false,
+      "mac": "00:1c:23:d3:57:59",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "granduc-11-bmc.luxembourg.grid5000.fr",
+      "switch": "gw-luxembourg",
+      "switch_port": "Gi1/11"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": false,
+    "pstate_driver": "none",
+    "pstate_governor": "none",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 6409000000.0,
+    "node_flops": 44070000000.0
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 4194304,
+    "cache_l3": 0,
+    "clock_speed": 2000000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Clovertown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
+    "vendor": "Intel",
+    "version": "L5335"
+  },
+  "sensors": {
+  },
+  "storage_devices": [
+    {
+      "by_id": "node-was-not-available-to-retrieve-this-value",
+      "device": "sda",
+      "driver": "mptsas",
+      "interface": "SAS",
+      "model": "ST9146802SS",
+      "rev": "S22A",
+      "size": 146815733760,
+      "storage": "HDD",
+      "vendor": "SEAGATE"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "default",
+      "admin"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "granduc-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
index 8124f36eac8a9d17345def52619c88b5fc64ac4c..f2d4091018d53e1d99534e3ac0e24fe7f24540f5 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
@@ -81,7 +81,7 @@
       "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
-      "name": "enp4s0",
+      "name": "eno1",
       "network_address": "granduc-13.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
@@ -101,7 +101,7 @@
       "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": false,
-      "name": "enp8s0",
+      "name": "eno2",
       "network_address": "granduc-13-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
@@ -162,7 +162,6 @@
   "operating_system": {
     "cstate_driver": "none",
     "cstate_governor": "menu",
-    "cstate_max_id": null,
     "ht_enabled": false,
     "pstate_driver": "none",
     "pstate_governor": "none",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
index d47fdc50353c08ce76501b0fc7fee28c21657798..19da1bf276ff90d9921d23b84de7dc41735609ef 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
@@ -72,61 +72,77 @@
       "device": "eth0",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "ip": "172.16.176.19",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:dd",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "eno1",
       "network_address": "granduc-19.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet2/19"
+      "switch_port": "GigabitEthernet2/19",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:df",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": false,
+      "name": "eno2",
       "network_address": "granduc-19-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet2/31"
+      "switch_port": "GigabitEthernet2/31",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:9b",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": true,
       "mounted": false,
+      "name": "enp13s0f0",
       "network_address": "granduc-19-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/20"
+      "switch_port": "Ethernet1/20",
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:3d:13:9a",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp13s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
index 6e6ce47dae6192b38ed388eb4a00c074102e8cee..d434ad541b91e523ced6b0ee0320cb48ac3ac2ac 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
@@ -72,61 +72,77 @@
       "device": "eth0",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "ip": "172.16.176.7",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:6f",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "eno1",
       "network_address": "granduc-7.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet2/7"
+      "switch_port": "GigabitEthernet2/7",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
+      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
       "interface": "Ethernet",
       "kavlan": true,
       "mac": "00:19:b9:f2:0e:71",
       "management": false,
+      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": false,
+      "name": "eno2",
       "network_address": "granduc-7-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
-      "switch_port": "GigabitEthernet1/30"
+      "switch_port": "GigabitEthernet1/30",
+      "vendor": "Broadcom"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:5f",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": true,
       "mounted": false,
+      "name": "enp13s0f0",
       "network_address": "granduc-7-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/8"
+      "switch_port": "Ethernet1/8",
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0xc7390000",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:1b:21:34:e1:5e",
       "management": false,
+      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp13s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
diff --git a/grid5000-all.json b/grid5000-all.json
index b794a4c6d3d3b92f218c9349cdf4acd331e9157f..3a138ecbea45a4b9b98cde5705648d3b0e4f2beb 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -29024,61 +29024,77 @@
                   "device": "eth0",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "ip": "172.16.176.10",
                   "kavlan": true,
                   "mac": "00:22:19:6d:85:0a",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
+                  "name": "eno1",
                   "network_address": "granduc-10.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet2/10"
+                  "switch_port": "GigabitEthernet2/10",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth1",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "kavlan": true,
                   "mac": "00:22:19:6d:85:0c",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
+                  "name": "eno2",
                   "network_address": "granduc-10-eth1.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet1/33"
+                  "switch_port": "GigabitEthernet1/33",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth2",
                   "driver": "ixgbe",
                   "enabled": true,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:34:e1:3d",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": true,
                   "mounted": false,
+                  "name": "enp13s0f0",
                   "network_address": "granduc-10-eth2.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "ul-grid5000-sw02",
-                  "switch_port": "Ethernet1/11"
+                  "switch_port": "Ethernet1/11",
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
                   "device": "eth3",
                   "driver": "ixgbe",
                   "enabled": false,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:34:e1:3c",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": false,
-                  "mounted": false
+                  "mounted": false,
+                  "name": "enp13s0f1",
+                  "vendor": "Intel"
                 },
                 {
                   "device": "bmc",
@@ -29217,72 +29233,99 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
-                "wattmeter": false
+                "wattmeter": "false"
               },
-              "network_adapters": {
-                "bmc": {
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.176.11",
-                  "mac": "00:1c:23:d3:57:59",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "switch": "gw-luxembourg",
-                  "switch_port": "Gi1/11"
-                },
-                "eth0": {
+              "network_adapters": [
+                {
                   "bridged": true,
+                  "device": "eth0",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "ip": "172.16.176.11",
-                  "ip6": "fe80::219:b9ff:fef2:f46",
+                  "kavlan": true,
                   "mac": "00:19:b9:f2:0f:46",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
+                  "name": "eno1",
+                  "network_address": "granduc-11.luxembourg.grid5000.fr",
                   "rate": 1000000000,
-                  "switch_port": "Gi2/11"
+                  "switch": null,
+                  "switch_port": null,
+                  "vendor": "Broadcom"
                 },
-                "eth1": {
+                {
                   "bridged": false,
+                  "device": "eth1",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
-                  "ip": "172.16.178.11",
+                  "kavlan": true,
                   "mac": "00:19:b9:f2:0f:48",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
-                  "switch_port": "Gi1/34"
+                  "name": "eno2",
+                  "network_address": "granduc-11-eth1.luxembourg.grid5000.fr",
+                  "rate": 1000000000,
+                  "switch_port": "Gi1/34",
+                  "vendor": "Broadcom"
                 },
-                "eth2": {
+                {
                   "bridged": false,
+                  "device": "eth2",
                   "driver": "ixgbe",
                   "enabled": true,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
-                  "ip": "172.16.179.11",
-                  "ip6": "fe80::21b:21ff:fe34:e127",
                   "kavlan": false,
                   "mac": "00:1b:21:34:e1:27",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": true,
                   "mounted": false,
+                  "name": "enp13s0f0",
+                  "network_address": "granduc-11-eth2.luxembourg.grid5000.fr",
                   "rate": 10000000000,
-                  "switch_port": "Eth1/12"
+                  "switch_port": "Eth1/12",
+                  "vendor": "Intel"
                 },
-                "eth3": {
+                {
                   "bridged": false,
+                  "device": "eth3",
                   "driver": "ixgbe",
                   "enabled": false,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
+                  "kavlan": false,
                   "mac": "00:1b:21:34:e1:26",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": false,
-                  "mounted": false
+                  "mounted": false,
+                  "name": "enp13s0f1",
+                  "vendor": "Intel"
+                },
+                {
+                  "device": "bmc",
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.176.11",
+                  "kavlan": false,
+                  "mac": "00:1c:23:d3:57:59",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "network_address": "granduc-11-bmc.luxembourg.grid5000.fr",
+                  "switch": "gw-luxembourg",
+                  "switch_port": "Gi1/11"
                 }
-              },
+              ],
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -29296,6 +29339,7 @@
                 "node_flops": 44070000000.0
               },
               "processor": {
+                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 4194304,
@@ -29309,10 +29353,12 @@
                 "vendor": "Intel",
                 "version": "L5335"
               },
-              "status": "retired",
-              "storage_devices": {
-                "sda": {
+              "sensors": {
+              },
+              "storage_devices": [
+                {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
+                  "device": "sda",
                   "driver": "mptsas",
                   "interface": "SAS",
                   "model": "ST9146802SS",
@@ -29321,7 +29367,7 @@
                   "storage": "HDD",
                   "vendor": "SEAGATE"
                 }
-              },
+              ],
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -29331,7 +29377,9 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              }
+              },
+              "type": "node",
+              "uid": "granduc-11"
             },
             "granduc-12": {
               "architecture": {
@@ -29633,7 +29681,7 @@
                   "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
-                  "name": "enp4s0",
+                  "name": "eno1",
                   "network_address": "granduc-13.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
@@ -29653,7 +29701,7 @@
                   "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
-                  "name": "enp8s0",
+                  "name": "eno2",
                   "network_address": "granduc-13-eth1.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
@@ -29714,7 +29762,6 @@
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
-                "cstate_max_id": null,
                 "ht_enabled": false,
                 "pstate_driver": "none",
                 "pstate_governor": "none",
@@ -30927,61 +30974,77 @@
                   "device": "eth0",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "ip": "172.16.176.19",
                   "kavlan": true,
                   "mac": "00:19:b9:f2:0e:dd",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
+                  "name": "eno1",
                   "network_address": "granduc-19.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet2/19"
+                  "switch_port": "GigabitEthernet2/19",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth1",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "kavlan": true,
                   "mac": "00:19:b9:f2:0e:df",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
+                  "name": "eno2",
                   "network_address": "granduc-19-eth1.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet2/31"
+                  "switch_port": "GigabitEthernet2/31",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth2",
                   "driver": "ixgbe",
                   "enabled": true,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:3d:13:9b",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": true,
                   "mounted": false,
+                  "name": "enp13s0f0",
                   "network_address": "granduc-19-eth2.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "ul-grid5000-sw02",
-                  "switch_port": "Ethernet1/20"
+                  "switch_port": "Ethernet1/20",
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
                   "device": "eth3",
                   "driver": "ixgbe",
                   "enabled": false,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:3d:13:9a",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": false,
-                  "mounted": false
+                  "mounted": false,
+                  "name": "enp13s0f1",
+                  "vendor": "Intel"
                 },
                 {
                   "device": "bmc",
@@ -32864,61 +32927,77 @@
                   "device": "eth0",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "ip": "172.16.176.7",
                   "kavlan": true,
                   "mac": "00:19:b9:f2:0e:6f",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
+                  "name": "eno1",
                   "network_address": "granduc-7.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet2/7"
+                  "switch_port": "GigabitEthernet2/7",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth1",
                   "driver": "bnx2",
                   "enabled": true,
+                  "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
                   "interface": "Ethernet",
                   "kavlan": true,
                   "mac": "00:19:b9:f2:0e:71",
                   "management": false,
+                  "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
+                  "name": "eno2",
                   "network_address": "granduc-7-eth1.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
-                  "switch_port": "GigabitEthernet1/30"
+                  "switch_port": "GigabitEthernet1/30",
+                  "vendor": "Broadcom"
                 },
                 {
                   "bridged": false,
                   "device": "eth2",
                   "driver": "ixgbe",
                   "enabled": true,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:34:e1:5f",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": true,
                   "mounted": false,
+                  "name": "enp13s0f0",
                   "network_address": "granduc-7-eth2.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "ul-grid5000-sw02",
-                  "switch_port": "Ethernet1/8"
+                  "switch_port": "Ethernet1/8",
+                  "vendor": "Intel"
                 },
                 {
                   "bridged": false,
                   "device": "eth3",
                   "driver": "ixgbe",
                   "enabled": false,
+                  "firmware_version": "0xc7390000",
                   "interface": "Ethernet",
                   "kavlan": false,
                   "mac": "00:1b:21:34:e1:5e",
                   "management": false,
+                  "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
                   "mountable": false,
-                  "mounted": false
+                  "mounted": false,
+                  "name": "enp13s0f1",
+                  "vendor": "Intel"
                 },
                 {
                   "device": "bmc",
@@ -108823,6 +108902,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -108921,6 +109004,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109019,6 +109106,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109117,6 +109208,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109215,6 +109310,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109313,6 +109412,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109411,6 +109514,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109509,6 +109616,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109607,6 +109718,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109705,6 +109820,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109998,6 +110117,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110096,6 +110219,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110194,6 +110321,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110292,6 +110423,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110390,6 +110525,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110488,6 +110627,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110586,6 +110729,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110684,6 +110831,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110782,6 +110933,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110880,6 +111035,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111180,6 +111339,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111278,6 +111441,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111376,6 +111543,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111474,6 +111645,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111572,6 +111747,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111670,6 +111849,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111768,6 +111951,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111866,6 +112053,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112761,6 +112952,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112859,6 +113054,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112957,6 +113156,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113055,6 +113258,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113153,6 +113360,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113251,6 +113462,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113349,6 +113564,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113447,6 +113666,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113545,6 +113768,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113845,6 +114072,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113943,6 +114174,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114041,6 +114276,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114139,6 +114378,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114237,6 +114480,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114335,6 +114582,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114433,6 +114684,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114531,6 +114786,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114629,6 +114888,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114727,6 +114990,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115027,6 +115294,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115125,6 +115396,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115223,6 +115498,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115321,6 +115600,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115419,6 +115702,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115517,6 +115804,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115615,6 +115906,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115713,6 +116008,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115811,6 +116110,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115909,6 +116212,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116202,6 +116509,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116300,6 +116611,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116398,6 +116713,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index d7e4a707d028970986dd67171812c0ae10384821..d1ffc0304b721a728cb4be5a4afba419da05f420 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -68,5 +68,3 @@ nodes:
     monitoring:
       wattmeter: false
 
-  granduc-11:
-    status: retired
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index 07b39432d63f51e2c43af8748eac65e30a4c22d9..c7be727003c37c370cf722b66f7271940aedcfe2 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -23,28 +23,44 @@ granduc-10:
       management: true
     eth0:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       ip: 172.16.176.10
       mac: 00:22:19:6d:85:0a
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno1
       rate: 1000000000
+      vendor: Broadcom
     eth1:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       mac: 00:22:19:6d:85:0c
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno2
       rate: 1000000000
+      vendor: Broadcom
     eth2:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:34:e1:3d
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f0
       rate: 10000000000
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:34:e1:3c
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f1
+      vendor: Intel
   operating_system:
     cstate_driver: none
     cstate_governor: menu
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index 10503d66c5acb3b9b513d8674bc9ef31df8d0328..a3f8557b4952e608ca658110a4a9703d82ed89c9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -20,44 +20,47 @@ granduc-11:
     bmc:
       ip: 172.17.176.11
       mac: 00:1c:23:d3:57:59
+      management: true
     eth0:
       driver: bnx2
-      enabled: true
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       ip: 172.16.176.11
-      ip6: fe80::219:b9ff:fef2:f46
       mac: 00:19:b9:f2:0f:46
       management: false
-      mountable: true
-      mounted: true
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno1
       rate: 1000000000
+      vendor: Broadcom
     eth1:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
-      ip: 172.16.178.11
       mac: 00:19:b9:f2:0f:48
       management: false
-      mountable: true
-      mounted: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno2
+      rate: 1000000000
+      vendor: Broadcom
     eth2:
       driver: ixgbe
-      enabled: true
+      firmware_version: '0xc7390000'
       interface: Ethernet
-      ip: 172.16.179.11
-      ip6: fe80::21b:21ff:fe34:e127
       mac: 00:1b:21:34:e1:27
       management: false
-      mountable: true
-      mounted: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f0
       rate: 10000000000
+      vendor: Intel
     eth3:
       driver: ixgbe
-      enabled: false
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:34:e1:26
       management: false
-      mountable: false
-      mounted: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f1
+      vendor: Intel
   operating_system:
     cstate_driver: none
     cstate_governor: menu
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index 179df388801bbde8e428d1c41d86a3d2408413a8..de8082f84d8bf4449613c85a477219d4d189420f 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -29,7 +29,7 @@ granduc-13:
       mac: 00:19:b9:f2:0e:56
       management: false
       model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: enp4s0
+      name: eno1
       rate: 1000000000
       vendor: Broadcom
     eth1:
@@ -39,7 +39,7 @@ granduc-13:
       mac: 00:19:b9:f2:0e:58
       management: false
       model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: enp8s0
+      name: eno2
       rate: 1000000000
       vendor: Broadcom
     eth2:
@@ -64,7 +64,6 @@ granduc-13:
   operating_system:
     cstate_driver: none
     cstate_governor: menu
-    cstate_max_id: 
     ht_enabled: false
     pstate_driver: none
     pstate_governor: none
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index ce8520d94291e6e7dff2e37f79058e7780ab5763..41f9020835b2d1ab5b05a1a57511b4c67812064c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -23,28 +23,44 @@ granduc-19:
       management: true
     eth0:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       ip: 172.16.176.19
       mac: 00:19:b9:f2:0e:dd
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno1
       rate: 1000000000
+      vendor: Broadcom
     eth1:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       mac: 00:19:b9:f2:0e:df
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno2
       rate: 1000000000
+      vendor: Broadcom
     eth2:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:3d:13:9b
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f0
       rate: 10000000000
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:3d:13:9a
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f1
+      vendor: Intel
   operating_system:
     cstate_driver: none
     cstate_governor: menu
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index d1459eba96a3d81fe4d581e3b814330bd6e00d30..eafc393d75d92f823621f8dfa8fa96f46977aff5 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -23,28 +23,44 @@ granduc-7:
       management: true
     eth0:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       ip: 172.16.176.7
       mac: 00:19:b9:f2:0e:6f
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno1
       rate: 1000000000
+      vendor: Broadcom
     eth1:
       driver: bnx2
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
       interface: Ethernet
       mac: 00:19:b9:f2:0e:71
       management: false
+      model: NetXtreme II BCM5708 Gigabit Ethernet
+      name: eno2
       rate: 1000000000
+      vendor: Broadcom
     eth2:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:34:e1:5f
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f0
       rate: 10000000000
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0xc7390000'
       interface: Ethernet
       mac: 00:1b:21:34:e1:5e
       management: false
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
+      name: enp13s0f1
+      vendor: Intel
   operating_system:
     cstate_driver: none
     cstate_governor: menu