diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 40ecbd2889b521c5e456c202efd8382031522553..6f2b525bc7c965677b7dd34758cf9bbf72b6b553 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -355,6 +355,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 72,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 192GB RAM, 223GB SSD, 447GB SSD, 3726GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": "201800",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
index f2554a13133777de378d687913d2d1e88f0d625b..668f2793b3e76315f6800163913ee87182aeb31e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/drac.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -919,6 +919,8 @@
     }
   ],
   "model": "IBM PowerNV S822LC (8335-GTB)",
+  "nodes_count": 12,
+  "nodes_description": "2 CPUs POWER8NVL 1.0, 10 cores/CPU, 4 GPUs Tesla P100-SXM2-16GB, 128GB RAM, 2x931GB HDD, 1 x 10Gb Ethernet, 2 x 100Gb InfiniBand",
   "priority": 201710,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
index 5f278e35ace0adf4b0196f878f23cd5c08e89a6b..d403c79524f1b4622c874a13bd161fc910f10287 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "HPE Proliant DL380 Gen11",
+  "nodes_count": 6,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6442Y, 24 cores/CPU, 2 GPUs L40S, 256GB RAM, 1787GB SSD, 2 x 25Gb Ethernet, 1 x 100Gb Ethernet",
   "priority": 202506,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/nessie/nessie.json b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
index 473bec418756c86f2b2eea617fd6db1b9b481dc7..0bd07b7d4620eaaeb1bac52a87d8ead7405af407 100644
--- a/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
+++ b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "HPE ProLiant DL385 Gen10+ v2",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6430, 32 cores/CPU, 64GB RAM, 1788GB SSD, 447GB SSD, 1 x 25Gb Ethernet",
   "priority": 202408,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/servan/servan.json b/data/grid5000/sites/grenoble/clusters/servan/servan.json
index 4d58cb493f681a5d51986fe12d976f10df687873..f39dc148d376297b4ea2250154c32017d4e83300 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/servan.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/servan.json
@@ -525,6 +525,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 128GB RAM, 2x1490GB SSD, 1 x 25Gb Ethernet, 2 x 100Gb FPGA/Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index ae4d02ae8fc3ffe29d009a12ed3d0ea851425ded..98f66806953c9258eae4df54bbcd28c596a4192f 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -452,6 +452,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5218, 16 cores/CPU, 384GB RAM, 1536GB PMEM, 447GB SSD, 1490GB SSD, 1 x 25Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index b20bea9a41040240b58c7024388561319108b904..7e9a0d3871828246f8c1577f2bb2790f80467244 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -403,6 +403,8 @@
     }
   ],
   "model": "Dell PowerEdge R940",
+  "nodes_count": 4,
+  "nodes_description": "4 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 768GB RAM, 447GB SSD, 2x1490GB SSD, 3x1863GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201712,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 3a8cc84d3af2b346b28d134e169e46597328a7db..feb61b3ed0387c2beb61c92b6f20be70e407c487 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -428,6 +428,8 @@
     }
   ],
   "model": "Dell PowerEdge R7425",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs AMD EPYC 7301, 16 cores/CPU, 128GB RAM, 447GB SSD, 2x3726GB HDD, 2 x 25Gb Ethernet",
   "priority": "201850",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index 3648385869c3ed99bb0c4ce729822cdd64e27a35..c0a0659558c02c86a04ac6a9e5a4cc425fd1bf96 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -547,6 +547,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6126, 12 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 192GB RAM, 2x447GB SSD, 4x3726GB HDD, 2 x 25Gb Ethernet",
   "priority": "201870",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chirop/chirop.json b/data/grid5000/sites/lille/clusters/chirop/chirop.json
index cb21f3b8e8428b254f4ea1fbebdcbf0187d7639e..2a03bb2c59fc78e928c085ede7e68da8904c8952 100644
--- a/data/grid5000/sites/lille/clusters/chirop/chirop.json
+++ b/data/grid5000/sites/lille/clusters/chirop/chirop.json
@@ -757,6 +757,8 @@
     }
   ],
   "model": "DL360 Gen10+",
+  "nodes_count": 5,
+  "nodes_description": "2 CPUs Intel Xeon Platinum 8358, 32 cores/CPU, 512GB RAM, 1788GB SSD, 2x3576GB SSD, 2 x 25Gb Ethernet",
   "priority": 202305,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chuc/chuc.json b/data/grid5000/sites/lille/clusters/chuc/chuc.json
index 789ba1c22cd931ee1bbf20e33bb3260aa98c6d24..9e7205b4a9e746276487ad4fda82c018d7035663 100644
--- a/data/grid5000/sites/lille/clusters/chuc/chuc.json
+++ b/data/grid5000/sites/lille/clusters/chuc/chuc.json
@@ -1571,6 +1571,8 @@
     }
   ],
   "model": "Apollo 6500 Gen10 Plus",
+  "nodes_count": 8,
+  "nodes_description": "1 CPU AMD EPYC 7513, 32 cores/CPU, 4 GPUs A100-SXM4-40GB, 512GB RAM, 4x1788GB SSD, 2 x 25Gb Ethernet",
   "priority": 202405,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/louvain/clusters/spirou/spirou.json b/data/grid5000/sites/louvain/clusters/spirou/spirou.json
index 595cc87f04b626442d33bfba2f1a53aca97309a4..86647da74928aca17d7f0e0f706c1ba9eed53a92 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/spirou.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/spirou.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "ThinkSystem SR630 V2",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5318Y, 24 cores/CPU, 256GB RAM, 447GB SSD, 3726GB HDD, 1 x 100Gb Ethernet",
   "priority": 202401,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index deffb5cb7430ae935af09b3529cb787386479a08..c123832a7ee10ad4011c62655872e87fbc63e842 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -330,6 +330,8 @@
     }
   ],
   "model": "Dell PowerEdge M620",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630L, 6 cores/CPU, 32GB RAM, 232GB HDD, 2 x 10Gb Ethernet",
   "priority": 201210,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index f6cf392173770f474cf473ad308c679df7163e5a..82b0258815bc1b1234a06b22273452a4fa671575 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -1092,6 +1092,8 @@
     }
   ],
   "model": "Nvidia DGX-1",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2698 v4, 20 cores/CPU, 8 GPUs Tesla V100-SXM2-32GB, 512GB RAM, 447GB SSD, 4x1788GB SSD, 1 x 10Gb Ethernet",
   "priority": 202006,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index afe8287cd30ccaec695f0174690ccc179efa5471..0c9328d77f8612f9bac15262977bae2c323e0c23 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -140,6 +140,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620, 6 cores/CPU, 32GB RAM, 3x1863GB HDD, 1 x 10Gb Ethernet",
   "priority": "201299",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/hydra/hydra.json b/data/grid5000/sites/lyon/clusters/hydra/hydra.json
index 21f842ce3422c0cd8471455fa9b5d1797208bb91..f03ae1a5cacc37451b1016796430eecb4428bb8f 100644
--- a/data/grid5000/sites/lyon/clusters/hydra/hydra.json
+++ b/data/grid5000/sites/lyon/clusters/hydra/hydra.json
@@ -221,6 +221,8 @@
     }
   ],
   "model": "NVIDIA Grace Hopper",
+  "nodes_count": 4,
+  "nodes_description": "1 CPU Grace A02  CPU Unknown, 72 cores/CPU, 480GB RAM, 894GB SSD, 1788GB SSD, 1 x 10Gb Ethernet",
   "priority": 202402,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lyon/clusters/neowise/neowise.json b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
index a886bd9bcbbf0a6367e70ffd497c79e6a05cd9a3..aecc8f0b0c5ff684809e1f23d3243b13414ac3a5 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/neowise.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
@@ -1246,6 +1246,8 @@
     }
   ],
   "model": "AMD-Penguin Computing",
+  "nodes_count": 10,
+  "nodes_description": "1 CPU AMD EPYC 7642, 48 cores/CPU, 8 GPUs Radeon Instinct MI50 32GB, 512GB RAM, 1788GB SSD, 2 x 10Gb Ethernet, 2 x 100Gb InfiniBand",
   "priority": 202205,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index ef560f12d334d3a90f8b46ab61626f0664d57ec6..bb23ef335f765a180c6e701536b9feba9c7d2080 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -317,6 +317,8 @@
     }
   ],
   "model": "Dell PowerEdge R430",
+  "nodes_count": 23,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 64GB RAM, 557GB HDD, 1 x 10Gb Ethernet",
   "priority": "201700",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index ac92818f546ffe8675c471d436e55ef4ff7be77e..c8467d3049244f3c31e6da5b5e2a76bed3e42456 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -322,6 +322,8 @@
     }
   ],
   "model": "Dell PowerEdge R720",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630, 6 cores/CPU, 1 GPU Tesla M2075, 32GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": "201299",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index 8ef5c3ee6f2d590b06891e6baad29ba8c4886ff6..c7802c7e074a2a915af198beb37c65a344ac1ce5 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -999,6 +999,8 @@
     }
   ],
   "model": "Gigabyte R181-T92-00",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs ThunderX2 99xx, 32 cores/CPU, 256GB RAM, 2x232GB SSD, 1 x 10Gb Ethernet",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index 2b3632facbfc64acaff39fb93956662839b4fdd9..dc1c2a5b744af9fdf27479ab5ad08559c85d75db 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -148,6 +148,8 @@
     }
   ],
   "model": "Sun Fire V20z",
+  "nodes_count": 79,
+  "nodes_description": "2 CPUs AMD Opteron 250, 1 core/CPU, 2GB RAM, 68GB HDD, 1 x 1Gb Ethernet",
   "priority": "301899",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/sirius/sirius.json b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
index e13e9a0b0b66064e94e8583397c17a91e57d4ce6..c678b698529663fd92138c01dfe9d02b26d39622 100644
--- a/data/grid5000/sites/lyon/clusters/sirius/sirius.json
+++ b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
@@ -1900,6 +1900,8 @@
     }
   ],
   "model": "NVidia DGX A100",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7742, 64 cores/CPU, 8 GPUs A100-SXM4-40GB, 1024GB RAM, 2x1788GB SSD, 4x3576GB SSD, 1 x 100Gb Ethernet",
   "priority": 202211,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index 8ab2157b3f77c0ec745052bbedd7ad363caec10b..b847f3a3fce178c1456ab81f7bd00aa9ad3d7eb7 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -322,6 +322,8 @@
     }
   ],
   "model": "Dell PowerEdge R720",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630, 6 cores/CPU, 32GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": 201207,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index ebdd661cc70c09a1b3a7cf17088ac4114ac6a1a9..d15b611375d3e7ed1bcad24ed798da55523646e0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -382,6 +382,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 13,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4110, 8 cores/CPU, 4 GPUs GeForce RTX 2080 Ti, 128GB RAM, 446GB HDD, 1 x 10Gb Ethernet",
   "priority": 202005,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index dfca691a04856c0c46976eddeeeb9ada4cb4b0df..29ede9ee472bbf455ca0708430d932acef2c416e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -470,6 +470,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5218R, 20 cores/CPU, 96GB RAM, 447GB SSD, 7452GB HDD, 1 x 25Gb Ethernet",
   "priority": 202007,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grat/grat.json b/data/grid5000/sites/nancy/clusters/grat/grat.json
index c25c1e0f89b9665b1f9e05508ccfd634459c5fbe..a476ba93a5deea7e9a3aea0226e184f1a8fcf427 100644
--- a/data/grid5000/sites/nancy/clusters/grat/grat.json
+++ b/data/grid5000/sites/nancy/clusters/grat/grat.json
@@ -2017,6 +2017,8 @@
     }
   ],
   "model": "HPE Apollo 6500",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7513, 32 cores/CPU, 8 GPUs A100-SXM4-40GB, 512GB RAM, 8x3576GB SSD, 1 x 25Gb Ethernet",
   "priority": 202306,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
index 757d90ee93b02f9c2ee9ac8b85506f5eedf7828b..6f0d164166cc2c1fab3acea0209d2f36f9ffa6da 100644
--- a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
+++ b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
@@ -367,6 +367,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 1 GPU Tesla V100-PCIE-16GB, 128GB RAM, 2x278GB HDD, 1 x 10Gb Ethernet",
   "priority": 201806,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grdix/grdix.json b/data/grid5000/sites/nancy/clusters/grdix/grdix.json
index 4956055a03d985cb3ceab79e027bdb10c28da1c6..9fa67c1f4a0ac2477457d95a4a068367d280b6bf 100644
--- a/data/grid5000/sites/nancy/clusters/grdix/grdix.json
+++ b/data/grid5000/sites/nancy/clusters/grdix/grdix.json
@@ -332,6 +332,8 @@
     }
   ],
   "model": "ProLiant DL365 Gen11",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs AMD EPYC 9754, 128 cores/CPU, 1024GB RAM, 1490GB SSD, 1 x 25Gb Ethernet, 1 x 200Gb InfiniBand",
   "priority": 202409,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 68441f2e693c059132a02d5a54cd9ae82fc4d834..3da17dfaa829a97fb00412b4eb8bfac3eeb62307 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -367,6 +367,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 14,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 2 GPUs GeForce GTX 1080 Ti, 128GB RAM, 2x278GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201806,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gres/gres.json b/data/grid5000/sites/nancy/clusters/gres/gres.json
index 3c20b1145444ea9d010102868558178a5682b387..32e041c8aae78a5d486f2e675e3b64692416dceb 100644
--- a/data/grid5000/sites/nancy/clusters/gres/gres.json
+++ b/data/grid5000/sites/nancy/clusters/gres/gres.json
@@ -1201,6 +1201,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 7,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 2 GPUs L40S, 512GB RAM, 5961GB SSD, 1 x 25Gb Ethernet",
   "priority": 202508,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 5677c1dff04ff57460ad5e86b12f90f76c0ed8d4..88446b3d452edd38b77fc24aa221cf98babbefdd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -494,6 +494,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 124,
+  "nodes_description": "1 CPU Intel Xeon Gold 5220, 18 cores/CPU, 96GB RAM, 447GB SSD, 894GB SSD, 2 x 25Gb Ethernet",
   "priority": 201907,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json b/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
index 8424d68ee755e207abf89bb7075e94627eb3696d..3ad46287f721a7411e615be11fbfbc33fad791f2 100644
--- a/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
+++ b/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
@@ -699,6 +699,8 @@
     }
   ],
   "model": "Proliant DL560 Gen10",
+  "nodes_count": 1,
+  "nodes_description": "4 CPUs Intel Xeon Gold 6240L, 18 cores/CPU, 6144GB RAM, 8x1490GB SSD, 1 x 25Gb Ethernet",
   "priority": 202311,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
index 888a213e561bf1d6fc8113755569fd60c3f61b09..29ab960240d00c99c592adf6e3423e14a9dbc0cf 100644
--- a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
+++ b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
@@ -407,6 +407,8 @@
     }
   ],
   "model": "Dell PowerEdge R930",
+  "nodes_count": 1,
+  "nodes_description": "4 CPUs Intel Xeon E7-4850 v3, 14 cores/CPU, 1536GB RAM, 1117GB HDD, 3724GB HDD, 558GB HDD, 1 x 10Gb Ethernet",
   "priority": 201510,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grouille/grouille.json b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
index ed93f0fa3410e8bff6ba90e3c326694540cf604c..1561166e264ee287b8110151b43cc821c39eb77f 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/grouille.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
@@ -395,6 +395,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs AMD EPYC 7452, 32 cores/CPU, 2 GPUs A100-PCIE-40GB, 128GB RAM, 1788GB SSD, 894GB SSD, 1 x 25Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 9914e75d2b232cd59ae2172e1b5918a52e1d200c..4eef69b2373f111a71822e3a59be8484f03f2000 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -423,6 +423,8 @@
     }
   ],
   "model": "Dell PowerEdge R7425",
+  "nodes_count": 5,
+  "nodes_description": "2 CPUs AMD EPYC 7351, 16 cores/CPU, 4 GPUs Tesla T4, 128GB RAM, 446GB HDD, 1 x 10Gb Ethernet",
   "priority": 202011,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/nancy/clusters/gruss/gruss.json b/data/grid5000/sites/nancy/clusters/gruss/gruss.json
index e986f1e861b276de8776e366e7027103fde9adcc..59fb1bc4f75a0c4cc9817c0f24c66c22508f40c8 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/gruss.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/gruss.json
@@ -395,6 +395,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 2 GPUs A40, 256GB RAM, 1788GB SSD, 1 x 25Gb Ethernet",
   "priority": 202206,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 000200ab1d63cb7bf7150e69a7ce7fc52322a9f2..5a5697aa15137b23c5a2ac7fd1240abd894a9285 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -355,6 +355,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 64,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 192GB RAM, 931GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": "201701",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index dd13522b97d4c4cf6f2f15b018e07385e37d2a0a..b8e8af2d1c0b8687e135ca6e0c926e7fdfd4fd5d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -357,6 +357,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 22,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 64GB RAM, 1863GB HDD, 1 x 10Gb Ethernet",
   "priority": 201206,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index bfc06856d3984bfb406e6d8fadb725edc1488fc9..a290777fe6dd2b16992ddee3e0a3deca93a2c67b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -916,6 +916,8 @@
     }
   ],
   "model": "Dell PowerEdge R630",
+  "nodes_count": 48,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630L v4, 10 cores/CPU, 128GB RAM, 372GB SSD, 1 x 10Gb Ethernet",
   "priority": 201707,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
index b982cc4fde64bf9b4755759a55be3520c665c291..03ed4a2be37f86d8b1c105f5a601b188abbeab5f 100644
--- a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 128GB RAM, 278GB HDD, 1 x 1Gb Ethernet",
   "priority": 201707,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json b/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
index 1267b1346195cc1f59440c1751d23632313480e2..55a97a4d30ffb915380911d527b758c49be16352 100644
--- a/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
+++ b/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 4 GPUs RTX A5000, 192GB RAM, 893GB HDD, 278GB HDD, 5587GB HDD, 1 x 1Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json b/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
index f1a3ada449f1e1513614362da8d2f7c4b233caac..0a3527b557e414be1dd4135b88ed6cef61f5ecc6 100644
--- a/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
+++ b/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 2 GPUs RTX A5000, 192GB RAM, 278GB HDD, 893GB HDD, 7450GB HDD, 1 x 1Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json b/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
index f5050955ddb35028bf4470a92fbc3dd41933fd07..87fd40de09bde714a20315f5ba50018f8cabc37c 100644
--- a/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
+++ b/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6248, 20 cores/CPU, 3 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": 202010,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json b/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
index c1efb3a359ac5fff0a6d1fcf5f21624382018f31..925c500a13088994efe9e73983e7dc3bc53842ae 100644
--- a/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
+++ b/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4214, 12 cores/CPU, 4 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 2x223GB SSD, 1 x 10Gb Ethernet",
   "priority": 202009,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
index fc5e169528bd0453abdbf260f8c82500e3bce3d1..c0aac9f50e40be09c439927a90cb928f00e48413 100644
--- a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
+++ b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
@@ -409,6 +409,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4214, 12 cores/CPU, 4 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 223GB HDD, 1 x 10Gb Ethernet",
   "priority": 202009,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json b/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
index 0aeaa0b5449f58a836db391bc5d18e4f08320aad..3db929663102c966906876531f7d3bf3bd6718d3 100644
--- a/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
+++ b/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7282, 16 cores/CPU, 2 GPUs Quadro RTX 6000, 256GB RAM, 223GB SSD, 894GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
index 6c3211dd72dbf97f50db9dd0a454682a0081ccdd..515c8b06821214179707e496bf4daf50f6768861 100644
--- a/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
+++ b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 3 GPUs Quadro RTX 6000, 256GB RAM, 223GB SSD, 894GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json b/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
index f94e91d7ebf771869081afab31249a3e556ea0ca..31ffcde813f71b465ce88c99f3626f9c65335a76 100644
--- a/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
+++ b/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220R, 24 cores/CPU, 2 GPUs Quadro RTX 8000, 384GB RAM, 894GB SSD, 223GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json b/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
index ad2b2da21ab319028b75df9079efdff341262289..321f3a22d67c6b15542cd6f9b1f127a109ca74e4 100644
--- a/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
+++ b/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2609 v4, 8 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 64GB RAM, 278GB HDD, 1 x 1Gb Ethernet",
   "priority": 201808,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json b/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
index 9b7b1beba1961c99f8eda7d0e2e66fbcdc351285..bbd5cb7930298aa4b6a07f04041a246dfc73baf6 100644
--- a/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
+++ b/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220R, 24 cores/CPU, 4 GPUs Quadro RTX 8000, 768GB RAM, 447GB SSD, 1788GB SSD, 1 x 1Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json b/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
index c85b60bff4e9a0cd5776cf7c2a7653abc44dd956..7c8512854146f144791e0c549e66398957eed064 100644
--- a/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
+++ b/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7F72, 24 cores/CPU, 3 GPUs A100-PCIE-40GB, 512GB RAM, 3576GB SSD, 2x446GB SSD, 1 x 1Gb Ethernet",
   "priority": 202208,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json b/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
index dacb0861ed68aa3f587e816367045120d323a1f2..22d1463b4f4026a1bd74ff0899c17b0156778e68 100644
--- a/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
+++ b/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen10 Plus v2",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs AMD EPYC 7413, 24 cores/CPU, 3 GPUs A40, 512GB RAM, 1788GB SSD, 894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202301,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json b/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
index 2042dfcad9965a457da00802f397ebff9a866609..75c7f5859dfe6e4d54d26d42cb985b11ddf6bb2a 100644
--- a/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
+++ b/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
@@ -877,6 +877,8 @@
     }
   ],
   "model": "HPE ProLiant DL385 Gen10+ v2",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs AMD EPYC 7413, 24 cores/CPU, 3 GPUs A40, 512GB RAM, 3x894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202310,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json b/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
index c15ac38c34bd39d1941d2a193299a6cd02516ae8..52c6cc47176f73ed73026a49bac317520e9b076e 100644
--- a/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
+++ b/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "HPE ProLiant DL380 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6442Y, 24 cores/CPU, 2 GPUs L40S, 256GB RAM, 1490GB SSD, 1 x 10Gb Ethernet",
   "priority": 202510,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json b/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
index 8a0aa1376caefc590f04b1c8a4d8881962f9cf44..17086c8d584208fae88b60593114757990f56edd 100644
--- a/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
+++ b/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 3 GPUs H100 NVL, 512GB RAM, 5961GB SSD, 1 x 10Gb Ethernet",
   "priority": 202511,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
index 674f7387594bc088507731e30e75c4519ff0e80e..4fcd84577f5232926050e8f6667db089e2fa1514 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4216, 16 cores/CPU, 4 GPUs Tesla V100-SXM2-32GB, 384GB RAM, 447GB SSD, 1 x 10Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json b/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
index 696de79cecc90c688f7096b86ec4931d45c03e70..068cf0903cd74c6d3fc73c6d1152918a6223d537 100644
--- a/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
+++ b/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 4 GPUs RTX A5000, 128GB RAM, 278GB HDD, 893GB HDD, 7451GB HDD, 1 x 1Gb Ethernet",
   "priority": 201807,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json b/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
index 134470948b1060885a1c868231628eb985ed9d7d..283e15fcd37d62cf322aac9ccef1c0c588f2b103 100644
--- a/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
+++ b/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 2 GPUs A40, 128GB RAM, 893GB HDD, 1 x 1Gb Ethernet",
   "priority": 201811,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json b/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
index 7a77b4e6848182097185f2151c79a1d01be36be9..de4a20894088983711a89b3fcfacd75ceda41cc0 100644
--- a/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
+++ b/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5115, 10 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 192GB RAM, 1116GB HDD, 1 x 1Gb Ethernet",
   "priority": 201905,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json b/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
index 65cdd1845a5927860c4997da7b4c2dc77fa92780..59d4574aa4267bbfbb7e147e7b3bd70dd8cc94b7 100644
--- a/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
+++ b/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7920",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5120, 14 cores/CPU, 2 GPUs Quadro P6000, 192GB RAM, 2x476GB SSD, 1 x 1Gb Ethernet",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
index 31a658183d00be7fc81a8c7d11b18a1dcb519a41..9a1ca8ac31dd027f0ed0e4430327ffc57669a0b0 100644
--- a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
+++ b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 4 GPUs Tesla V100-SXM2-32GB, 192GB RAM, 223GB HDD, 1 x 10Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
index 0eec19ca07e6c4d89f1b27478fdbd94c784d5d50..abdedad0a59c892c34feb2b392aaea80c2b70a4b 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
@@ -653,6 +653,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 32,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5320, 26 cores/CPU, 384GB RAM, 2x1788GB SSD, 1 x 25Gb Ethernet",
   "priority": 202305,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 603137c7c29d86fbcce8c773331288bdfa73912c..93aa37e26f4069ac48036f890cad60debee849e9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -538,6 +538,8 @@
     }
   ],
   "model": "Dell PowerEdge R630",
+  "nodes_count": 28,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v3, 8 cores/CPU, 128GB RAM, 5x558GB HDD, 186GB SSD, 2 x 10Gb Ethernet",
   "priority": 201501,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json b/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
index 294033c472482f62e3b9fd47eef4034cb1245375..1fcaa4dadde839dd50ad791ff2b67eb85bc1b74a 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6154, 18 cores/CPU, 384GB RAM, 744GB HDD, 1 x 1Gb Ethernet",
   "priority": 201809,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json b/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
index c3a7693d6bb29425cb67853724836bf46da8e8a2..73b0ca9bae180f9dcc1b5780593062bfacecc4b0 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge MX740c",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220, 18 cores/CPU, 384GB RAM, 223GB HDD, 1787GB HDD, 1 x 10Gb Ethernet",
   "priority": 201909,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json b/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
index 09fd389dd05396f48e52ceb363a9f34258d15477..571c6a257dde199028395820098509d99361c940 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 64GB RAM, 556GB HDD, 1 x 1Gb Ethernet",
   "priority": 201209,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json b/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
index 70763dab4fbd9e34dad612c17871bd9c240b29a8..7451fde88f5a3aae1d02979cdbe59d47aeeab5ed 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 128GB RAM, 556GB HDD, 1 x 1Gb Ethernet",
   "priority": 201209,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json b/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
index 4bec9ac448553d43ec4b6bacd76e6eda0ade7071..a337b6205472ad7a66405f67413bdd1bd8690c92 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6254, 18 cores/CPU, 384GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201909,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json b/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
index 36525b287775d85ad7e93a4ee3ef0de928356228..0ccab51d315034c8d7affac5d7d4ab848a91b5ac 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5120, 14 cores/CPU, 256GB RAM, 744GB HDD, 14GB HDD, 1 x 1Gb Ethernet",
   "priority": 201810,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json b/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
index 6c5411635f9bdbad192beb0721a093ed9194500f..219ed3dd393f02f847c02e28869f5ed6e3fc56fb 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6142, 16 cores/CPU, 1024GB RAM, 2x1489GB SSD, 1 x 10Gb Ethernet",
   "priority": 201811,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json b/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
index 8c5a850561fca209f1c16e0966697f99c79baa40..9bdcb973f8ad93bf6e7e3a7ad15e6d3032bf34d5 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
@@ -252,6 +252,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7H12, 64 cores/CPU, 512GB RAM, 447GB HDD, 1863GB HDD, 1 x 1Gb Ethernet",
   "priority": 202012,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json b/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
index dfd706fc070ae6f615fa41cd7a3ff810682a2fe8..1241a730f9b5ef103c6c391827098d7299ec2d72 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge M630",
+  "nodes_count": 12,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660 v3, 10 cores/CPU, 128GB RAM, 557GB HDD, 1 x 1Gb Ethernet",
   "priority": 201504,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json b/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
index 87bd7bf92f366ffcb1d95e224097901dbda5517d..ae278660a74214ffabff2b28f3cea387d47be595 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge M630",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 192GB RAM, 1116GB HDD, 1 x 1Gb Ethernet",
   "priority": 201710,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json b/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
index cbfd60592d0f16c51fb17c99dec3d97dfe5a4424..7bd5e1b0c2c8b3c3cf3741075d669663d2f4b34b 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 128GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201706,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json b/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
index bdb9931f560f863ad9ecbbf60f4b4a806a463458..e968d5577e6f53826a5fbd46bfbe01fc90b41c84 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 256GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201706,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json b/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
index 23e76ff0c80e2b86d4c2b92a749e33e0879fc145..8cc991fbd65c33c132407a1623494bb66664f0ce 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5118, 12 cores/CPU, 512GB RAM, 1116GB HDD, 1 x 10Gb Ethernet",
   "priority": 201712,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json b/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
index 6c2db797ed505906f80116366fc2e17445b284a4..5ec7cc537a7135d39bf19060d05f4fb9c6c5f8d4 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "Dell T630",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX 1080 Ti, 128GB RAM, 1490GB SSD, 2x558GB HDD, 1 x 1Gb Ethernet, 1 x 56Gb InfiniBand",
   "priority": 201811,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
index 7a4405e86e97a62f613d052ef2459067d7ba58b5..fbbf8fcd8036113619273f0d6330ff2b1b81353c 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "DL380 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6426Y, 16 cores/CPU, 2 GPUs L40, 512GB RAM, 446GB SSD, 2681GB SSD, 1 x 1Gb Ethernet, 1 x 56Gb InfiniBand",
   "priority": 202503,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
index eb8e730dcb3754571fe2aa757a2ca847cac3e70d..c78ea4d1f325fb97e9bbf2d6f5b6058475f469c9 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220 II",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v2, 8 cores/CPU, 256GB RAM, 931GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 201509,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/musa/musa.json b/data/grid5000/sites/sophia/clusters/musa/musa.json
index c6165e565f48c2d0a01c0372cc5c7f235c618521..f9df1c0ce13aede7121c2eab78ab34b5dcfd2f82 100644
--- a/data/grid5000/sites/sophia/clusters/musa/musa.json
+++ b/data/grid5000/sites/sophia/clusters/musa/musa.json
@@ -1113,6 +1113,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 6,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 2 GPUs H100 NVL, 512GB RAM, 5961GB SSD, 1 x 25Gb Ethernet",
   "priority": 202512,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index 171094abfdc5b1dc6eda7ca91a6e924e3136a343..74c345a739b90a75db48a0839abbe496ee0b2a6e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -51,6 +51,8 @@
     }
   ],
   "model": "Dell PowerEdge C6100",
+  "nodes_count": 44,
+  "nodes_description": "2 CPUs Intel Xeon X5670, 6 cores/CPU, 96GB RAM, 232GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 201101,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
index 410f5a13f53a6e47a30c0d056012e76af9dd7164..746370ed4b4fce712e6b2d795a73616c5c54ef11 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
@@ -501,6 +501,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 10,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 512GB RAM, 894GB SSD, 3x2235GB HDD, 2 x 25Gb Ethernet",
   "priority": 202212,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/toulouse/clusters/estats/estats.json b/data/grid5000/sites/toulouse/clusters/estats/estats.json
index 9cca6ee1a1ddc2de19c541e358b6654222ea0d35..20fad92a2d0c9aa2f2158c59e82961990a66c83c 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/estats.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/estats.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "Connecttech/Nvidia Jetson AGX Xavier",
+  "nodes_count": 12,
+  "nodes_description": "1 CPU Carmel Unknown, 8 cores/CPU, 1 GPU AGX Xavier, 32GB RAM, 1863GB SSD, 1 x 1Gb Ethernet",
   "priority": 202312,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
index 92e475cf9d97d290de4848ab2ad3ff40d81bf1b5..b9d089ae74c71bf261acf3fcc22f76ef4e58fe02 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -787,6 +787,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 10,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 256GB RAM, 894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202211,
   "queues": [
     "default",
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 242b92695e8c3b0d523cc31c12b6ac0eee64b2c8..52b4077495ca5ae8b4d22aa02725cfce6118130c 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -15,6 +15,52 @@ def create_network_equipment(network_uid, network, refapi_path, site_uid = nil)
   write_json(network_path.join("#{network_uid}.json"), network)
 end
 
+def gen_node_description(node)
+  nb_cpu        = node['architecture']['nb_procs'].to_i
+  core_per_cpu  = node['architecture']['nb_cores'].to_i / nb_cpu
+  ram           = (node['main_memory']['ram_size'].to_i.to_f / (1024**3).to_f).round
+  pmem          = (node['main_memory']['pmem_size'].to_i.to_f / (1024**3).to_f).round if node['main_memory']['pmem_size']
+  proc_model    = node['processor']['model']
+  proc_version  = node['processor']['version']
+  if node.key?('gpu_devices')
+    nb_gpu       = node['gpu_devices'].length
+    gpu_model    = node['gpu_devices'].first[1]['model']
+  end
+  na            = {}
+  net_int       = node['network_adapters']
+  net_int.select {
+    |int| int['mountable']
+  }.each { |i|
+    if na.key?((i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface'])
+      na[(i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface']] += 1
+    else
+      na[(i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface']] = 1
+    end
+  }
+  storages = {}
+  node['storage_devices'].each do |device|
+    unless device['storage'].nil?
+      storages[device['storage']].nil? ? storages[device['storage']] = [(device['size'].to_i / 1024**3).round] : storages[device['storage']] += [(device['size'].to_i / 1024**3).round]
+    end
+  end # each storage
+  cluster_storages = ''
+  storages.each do |t, s|
+    sizes = Hash.new(0)
+    s.each { |v| sizes.store(v, sizes[v]+1) }
+    sizes.each do |size, nb|
+      if nb > 1
+        cluster_storages += " #{nb}x#{size}GB #{t},"
+      else
+        cluster_storages += " #{size}GB #{t},"
+      end
+    end # each size
+  end # each storage
+  cluster_storages = cluster_storages[0..-2]
+  pmem_message = pmem ? ", #{pmem}GB PMEM" : ''
+  gpu_message  = nb_gpu ? ", #{nb_gpu} GPU#{nb_gpu > 1 ? "s" : ""} #{gpu_model}" : ''
+  return "#{nb_cpu} CPU#{(nb_cpu > 1) ? "s" : ""} #{proc_model} #{proc_version}, #{core_per_cpu} core#{(core_per_cpu > 1) ? "s" : ""}/CPU#{gpu_message}, #{ram}GB RAM#{pmem_message},#{cluster_storages}, #{na.map { |k,v| "#{v} x #{k}" }.join(', ') }"
+end
+
 def generate_reference_api
   # Output directory
   output_data_dir = "../../../data/grid5000/"
@@ -134,10 +180,6 @@ def generate_reference_api
         end
       end
 
-      # Write cluster info w/o nodes entries
-      write_json(cluster_path.join("#{cluster_uid}.json"),
-                 cluster.reject {|k, _v| k == "nodes"})
-
       #
       # Write node info
       #
@@ -165,6 +207,15 @@ def generate_reference_api
 
         write_json(cluster_path.join("nodes","#{node_uid}.json"), node)
       end
+
+      # Add nodes details to cluster description
+      cluster['nodes_count'] = cluster['nodes'].length
+      cluster['nodes_description'] = gen_node_description(cluster['nodes'].values.first)
+
+      # Write cluster info w/o nodes entries
+      write_json(cluster_path.join("#{cluster_uid}.json"),
+                 cluster.reject {|k, _v| k == "nodes"})
+
     end
 
   end