diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05bec8a9dc2c196df83d5703741e58acb8b6e2a4..c4151d5a67315105818b05aa45028862aece863f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - lint
   - check
   - generate-access-history
-  - deploy
+  - resources-explorer
 
 include:
   - project: 'grid5000/grid5000-gitlab-templates'
@@ -53,10 +53,8 @@ wikigen:
         DEBIAN_VERSION: [bookworm]
   script:
     - echo "$GRID5000_API" > "${HOME}/.grid5000_api.yml"
-    - bundle exec rake gen:wiki NAME=${GENERATOR} SITE=${SITE} DO=diff
-  only:
-    refs:
-      - master
+    - if [ "$CI_COMMIT_BRANCH" = "master" ]; then export WIKI="update"; else export WIKI="diff"; fi
+    - bundle exec rake gen:wiki NAME=${GENERATOR} SITE=${SITE} DO=${WIKI}
 
 check-no-changes-in-data:
   extends: .template-refrepo
@@ -88,7 +86,7 @@ deploy-to-api-servers:
     - /srv/ci-runner-scripts/bin/update-api-servers
 
 rebuild_resources_explorer:
-  stage: deploy
+  stage: resources-explorer
   # NOTE: this job triggers a rebuild of resources explorer which will be
   # automatically deployed to production if it succeeds, therefore it is only
   # ran on the main branch.
@@ -101,6 +99,29 @@ rebuild_resources_explorer:
     # as the pipeline is triggered, regardless of its status.
     strategy: depend
 
+preview_resources_explorer:
+  stage: resources-explorer
+  # NOTE: this job triggers a rebuild of resources explorer which will be
+  # automatically deployed to a specific environment.
+  # Resources Explorer build environments are available here:
+  # https://gitlab.inria.fr/grid5000/resources-explorer/-/environments
+  rules:
+    # Do not create the job on master
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      when: never
+    # But create a manual job on branches
+    - if: $CI_COMMIT_BRANCH
+      when: manual
+      allow_failure: true
+  variables:
+    NEXT_PUBLIC_REFREPO_BRANCH: $CI_COMMIT_BRANCH
+  trigger:
+    project: grid5000/resources-explorer
+    # This mirrors the status of RE's pipeline into our own.
+    # We may want to revisit this if we want to show a "green" job as soon
+    # as the pipeline is triggered, regardless of its status.
+    strategy: depend
+
 rspec:
   stage: check  # we use 'checks' here to avoid blocking on this when updating the ref-repo
   extends: .template-refrepo
diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 12c509a15e97d4a2d0643cf56b72095c6dac9d4f..58380a18fa7955448c93a9e724dd7093c12ac611 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -37,12 +37,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -53,12 +47,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -94,12 +90,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -110,12 +100,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -130,7 +122,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -176,12 +169,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -192,12 +179,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -233,12 +222,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -249,12 +232,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -308,12 +293,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -324,12 +303,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -381,12 +362,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -397,12 +372,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -438,12 +415,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -454,12 +425,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -497,12 +470,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -513,12 +480,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -533,7 +502,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -556,12 +526,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -572,12 +536,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -638,12 +604,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -654,12 +614,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -695,12 +657,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -711,12 +667,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -754,12 +712,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -770,12 +722,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -790,7 +744,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -813,12 +768,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -829,12 +778,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -872,12 +823,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -888,12 +833,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -948,12 +895,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -964,12 +905,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1005,12 +948,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1021,12 +958,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1041,7 +980,7 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -1064,12 +1003,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1080,12 +1013,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1109,6 +1044,75 @@
       ]
     }
   },
+  "abacus28": {
+    "p1": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    },
+    "p3": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege"
+      ]
+    },
+    "p4": {
+      "ggas": [
+
+      ],
+      "sites": [
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    }
+  },
   "abacus3": {
     "besteffort": {
       "ggas": [
@@ -1124,12 +1128,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1140,12 +1138,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1160,7 +1160,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -1199,12 +1200,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1215,12 +1210,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1256,12 +1253,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1272,12 +1263,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1331,12 +1324,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1347,12 +1334,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1404,12 +1393,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1420,12 +1403,77 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege"
+      ]
+    },
+    "p4": {
+      "ggas": [
+
+      ],
+      "sites": [
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    }
+  },
+  "esterel10": {
+    "p1": {
+      "ggas": [
+        "zenith"
+      ],
+      "sites": [
+        "mc-sophia",
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    },
+    "p3": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1461,12 +1509,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1477,12 +1519,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1505,6 +1549,61 @@
       ]
     }
   },
+  "esterel5": {
+    "besteffort": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege",
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    },
+    "p1": {
+      "ggas": [
+        "stars"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "graffiti": {
     "p1": {
       "ggas": [
@@ -1538,12 +1637,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1554,12 +1647,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1612,12 +1707,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1628,12 +1717,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1686,12 +1777,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1702,12 +1787,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1761,12 +1848,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1777,12 +1858,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1835,12 +1918,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1851,12 +1928,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1910,12 +1989,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1926,12 +1999,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1977,12 +2052,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1993,12 +2062,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2052,12 +2123,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2068,12 +2133,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2127,12 +2194,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2143,12 +2204,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2202,12 +2265,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2218,12 +2275,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2278,12 +2337,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2294,12 +2347,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2352,12 +2407,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2368,12 +2417,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2419,12 +2470,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2435,12 +2480,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2461,6 +2508,61 @@
       ]
     }
   },
+  "mercantour6": {
+    "besteffort": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege",
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    },
+    "p1": {
+      "ggas": [
+        "coati"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "musa": {
     "p1": {
       "ggas": [
@@ -2485,12 +2587,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2501,12 +2597,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2565,12 +2663,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2581,12 +2673,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2638,12 +2732,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2654,12 +2742,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2711,12 +2801,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2727,12 +2811,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2784,12 +2870,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2800,12 +2880,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2857,12 +2939,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2873,12 +2949,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2937,12 +3015,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2953,12 +3025,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3010,12 +3084,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3026,12 +3094,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3083,12 +3153,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3099,12 +3163,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3163,12 +3229,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3179,12 +3239,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3236,12 +3298,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3252,12 +3308,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3316,12 +3374,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3332,12 +3384,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3396,12 +3450,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3412,12 +3460,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3469,12 +3519,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3485,12 +3529,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
new file mode 100644
index 0000000000000000000000000000000000000000..5443599310062bd6e03774fed4b35c7739f49e78
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
@@ -0,0 +1,240 @@
+{
+  "boot_type": "bios",
+  "created_at": "Mon, 13 Jan 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": true,
+  "manufactured_at": "2016-11-14",
+  "metrics": [
+    {
+      "description": "Front node ambient temperature reported by BMC, in celsius",
+      "name": "bmc_ambient_temp_celsius",
+      "period": 5000,
+      "source": {
+        "id": "FIXME",
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Power consumption of node reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
+      "source": {
+        "id": "FIXME",
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 14,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Power consumption of Pwr Consumption reported by BMC, in watt",
+      "labels": {
+        "id": "pwrconsumption"
+      },
+      "name": "bmc_other_power_watt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 59,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan 1 reported by BMC, in rpm",
+      "labels": {
+        "fan": "1"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 99,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan 2 reported by BMC, in rpm",
+      "labels": {
+        "fan": "2"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 100,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan 3 reported by BMC, in rpm",
+      "labels": {
+        "fan": "3"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 101,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan 4 reported by BMC, in rpm",
+      "labels": {
+        "fan": "4"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 102,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Current of Input Current reported by BMC, in amp",
+      "labels": {
+        "id": "inputcurrent"
+      },
+      "name": "bmc_other_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 114,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of Input Voltage reported by BMC, in volt",
+      "labels": {
+        "id": "inputvoltage"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 115,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of CPU Usage reported by BMC, in percent",
+      "labels": {
+        "id": "cpuusage"
+      },
+      "name": "bmc_cpu_power_watt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 167,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of IO Usage reported by BMC, in percent",
+      "labels": {
+        "id": "iousage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 168,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of MEM Usage reported by BMC, in percent",
+      "labels": {
+        "id": "memusage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 169,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of SYS Usage reported by BMC, in percent",
+      "labels": {
+        "id": "sysusage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 170,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2640 v4, 10 cores/CPU, 32GB RAM, 1117GB HDD, 1 x 10Gb Ethernet",
+  "priority": 201611,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "chartreuse2",
+  "warranty_end": "2021-11-13"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..7b232c41372b9066a97b15b5e7c70f7d2d2c842a
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "504GSG2",
+    "warranty_end": "2021-11-13"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.1",
+      "kavlan-11": "10.7.247.1",
+      "kavlan-12": "10.11.247.1",
+      "kavlan-13": "10.15.247.1",
+      "kavlan-14": "10.19.247.1",
+      "kavlan-16": "10.27.247.1",
+      "kavlan-17": "10.31.247.1",
+      "kavlan-18": "10.35.247.1",
+      "kavlan-2": "192.168.214.1",
+      "kavlan-20": "10.43.247.1",
+      "kavlan-21": "10.47.247.1",
+      "kavlan-3": "192.168.230.1",
+      "kavlan-4": "10.4.6.1",
+      "kavlan-5": "10.4.70.1",
+      "kavlan-6": "10.4.134.1",
+      "kavlan-7": "10.4.198.1",
+      "kavlan-8": "10.5.6.1",
+      "kavlan-9": "10.5.70.1"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::5",
+      "kavlan-11": "2001:660:4406:1a0:10b::5",
+      "kavlan-12": "2001:660:4406:2a0:10b::5",
+      "kavlan-13": "2001:660:4406:4a0:10b::5",
+      "kavlan-14": "2001:660:4406:5a0:10b::5",
+      "kavlan-16": "2001:660:4406:7a0:10b::5",
+      "kavlan-17": "2001:660:4406:9a0:10b::5",
+      "kavlan-18": "2001:660:4406:8a0:10b::5",
+      "kavlan-2": "2001:660:4406:181:b::5",
+      "kavlan-20": "2001:660:4406:3a0:10b::5",
+      "kavlan-21": "2001:660:4406:6a0:10b::5",
+      "kavlan-3": "2001:660:4406:182:b::5",
+      "kavlan-4": "2001:660:4406:190:b::5",
+      "kavlan-5": "2001:660:4406:191:b::5",
+      "kavlan-6": "2001:660:4406:192:b::5",
+      "kavlan-7": "2001:660:4406:193:b::5",
+      "kavlan-8": "2001:660:4406:194:b::5",
+      "kavlan-9": "2001:660:4406:195:b::5"
+    }
+  },
+  "main_memory": {
+    "ram_size": 34359738368
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.5",
+      "ip6": "2001:660:4406:100:b::5",
+      "kavlan": true,
+      "mac": "7c:d3:0a:bf:38:d4",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse2-1.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/5",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:38:d6",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.5",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:38:d8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse2",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 38400000000,
+    "node_flops": 768000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000397583beef9",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "DM06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "AL14SEB120N",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Toshiba"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse2-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..9a6f90181ab5f65eb852931f274b6f2a38f8e457
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "501NSG2",
+    "warranty_end": "2021-11-13"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.2",
+      "kavlan-11": "10.7.247.2",
+      "kavlan-12": "10.11.247.2",
+      "kavlan-13": "10.15.247.2",
+      "kavlan-14": "10.19.247.2",
+      "kavlan-16": "10.27.247.2",
+      "kavlan-17": "10.31.247.2",
+      "kavlan-18": "10.35.247.2",
+      "kavlan-2": "192.168.214.2",
+      "kavlan-20": "10.43.247.2",
+      "kavlan-21": "10.47.247.2",
+      "kavlan-3": "192.168.230.2",
+      "kavlan-4": "10.4.6.2",
+      "kavlan-5": "10.4.70.2",
+      "kavlan-6": "10.4.134.2",
+      "kavlan-7": "10.4.198.2",
+      "kavlan-8": "10.5.6.2",
+      "kavlan-9": "10.5.70.2"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::6",
+      "kavlan-11": "2001:660:4406:1a0:10b::6",
+      "kavlan-12": "2001:660:4406:2a0:10b::6",
+      "kavlan-13": "2001:660:4406:4a0:10b::6",
+      "kavlan-14": "2001:660:4406:5a0:10b::6",
+      "kavlan-16": "2001:660:4406:7a0:10b::6",
+      "kavlan-17": "2001:660:4406:9a0:10b::6",
+      "kavlan-18": "2001:660:4406:8a0:10b::6",
+      "kavlan-2": "2001:660:4406:181:b::6",
+      "kavlan-20": "2001:660:4406:3a0:10b::6",
+      "kavlan-21": "2001:660:4406:6a0:10b::6",
+      "kavlan-3": "2001:660:4406:182:b::6",
+      "kavlan-4": "2001:660:4406:190:b::6",
+      "kavlan-5": "2001:660:4406:191:b::6",
+      "kavlan-6": "2001:660:4406:192:b::6",
+      "kavlan-7": "2001:660:4406:193:b::6",
+      "kavlan-8": "2001:660:4406:194:b::6",
+      "kavlan-9": "2001:660:4406:195:b::6"
+    }
+  },
+  "main_memory": {
+    "ram_size": 34359738368
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.6",
+      "ip6": "2001:660:4406:100:b::6",
+      "kavlan": true,
+      "mac": "7c:d3:0a:bf:40:24",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse2-2.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/7",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:40:26",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.6",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:40:28",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse2",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 38400000000,
+    "node_flops": 768000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000397582b2a1d",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "DM06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "AL14SEB120N",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Toshiba"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse2-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..4087a27c415a3a0754809280f11eeceaa53a04bb
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "503FSG2",
+    "warranty_end": "2021-11-13"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.3",
+      "kavlan-11": "10.7.247.3",
+      "kavlan-12": "10.11.247.3",
+      "kavlan-13": "10.15.247.3",
+      "kavlan-14": "10.19.247.3",
+      "kavlan-16": "10.27.247.3",
+      "kavlan-17": "10.31.247.3",
+      "kavlan-18": "10.35.247.3",
+      "kavlan-2": "192.168.214.3",
+      "kavlan-20": "10.43.247.3",
+      "kavlan-21": "10.47.247.3",
+      "kavlan-3": "192.168.230.3",
+      "kavlan-4": "10.4.6.3",
+      "kavlan-5": "10.4.70.3",
+      "kavlan-6": "10.4.134.3",
+      "kavlan-7": "10.4.198.3",
+      "kavlan-8": "10.5.6.3",
+      "kavlan-9": "10.5.70.3"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::7",
+      "kavlan-11": "2001:660:4406:1a0:10b::7",
+      "kavlan-12": "2001:660:4406:2a0:10b::7",
+      "kavlan-13": "2001:660:4406:4a0:10b::7",
+      "kavlan-14": "2001:660:4406:5a0:10b::7",
+      "kavlan-16": "2001:660:4406:7a0:10b::7",
+      "kavlan-17": "2001:660:4406:9a0:10b::7",
+      "kavlan-18": "2001:660:4406:8a0:10b::7",
+      "kavlan-2": "2001:660:4406:181:b::7",
+      "kavlan-20": "2001:660:4406:3a0:10b::7",
+      "kavlan-21": "2001:660:4406:6a0:10b::7",
+      "kavlan-3": "2001:660:4406:182:b::7",
+      "kavlan-4": "2001:660:4406:190:b::7",
+      "kavlan-5": "2001:660:4406:191:b::7",
+      "kavlan-6": "2001:660:4406:192:b::7",
+      "kavlan-7": "2001:660:4406:193:b::7",
+      "kavlan-8": "2001:660:4406:194:b::7",
+      "kavlan-9": "2001:660:4406:195:b::7"
+    }
+  },
+  "main_memory": {
+    "ram_size": 34359738368
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.7",
+      "ip6": "2001:660:4406:100:b::7",
+      "kavlan": true,
+      "mac": "7c:d3:0a:bf:41:08",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse2-3.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/6",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:41:0a",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.7",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:41:0c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse2",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 38400000000,
+    "node_flops": 768000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x500003975839a991",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "DM06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "AL14SEB120N",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Toshiba"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse2-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..460b713e37ebb8b9a77cae4ea6f4190c9b76d95e
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "505MSG2",
+    "warranty_end": "2021-11-13"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.4",
+      "kavlan-11": "10.7.247.4",
+      "kavlan-12": "10.11.247.4",
+      "kavlan-13": "10.15.247.4",
+      "kavlan-14": "10.19.247.4",
+      "kavlan-16": "10.27.247.4",
+      "kavlan-17": "10.31.247.4",
+      "kavlan-18": "10.35.247.4",
+      "kavlan-2": "192.168.214.4",
+      "kavlan-20": "10.43.247.4",
+      "kavlan-21": "10.47.247.4",
+      "kavlan-3": "192.168.230.4",
+      "kavlan-4": "10.4.6.4",
+      "kavlan-5": "10.4.70.4",
+      "kavlan-6": "10.4.134.4",
+      "kavlan-7": "10.4.198.4",
+      "kavlan-8": "10.5.6.4",
+      "kavlan-9": "10.5.70.4"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::8",
+      "kavlan-11": "2001:660:4406:1a0:10b::8",
+      "kavlan-12": "2001:660:4406:2a0:10b::8",
+      "kavlan-13": "2001:660:4406:4a0:10b::8",
+      "kavlan-14": "2001:660:4406:5a0:10b::8",
+      "kavlan-16": "2001:660:4406:7a0:10b::8",
+      "kavlan-17": "2001:660:4406:9a0:10b::8",
+      "kavlan-18": "2001:660:4406:8a0:10b::8",
+      "kavlan-2": "2001:660:4406:181:b::8",
+      "kavlan-20": "2001:660:4406:3a0:10b::8",
+      "kavlan-21": "2001:660:4406:6a0:10b::8",
+      "kavlan-3": "2001:660:4406:182:b::8",
+      "kavlan-4": "2001:660:4406:190:b::8",
+      "kavlan-5": "2001:660:4406:191:b::8",
+      "kavlan-6": "2001:660:4406:192:b::8",
+      "kavlan-7": "2001:660:4406:193:b::8",
+      "kavlan-8": "2001:660:4406:194:b::8",
+      "kavlan-9": "2001:660:4406:195:b::8"
+    }
+  },
+  "main_memory": {
+    "ram_size": 34359738368
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.8",
+      "ip6": "2001:660:4406:100:b::8",
+      "kavlan": true,
+      "mac": "7c:d3:0a:bf:3f:ee",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse2-4.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/8",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:3f:f0",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.8",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:3f:f2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse2",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 38400000000,
+    "node_flops": 768000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000397583a5e3d",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "DM06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "AL14SEB120N",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Toshiba"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse2-4"
+}
\ No newline at end of file
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 3582f9f0124ee841e7b3105b18de47493da68238..d403c79524f1b4622c874a13bd161fc910f10287 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
@@ -2,12 +2,85 @@
   "boot_type": "uefi",
   "created_at": "Mon, 10 Feb 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2024-06-26",
   "metrics": [
-
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
   ],
   "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/kinovis/nodes/kinovis-1.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
index 0dff65178e437b44b2da3e4b0b99bb54a5194746..adcca06a4615fb2703cc3f7978347e3f41c8fe9e 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.1",
+      "kavlan-11": "10.7.246.1",
+      "kavlan-12": "10.11.246.1",
+      "kavlan-13": "10.15.246.1",
+      "kavlan-14": "10.19.246.1",
+      "kavlan-16": "10.27.246.1",
+      "kavlan-17": "10.31.246.1",
+      "kavlan-18": "10.35.246.1",
+      "kavlan-2": "192.168.213.1",
+      "kavlan-20": "10.43.246.1",
+      "kavlan-21": "10.47.246.1",
+      "kavlan-3": "192.168.229.1",
+      "kavlan-4": "10.4.5.1",
+      "kavlan-5": "10.4.69.1",
+      "kavlan-6": "10.4.133.1",
+      "kavlan-7": "10.4.197.1",
+      "kavlan-8": "10.5.5.1",
+      "kavlan-9": "10.5.69.1"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.11",
+      "kavlan-11": "10.7.246.11",
+      "kavlan-12": "10.11.246.11",
+      "kavlan-13": "10.15.246.11",
+      "kavlan-14": "10.19.246.11",
+      "kavlan-16": "10.27.246.11",
+      "kavlan-17": "10.31.246.11",
+      "kavlan-18": "10.35.246.11",
+      "kavlan-2": "192.168.213.11",
+      "kavlan-20": "10.43.246.11",
+      "kavlan-21": "10.47.246.11",
+      "kavlan-3": "192.168.229.11",
+      "kavlan-4": "10.4.5.11",
+      "kavlan-5": "10.4.69.11",
+      "kavlan-6": "10.4.133.11",
+      "kavlan-7": "10.4.197.11",
+      "kavlan-8": "10.5.5.11",
+      "kavlan-9": "10.5.69.11"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.21",
+      "kavlan-11": "10.7.246.21",
+      "kavlan-12": "10.11.246.21",
+      "kavlan-13": "10.15.246.21",
+      "kavlan-14": "10.19.246.21",
+      "kavlan-16": "10.27.246.21",
+      "kavlan-17": "10.31.246.21",
+      "kavlan-18": "10.35.246.21",
+      "kavlan-2": "192.168.213.21",
+      "kavlan-20": "10.43.246.21",
+      "kavlan-21": "10.47.246.21",
+      "kavlan-3": "192.168.229.21",
+      "kavlan-4": "10.4.5.21",
+      "kavlan-5": "10.4.69.21",
+      "kavlan-6": "10.4.133.21",
+      "kavlan-7": "10.4.197.21",
+      "kavlan-8": "10.5.5.21",
+      "kavlan-9": "10.5.69.21"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::1",
+      "kavlan-11": "2001:660:4406:1a0:10d::1",
+      "kavlan-12": "2001:660:4406:2a0:10d::1",
+      "kavlan-13": "2001:660:4406:4a0:10d::1",
+      "kavlan-14": "2001:660:4406:5a0:10d::1",
+      "kavlan-16": "2001:660:4406:7a0:10d::1",
+      "kavlan-17": "2001:660:4406:9a0:10d::1",
+      "kavlan-18": "2001:660:4406:8a0:10d::1",
+      "kavlan-2": "2001:660:4406:181:d::1",
+      "kavlan-20": "2001:660:4406:3a0:10d::1",
+      "kavlan-21": "2001:660:4406:6a0:10d::1",
+      "kavlan-3": "2001:660:4406:182:d::1",
+      "kavlan-4": "2001:660:4406:190:d::1",
+      "kavlan-5": "2001:660:4406:191:d::1",
+      "kavlan-6": "2001:660:4406:192:d::1",
+      "kavlan-7": "2001:660:4406:193:d::1",
+      "kavlan-8": "2001:660:4406:194:d::1",
+      "kavlan-9": "2001:660:4406:195:d::1"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:1",
+      "kavlan-2": "2001:660:4406:181:d:1:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:1",
+      "kavlan-3": "2001:660:4406:182:d:1:0:1",
+      "kavlan-4": "2001:660:4406:190:d:1:0:1",
+      "kavlan-5": "2001:660:4406:191:d:1:0:1",
+      "kavlan-6": "2001:660:4406:192:d:1:0:1",
+      "kavlan-7": "2001:660:4406:193:d:1:0:1",
+      "kavlan-8": "2001:660:4406:194:d:1:0:1",
+      "kavlan-9": "2001:660:4406:195:d:1:0:1"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:1",
+      "kavlan-2": "2001:660:4406:181:d:2:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:1",
+      "kavlan-3": "2001:660:4406:182:d:2:0:1",
+      "kavlan-4": "2001:660:4406:190:d:2:0:1",
+      "kavlan-5": "2001:660:4406:191:d:2:0:1",
+      "kavlan-6": "2001:660:4406:192:d:2:0:1",
+      "kavlan-7": "2001:660:4406:193:d:2:0:1",
+      "kavlan-8": "2001:660:4406:194:d:2:0:1",
+      "kavlan-9": "2001:660:4406:195:d:2:0:1"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.1",
       "ip6": "2001:660:4406:100:d::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:88",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.7",
       "ip6": "2001:660:4406:100:d:1:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:89",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.13",
       "ip6": "2001:660:4406:100:d:2:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:dc",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
index be0f7797108fd499c61ee9c5f9407c6080aa3a16..fe87a691e4666fa7e852f7333019f5eed3bd960c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.2",
+      "kavlan-11": "10.7.246.2",
+      "kavlan-12": "10.11.246.2",
+      "kavlan-13": "10.15.246.2",
+      "kavlan-14": "10.19.246.2",
+      "kavlan-16": "10.27.246.2",
+      "kavlan-17": "10.31.246.2",
+      "kavlan-18": "10.35.246.2",
+      "kavlan-2": "192.168.213.2",
+      "kavlan-20": "10.43.246.2",
+      "kavlan-21": "10.47.246.2",
+      "kavlan-3": "192.168.229.2",
+      "kavlan-4": "10.4.5.2",
+      "kavlan-5": "10.4.69.2",
+      "kavlan-6": "10.4.133.2",
+      "kavlan-7": "10.4.197.2",
+      "kavlan-8": "10.5.5.2",
+      "kavlan-9": "10.5.69.2"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.12",
+      "kavlan-11": "10.7.246.12",
+      "kavlan-12": "10.11.246.12",
+      "kavlan-13": "10.15.246.12",
+      "kavlan-14": "10.19.246.12",
+      "kavlan-16": "10.27.246.12",
+      "kavlan-17": "10.31.246.12",
+      "kavlan-18": "10.35.246.12",
+      "kavlan-2": "192.168.213.12",
+      "kavlan-20": "10.43.246.12",
+      "kavlan-21": "10.47.246.12",
+      "kavlan-3": "192.168.229.12",
+      "kavlan-4": "10.4.5.12",
+      "kavlan-5": "10.4.69.12",
+      "kavlan-6": "10.4.133.12",
+      "kavlan-7": "10.4.197.12",
+      "kavlan-8": "10.5.5.12",
+      "kavlan-9": "10.5.69.12"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.22",
+      "kavlan-11": "10.7.246.22",
+      "kavlan-12": "10.11.246.22",
+      "kavlan-13": "10.15.246.22",
+      "kavlan-14": "10.19.246.22",
+      "kavlan-16": "10.27.246.22",
+      "kavlan-17": "10.31.246.22",
+      "kavlan-18": "10.35.246.22",
+      "kavlan-2": "192.168.213.22",
+      "kavlan-20": "10.43.246.22",
+      "kavlan-21": "10.47.246.22",
+      "kavlan-3": "192.168.229.22",
+      "kavlan-4": "10.4.5.22",
+      "kavlan-5": "10.4.69.22",
+      "kavlan-6": "10.4.133.22",
+      "kavlan-7": "10.4.197.22",
+      "kavlan-8": "10.5.5.22",
+      "kavlan-9": "10.5.69.22"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::2",
+      "kavlan-11": "2001:660:4406:1a0:10d::2",
+      "kavlan-12": "2001:660:4406:2a0:10d::2",
+      "kavlan-13": "2001:660:4406:4a0:10d::2",
+      "kavlan-14": "2001:660:4406:5a0:10d::2",
+      "kavlan-16": "2001:660:4406:7a0:10d::2",
+      "kavlan-17": "2001:660:4406:9a0:10d::2",
+      "kavlan-18": "2001:660:4406:8a0:10d::2",
+      "kavlan-2": "2001:660:4406:181:d::2",
+      "kavlan-20": "2001:660:4406:3a0:10d::2",
+      "kavlan-21": "2001:660:4406:6a0:10d::2",
+      "kavlan-3": "2001:660:4406:182:d::2",
+      "kavlan-4": "2001:660:4406:190:d::2",
+      "kavlan-5": "2001:660:4406:191:d::2",
+      "kavlan-6": "2001:660:4406:192:d::2",
+      "kavlan-7": "2001:660:4406:193:d::2",
+      "kavlan-8": "2001:660:4406:194:d::2",
+      "kavlan-9": "2001:660:4406:195:d::2"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:2",
+      "kavlan-2": "2001:660:4406:181:d:1:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:2",
+      "kavlan-3": "2001:660:4406:182:d:1:0:2",
+      "kavlan-4": "2001:660:4406:190:d:1:0:2",
+      "kavlan-5": "2001:660:4406:191:d:1:0:2",
+      "kavlan-6": "2001:660:4406:192:d:1:0:2",
+      "kavlan-7": "2001:660:4406:193:d:1:0:2",
+      "kavlan-8": "2001:660:4406:194:d:1:0:2",
+      "kavlan-9": "2001:660:4406:195:d:1:0:2"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:2",
+      "kavlan-2": "2001:660:4406:181:d:2:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:2",
+      "kavlan-3": "2001:660:4406:182:d:2:0:2",
+      "kavlan-4": "2001:660:4406:190:d:2:0:2",
+      "kavlan-5": "2001:660:4406:191:d:2:0:2",
+      "kavlan-6": "2001:660:4406:192:d:2:0:2",
+      "kavlan-7": "2001:660:4406:193:d:2:0:2",
+      "kavlan-8": "2001:660:4406:194:d:2:0:2",
+      "kavlan-9": "2001:660:4406:195:d:2:0:2"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.2",
       "ip6": "2001:660:4406:100:d::2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:ca",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.8",
       "ip6": "2001:660:4406:100:d:1:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:cb",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.14",
       "ip6": "2001:660:4406:100:d:2:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:d8",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
index 16410e124b38142bc5de151a53095ac262479830..333d5418ce22a53519aab07aec081e8fdbf36f9f 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.3",
+      "kavlan-11": "10.7.246.3",
+      "kavlan-12": "10.11.246.3",
+      "kavlan-13": "10.15.246.3",
+      "kavlan-14": "10.19.246.3",
+      "kavlan-16": "10.27.246.3",
+      "kavlan-17": "10.31.246.3",
+      "kavlan-18": "10.35.246.3",
+      "kavlan-2": "192.168.213.3",
+      "kavlan-20": "10.43.246.3",
+      "kavlan-21": "10.47.246.3",
+      "kavlan-3": "192.168.229.3",
+      "kavlan-4": "10.4.5.3",
+      "kavlan-5": "10.4.69.3",
+      "kavlan-6": "10.4.133.3",
+      "kavlan-7": "10.4.197.3",
+      "kavlan-8": "10.5.5.3",
+      "kavlan-9": "10.5.69.3"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.13",
+      "kavlan-11": "10.7.246.13",
+      "kavlan-12": "10.11.246.13",
+      "kavlan-13": "10.15.246.13",
+      "kavlan-14": "10.19.246.13",
+      "kavlan-16": "10.27.246.13",
+      "kavlan-17": "10.31.246.13",
+      "kavlan-18": "10.35.246.13",
+      "kavlan-2": "192.168.213.13",
+      "kavlan-20": "10.43.246.13",
+      "kavlan-21": "10.47.246.13",
+      "kavlan-3": "192.168.229.13",
+      "kavlan-4": "10.4.5.13",
+      "kavlan-5": "10.4.69.13",
+      "kavlan-6": "10.4.133.13",
+      "kavlan-7": "10.4.197.13",
+      "kavlan-8": "10.5.5.13",
+      "kavlan-9": "10.5.69.13"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.23",
+      "kavlan-11": "10.7.246.23",
+      "kavlan-12": "10.11.246.23",
+      "kavlan-13": "10.15.246.23",
+      "kavlan-14": "10.19.246.23",
+      "kavlan-16": "10.27.246.23",
+      "kavlan-17": "10.31.246.23",
+      "kavlan-18": "10.35.246.23",
+      "kavlan-2": "192.168.213.23",
+      "kavlan-20": "10.43.246.23",
+      "kavlan-21": "10.47.246.23",
+      "kavlan-3": "192.168.229.23",
+      "kavlan-4": "10.4.5.23",
+      "kavlan-5": "10.4.69.23",
+      "kavlan-6": "10.4.133.23",
+      "kavlan-7": "10.4.197.23",
+      "kavlan-8": "10.5.5.23",
+      "kavlan-9": "10.5.69.23"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::3",
+      "kavlan-11": "2001:660:4406:1a0:10d::3",
+      "kavlan-12": "2001:660:4406:2a0:10d::3",
+      "kavlan-13": "2001:660:4406:4a0:10d::3",
+      "kavlan-14": "2001:660:4406:5a0:10d::3",
+      "kavlan-16": "2001:660:4406:7a0:10d::3",
+      "kavlan-17": "2001:660:4406:9a0:10d::3",
+      "kavlan-18": "2001:660:4406:8a0:10d::3",
+      "kavlan-2": "2001:660:4406:181:d::3",
+      "kavlan-20": "2001:660:4406:3a0:10d::3",
+      "kavlan-21": "2001:660:4406:6a0:10d::3",
+      "kavlan-3": "2001:660:4406:182:d::3",
+      "kavlan-4": "2001:660:4406:190:d::3",
+      "kavlan-5": "2001:660:4406:191:d::3",
+      "kavlan-6": "2001:660:4406:192:d::3",
+      "kavlan-7": "2001:660:4406:193:d::3",
+      "kavlan-8": "2001:660:4406:194:d::3",
+      "kavlan-9": "2001:660:4406:195:d::3"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:3",
+      "kavlan-2": "2001:660:4406:181:d:1:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:3",
+      "kavlan-3": "2001:660:4406:182:d:1:0:3",
+      "kavlan-4": "2001:660:4406:190:d:1:0:3",
+      "kavlan-5": "2001:660:4406:191:d:1:0:3",
+      "kavlan-6": "2001:660:4406:192:d:1:0:3",
+      "kavlan-7": "2001:660:4406:193:d:1:0:3",
+      "kavlan-8": "2001:660:4406:194:d:1:0:3",
+      "kavlan-9": "2001:660:4406:195:d:1:0:3"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:3",
+      "kavlan-2": "2001:660:4406:181:d:2:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:3",
+      "kavlan-3": "2001:660:4406:182:d:2:0:3",
+      "kavlan-4": "2001:660:4406:190:d:2:0:3",
+      "kavlan-5": "2001:660:4406:191:d:2:0:3",
+      "kavlan-6": "2001:660:4406:192:d:2:0:3",
+      "kavlan-7": "2001:660:4406:193:d:2:0:3",
+      "kavlan-8": "2001:660:4406:194:d:2:0:3",
+      "kavlan-9": "2001:660:4406:195:d:2:0:3"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.3",
       "ip6": "2001:660:4406:100:d::3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:84",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.9",
       "ip6": "2001:660:4406:100:d:1:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:85",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.15",
       "ip6": "2001:660:4406:100:d:2:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:98",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
index dd9590bd3bdaf40d6667742c5c3503941f93b44f..0d3d3e8dd8909a6760bddc5b1ad1d14b77c1fa7d 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.4",
+      "kavlan-11": "10.7.246.4",
+      "kavlan-12": "10.11.246.4",
+      "kavlan-13": "10.15.246.4",
+      "kavlan-14": "10.19.246.4",
+      "kavlan-16": "10.27.246.4",
+      "kavlan-17": "10.31.246.4",
+      "kavlan-18": "10.35.246.4",
+      "kavlan-2": "192.168.213.4",
+      "kavlan-20": "10.43.246.4",
+      "kavlan-21": "10.47.246.4",
+      "kavlan-3": "192.168.229.4",
+      "kavlan-4": "10.4.5.4",
+      "kavlan-5": "10.4.69.4",
+      "kavlan-6": "10.4.133.4",
+      "kavlan-7": "10.4.197.4",
+      "kavlan-8": "10.5.5.4",
+      "kavlan-9": "10.5.69.4"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.14",
+      "kavlan-11": "10.7.246.14",
+      "kavlan-12": "10.11.246.14",
+      "kavlan-13": "10.15.246.14",
+      "kavlan-14": "10.19.246.14",
+      "kavlan-16": "10.27.246.14",
+      "kavlan-17": "10.31.246.14",
+      "kavlan-18": "10.35.246.14",
+      "kavlan-2": "192.168.213.14",
+      "kavlan-20": "10.43.246.14",
+      "kavlan-21": "10.47.246.14",
+      "kavlan-3": "192.168.229.14",
+      "kavlan-4": "10.4.5.14",
+      "kavlan-5": "10.4.69.14",
+      "kavlan-6": "10.4.133.14",
+      "kavlan-7": "10.4.197.14",
+      "kavlan-8": "10.5.5.14",
+      "kavlan-9": "10.5.69.14"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.24",
+      "kavlan-11": "10.7.246.24",
+      "kavlan-12": "10.11.246.24",
+      "kavlan-13": "10.15.246.24",
+      "kavlan-14": "10.19.246.24",
+      "kavlan-16": "10.27.246.24",
+      "kavlan-17": "10.31.246.24",
+      "kavlan-18": "10.35.246.24",
+      "kavlan-2": "192.168.213.24",
+      "kavlan-20": "10.43.246.24",
+      "kavlan-21": "10.47.246.24",
+      "kavlan-3": "192.168.229.24",
+      "kavlan-4": "10.4.5.24",
+      "kavlan-5": "10.4.69.24",
+      "kavlan-6": "10.4.133.24",
+      "kavlan-7": "10.4.197.24",
+      "kavlan-8": "10.5.5.24",
+      "kavlan-9": "10.5.69.24"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::4",
+      "kavlan-11": "2001:660:4406:1a0:10d::4",
+      "kavlan-12": "2001:660:4406:2a0:10d::4",
+      "kavlan-13": "2001:660:4406:4a0:10d::4",
+      "kavlan-14": "2001:660:4406:5a0:10d::4",
+      "kavlan-16": "2001:660:4406:7a0:10d::4",
+      "kavlan-17": "2001:660:4406:9a0:10d::4",
+      "kavlan-18": "2001:660:4406:8a0:10d::4",
+      "kavlan-2": "2001:660:4406:181:d::4",
+      "kavlan-20": "2001:660:4406:3a0:10d::4",
+      "kavlan-21": "2001:660:4406:6a0:10d::4",
+      "kavlan-3": "2001:660:4406:182:d::4",
+      "kavlan-4": "2001:660:4406:190:d::4",
+      "kavlan-5": "2001:660:4406:191:d::4",
+      "kavlan-6": "2001:660:4406:192:d::4",
+      "kavlan-7": "2001:660:4406:193:d::4",
+      "kavlan-8": "2001:660:4406:194:d::4",
+      "kavlan-9": "2001:660:4406:195:d::4"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:4",
+      "kavlan-2": "2001:660:4406:181:d:1:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:4",
+      "kavlan-3": "2001:660:4406:182:d:1:0:4",
+      "kavlan-4": "2001:660:4406:190:d:1:0:4",
+      "kavlan-5": "2001:660:4406:191:d:1:0:4",
+      "kavlan-6": "2001:660:4406:192:d:1:0:4",
+      "kavlan-7": "2001:660:4406:193:d:1:0:4",
+      "kavlan-8": "2001:660:4406:194:d:1:0:4",
+      "kavlan-9": "2001:660:4406:195:d:1:0:4"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:4",
+      "kavlan-2": "2001:660:4406:181:d:2:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:4",
+      "kavlan-3": "2001:660:4406:182:d:2:0:4",
+      "kavlan-4": "2001:660:4406:190:d:2:0:4",
+      "kavlan-5": "2001:660:4406:191:d:2:0:4",
+      "kavlan-6": "2001:660:4406:192:d:2:0:4",
+      "kavlan-7": "2001:660:4406:193:d:2:0:4",
+      "kavlan-8": "2001:660:4406:194:d:2:0:4",
+      "kavlan-9": "2001:660:4406:195:d:2:0:4"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.4",
       "ip6": "2001:660:4406:100:d::4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:80",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.10",
       "ip6": "2001:660:4406:100:d:1:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:81",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.16",
       "ip6": "2001:660:4406:100:d:2:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:28",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
index 268e5e965b362b451c6fbf7377c90ba979481f9a..b9171bb5f4c972648f44fcbccc5f73585cc2e14c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.5",
+      "kavlan-11": "10.7.246.5",
+      "kavlan-12": "10.11.246.5",
+      "kavlan-13": "10.15.246.5",
+      "kavlan-14": "10.19.246.5",
+      "kavlan-16": "10.27.246.5",
+      "kavlan-17": "10.31.246.5",
+      "kavlan-18": "10.35.246.5",
+      "kavlan-2": "192.168.213.5",
+      "kavlan-20": "10.43.246.5",
+      "kavlan-21": "10.47.246.5",
+      "kavlan-3": "192.168.229.5",
+      "kavlan-4": "10.4.5.5",
+      "kavlan-5": "10.4.69.5",
+      "kavlan-6": "10.4.133.5",
+      "kavlan-7": "10.4.197.5",
+      "kavlan-8": "10.5.5.5",
+      "kavlan-9": "10.5.69.5"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.15",
+      "kavlan-11": "10.7.246.15",
+      "kavlan-12": "10.11.246.15",
+      "kavlan-13": "10.15.246.15",
+      "kavlan-14": "10.19.246.15",
+      "kavlan-16": "10.27.246.15",
+      "kavlan-17": "10.31.246.15",
+      "kavlan-18": "10.35.246.15",
+      "kavlan-2": "192.168.213.15",
+      "kavlan-20": "10.43.246.15",
+      "kavlan-21": "10.47.246.15",
+      "kavlan-3": "192.168.229.15",
+      "kavlan-4": "10.4.5.15",
+      "kavlan-5": "10.4.69.15",
+      "kavlan-6": "10.4.133.15",
+      "kavlan-7": "10.4.197.15",
+      "kavlan-8": "10.5.5.15",
+      "kavlan-9": "10.5.69.15"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.25",
+      "kavlan-11": "10.7.246.25",
+      "kavlan-12": "10.11.246.25",
+      "kavlan-13": "10.15.246.25",
+      "kavlan-14": "10.19.246.25",
+      "kavlan-16": "10.27.246.25",
+      "kavlan-17": "10.31.246.25",
+      "kavlan-18": "10.35.246.25",
+      "kavlan-2": "192.168.213.25",
+      "kavlan-20": "10.43.246.25",
+      "kavlan-21": "10.47.246.25",
+      "kavlan-3": "192.168.229.25",
+      "kavlan-4": "10.4.5.25",
+      "kavlan-5": "10.4.69.25",
+      "kavlan-6": "10.4.133.25",
+      "kavlan-7": "10.4.197.25",
+      "kavlan-8": "10.5.5.25",
+      "kavlan-9": "10.5.69.25"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::5",
+      "kavlan-11": "2001:660:4406:1a0:10d::5",
+      "kavlan-12": "2001:660:4406:2a0:10d::5",
+      "kavlan-13": "2001:660:4406:4a0:10d::5",
+      "kavlan-14": "2001:660:4406:5a0:10d::5",
+      "kavlan-16": "2001:660:4406:7a0:10d::5",
+      "kavlan-17": "2001:660:4406:9a0:10d::5",
+      "kavlan-18": "2001:660:4406:8a0:10d::5",
+      "kavlan-2": "2001:660:4406:181:d::5",
+      "kavlan-20": "2001:660:4406:3a0:10d::5",
+      "kavlan-21": "2001:660:4406:6a0:10d::5",
+      "kavlan-3": "2001:660:4406:182:d::5",
+      "kavlan-4": "2001:660:4406:190:d::5",
+      "kavlan-5": "2001:660:4406:191:d::5",
+      "kavlan-6": "2001:660:4406:192:d::5",
+      "kavlan-7": "2001:660:4406:193:d::5",
+      "kavlan-8": "2001:660:4406:194:d::5",
+      "kavlan-9": "2001:660:4406:195:d::5"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:5",
+      "kavlan-2": "2001:660:4406:181:d:1:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:5",
+      "kavlan-3": "2001:660:4406:182:d:1:0:5",
+      "kavlan-4": "2001:660:4406:190:d:1:0:5",
+      "kavlan-5": "2001:660:4406:191:d:1:0:5",
+      "kavlan-6": "2001:660:4406:192:d:1:0:5",
+      "kavlan-7": "2001:660:4406:193:d:1:0:5",
+      "kavlan-8": "2001:660:4406:194:d:1:0:5",
+      "kavlan-9": "2001:660:4406:195:d:1:0:5"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:5",
+      "kavlan-2": "2001:660:4406:181:d:2:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:5",
+      "kavlan-3": "2001:660:4406:182:d:2:0:5",
+      "kavlan-4": "2001:660:4406:190:d:2:0:5",
+      "kavlan-5": "2001:660:4406:191:d:2:0:5",
+      "kavlan-6": "2001:660:4406:192:d:2:0:5",
+      "kavlan-7": "2001:660:4406:193:d:2:0:5",
+      "kavlan-8": "2001:660:4406:194:d:2:0:5",
+      "kavlan-9": "2001:660:4406:195:d:2:0:5"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.5",
       "ip6": "2001:660:4406:100:d::5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d8",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.11",
       "ip6": "2001:660:4406:100:d:1:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d9",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.17",
       "ip6": "2001:660:4406:100:d:2:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:f0",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
index a27bb6c14ad4e9ab9c5f8564b18a67b8584b699d..0d359283de60dce1d16e1fb640a154a056d35c81 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.6",
+      "kavlan-11": "10.7.246.6",
+      "kavlan-12": "10.11.246.6",
+      "kavlan-13": "10.15.246.6",
+      "kavlan-14": "10.19.246.6",
+      "kavlan-16": "10.27.246.6",
+      "kavlan-17": "10.31.246.6",
+      "kavlan-18": "10.35.246.6",
+      "kavlan-2": "192.168.213.6",
+      "kavlan-20": "10.43.246.6",
+      "kavlan-21": "10.47.246.6",
+      "kavlan-3": "192.168.229.6",
+      "kavlan-4": "10.4.5.6",
+      "kavlan-5": "10.4.69.6",
+      "kavlan-6": "10.4.133.6",
+      "kavlan-7": "10.4.197.6",
+      "kavlan-8": "10.5.5.6",
+      "kavlan-9": "10.5.69.6"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.16",
+      "kavlan-11": "10.7.246.16",
+      "kavlan-12": "10.11.246.16",
+      "kavlan-13": "10.15.246.16",
+      "kavlan-14": "10.19.246.16",
+      "kavlan-16": "10.27.246.16",
+      "kavlan-17": "10.31.246.16",
+      "kavlan-18": "10.35.246.16",
+      "kavlan-2": "192.168.213.16",
+      "kavlan-20": "10.43.246.16",
+      "kavlan-21": "10.47.246.16",
+      "kavlan-3": "192.168.229.16",
+      "kavlan-4": "10.4.5.16",
+      "kavlan-5": "10.4.69.16",
+      "kavlan-6": "10.4.133.16",
+      "kavlan-7": "10.4.197.16",
+      "kavlan-8": "10.5.5.16",
+      "kavlan-9": "10.5.69.16"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.26",
+      "kavlan-11": "10.7.246.26",
+      "kavlan-12": "10.11.246.26",
+      "kavlan-13": "10.15.246.26",
+      "kavlan-14": "10.19.246.26",
+      "kavlan-16": "10.27.246.26",
+      "kavlan-17": "10.31.246.26",
+      "kavlan-18": "10.35.246.26",
+      "kavlan-2": "192.168.213.26",
+      "kavlan-20": "10.43.246.26",
+      "kavlan-21": "10.47.246.26",
+      "kavlan-3": "192.168.229.26",
+      "kavlan-4": "10.4.5.26",
+      "kavlan-5": "10.4.69.26",
+      "kavlan-6": "10.4.133.26",
+      "kavlan-7": "10.4.197.26",
+      "kavlan-8": "10.5.5.26",
+      "kavlan-9": "10.5.69.26"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::6",
+      "kavlan-11": "2001:660:4406:1a0:10d::6",
+      "kavlan-12": "2001:660:4406:2a0:10d::6",
+      "kavlan-13": "2001:660:4406:4a0:10d::6",
+      "kavlan-14": "2001:660:4406:5a0:10d::6",
+      "kavlan-16": "2001:660:4406:7a0:10d::6",
+      "kavlan-17": "2001:660:4406:9a0:10d::6",
+      "kavlan-18": "2001:660:4406:8a0:10d::6",
+      "kavlan-2": "2001:660:4406:181:d::6",
+      "kavlan-20": "2001:660:4406:3a0:10d::6",
+      "kavlan-21": "2001:660:4406:6a0:10d::6",
+      "kavlan-3": "2001:660:4406:182:d::6",
+      "kavlan-4": "2001:660:4406:190:d::6",
+      "kavlan-5": "2001:660:4406:191:d::6",
+      "kavlan-6": "2001:660:4406:192:d::6",
+      "kavlan-7": "2001:660:4406:193:d::6",
+      "kavlan-8": "2001:660:4406:194:d::6",
+      "kavlan-9": "2001:660:4406:195:d::6"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:6",
+      "kavlan-2": "2001:660:4406:181:d:1:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:6",
+      "kavlan-3": "2001:660:4406:182:d:1:0:6",
+      "kavlan-4": "2001:660:4406:190:d:1:0:6",
+      "kavlan-5": "2001:660:4406:191:d:1:0:6",
+      "kavlan-6": "2001:660:4406:192:d:1:0:6",
+      "kavlan-7": "2001:660:4406:193:d:1:0:6",
+      "kavlan-8": "2001:660:4406:194:d:1:0:6",
+      "kavlan-9": "2001:660:4406:195:d:1:0:6"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:6",
+      "kavlan-2": "2001:660:4406:181:d:2:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:6",
+      "kavlan-3": "2001:660:4406:182:d:2:0:6",
+      "kavlan-4": "2001:660:4406:190:d:2:0:6",
+      "kavlan-5": "2001:660:4406:191:d:2:0:6",
+      "kavlan-6": "2001:660:4406:192:d:2:0:6",
+      "kavlan-7": "2001:660:4406:193:d:2:0:6",
+      "kavlan-8": "2001:660:4406:194:d:2:0:6",
+      "kavlan-9": "2001:660:4406:195:d:2:0:6"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.6",
       "ip6": "2001:660:4406:100:d::6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:10",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.12",
       "ip6": "2001:660:4406:100:d:1:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:11",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.18",
       "ip6": "2001:660:4406:100:d:2:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:8c",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
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/grenoble/network_equipments/imag-1b-F1-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..bbb44c91399155d0fa4b401f371bab9e8d7de7b2
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.246",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F1-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG44LS104S",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F1-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..24f334f25e96ca9517faabc0c09a7f92eefcf078
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.247",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F2-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG44LS105K",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F2-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..2765c5ef7dd5c39c239666485ad4b5d53d1d5e5f
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.248",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F3-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG43LS10CD",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F3-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index fcaa89b9995689ed4508055184eb639b3452584c..2e0e697d3dd2dd8df19a462cb7b94556fccd4855 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -39,24 +39,28 @@
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/5",
           "uid": "chartreuse2-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/6",
           "uid": "chartreuse2-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/7",
           "uid": "chartreuse2-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/8",
           "uid": "chartreuse2-4"
         },
diff --git a/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json
new file mode 100644
index 0000000000000000000000000000000000000000..85a44348f04782be02b076477671c18c72cd856b
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json
@@ -0,0 +1,249 @@
+{
+  "backplane_bps": 1200000000000,
+  "kind": "hpcswitch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1200000000000,
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-12"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-13"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-14"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-15"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-16"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-17"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-18"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-19"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-20"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-21"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-22"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-23"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-24"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-25"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-26"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-27"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-28"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-29"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-30"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-31"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-32"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-4"
+        }
+      ],
+      "rate": 100000000000
+    }
+  ],
+  "managed_by_us": false,
+  "model": "Intel Omni-Path Edge Switch 100 Series/H1048-OPF",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "opa-grenoble",
+  "warranty": "nil"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..f920b2ff874e8cccab32bb385450eadfe86cc055
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json
@@ -0,0 +1,124 @@
+{
+  "backplane_bps": 10000000000,
+  "ip": "172.17.31.244",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 10000000000,
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "trunk": false,
+          "uid": "skinovis2-prod-01"
+        }
+      ],
+      "rate": 1000000000
+    }
+  ],
+  "managed_by_us": false,
+  "model": "Dell PowerConnect 6248",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "skinovis2-admin-01",
+  "warranty": "2024-12-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
index 94d16164e4cb10109610693ab1b1cf6fae26e073..f3aefd49b6e4db5a6721a15123722e9b100d25d7 100644
--- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
@@ -15,7 +15,7 @@
     },
     {
       "backplane_bps": 400000000000,
-      "kavlan_pattern": "%LINECARD%/%PORT%",
+      "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
       "kind": "node",
       "ports": [
         {
@@ -106,104 +106,44 @@
         {
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/41",
-          "uid": "camera-1"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/42",
-          "uid": "camera-2"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/43",
-          "uid": "camera-3"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/44",
-          "uid": "camera-4"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/45",
-          "uid": "camera-5"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/46",
-          "uid": "camera-6"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/47",
-          "uid": "camera-7"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/48",
-          "uid": "camera-8"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/49",
-          "uid": "camera-9"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/50",
-          "uid": "camera-10"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/51",
-          "uid": "camera-11"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/52",
-          "uid": "camera-12"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/53",
-          "uid": "camera-13"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/54",
-          "uid": "camera-14"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/55",
-          "uid": "camera-15"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/56",
-          "uid": "camera-16"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/57",
-          "uid": "camera-17"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/58",
-          "uid": "camera-18"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/59",
-          "uid": "camera-20"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/60",
-          "uid": "camera-21"
         },
         {
         },
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json b/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json
new file mode 100644
index 0000000000000000000000000000000000000000..9cbf485f86b5f01a1ba9c1fb6946db2c7cc873d4
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json
@@ -0,0 +1,143 @@
+{
+  "kind": "hpcswitch",
+  "linecards": [
+    {
+    },
+    {
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-12"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-12"
+        }
+      ],
+      "rate": 100000000000
+    }
+  ],
+  "managed_by_us": false,
+  "model": "Mellanox IB switch",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-ib-mellanox",
+  "warranty": "nil"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/dighyp1.json b/data/grid5000/sites/grenoble/servers/dighyp1.json
index 38c7bca6f16fdd68a816f8a778d5c072f9955dea..4b9ff9a93863905caaf4283480f7dbb23f753694 100644
--- a/data/grid5000/sites/grenoble/servers/dighyp1.json
+++ b/data/grid5000/sites/grenoble/servers/dighyp1.json
@@ -1,7 +1,6 @@
 {
   "alias": [
-    "adminfront",
-    "af"
+
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/dignfs.json b/data/grid5000/sites/grenoble/servers/dignfs.json
index c37e60b6d0936cbe712c64fe6012eba11f1b225f..e09e9f595368f8b9134e0f676ce96de72a0f7c49 100644
--- a/data/grid5000/sites/grenoble/servers/dignfs.json
+++ b/data/grid5000/sites/grenoble/servers/dignfs.json
@@ -1,12 +1,7 @@
 {
   "alias": [
-
+    "storage1-old"
   ],
-  "group_storage": {
-    "name": "storage1",
-    "rate": 50000000000,
-    "size": 55000000000000
-  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/digsed.json b/data/grid5000/sites/grenoble/servers/digsed.json
index eb05ecb00099c130ccb1ccf0d40aa0b6c751c993..88852064e9c00dc0f69b6922f289656ed618655c 100644
--- a/data/grid5000/sites/grenoble/servers/digsed.json
+++ b/data/grid5000/sites/grenoble/servers/digsed.json
@@ -11,7 +11,8 @@
       "ip": "172.17.30.4"
     },
     "default": {
-      "ip": "172.16.31.4"
+      "ip": "172.16.31.4",
+      "mac": "EC:F4:BB:CF:C2:98"
     }
   },
   "redfish": true,
diff --git a/data/grid5000/sites/grenoble/servers/digwatt.json b/data/grid5000/sites/grenoble/servers/digwatt.json
index df5a4dfbf0fee1f659c846779dc63efe51c83069..afc81fa8c32ca72ee4145a1209eb537d7e53103e 100644
--- a/data/grid5000/sites/grenoble/servers/digwatt.json
+++ b/data/grid5000/sites/grenoble/servers/digwatt.json
@@ -11,7 +11,8 @@
       "ip": "172.17.30.9"
     },
     "default": {
-      "ip": "172.16.31.9"
+      "ip": "172.16.31.9",
+      "mac": "F8:F2:1E:23:EF:20"
     }
   },
   "redfish": true,
diff --git a/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json b/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json
deleted file mode 100644
index c5075a92c9fb8566381c4f7cd62c01a0864569af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/servers/pneyron-spack-vm.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "expire": "2024-03",
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.29.1"
-    }
-  },
-  "type": "server",
-  "uid": "pneyron-spack-vm"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/pve-1.json b/data/grid5000/sites/grenoble/servers/pve-1.json
index 8cc9fb6a71a300075dc5f1b131a80122adeb3c1f..6c6fb5210f4eafc4ca4a80fa5b8e226f7d1c137b 100644
--- a/data/grid5000/sites/grenoble/servers/pve-1.json
+++ b/data/grid5000/sites/grenoble/servers/pve-1.json
@@ -1,6 +1,7 @@
 {
   "alias": [
-    "ntp"
+    "ntp",
+    "adminfront"
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data.json b/data/grid5000/sites/grenoble/servers/srv-data.json
index 62aef659dd0da281ccbf54604172016ab3508b74..8408728369c402285366f0e857f6ae0592ac0178 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data.json
@@ -6,6 +6,11 @@
     "modules",
     "storage1"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 25000000000,
+    "size": 162001569447936
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data2.json b/data/grid5000/sites/grenoble/servers/srv-data2.json
index bc2a372a3d0c720ee2260717bca32272538ec99a..1f31630c8570afc084ac3a8a55e57024d8fbaf6d 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data2.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data2.json
@@ -2,6 +2,11 @@
   "alias": [
     "storage2"
   ],
+  "group_storage": {
+    "name": "storage2",
+    "rate": 25000000000,
+    "size": 162001569447936
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data3.json b/data/grid5000/sites/grenoble/servers/srv-data3.json
index a3cf93ee0e9cc97c430da31d55df52bf4bfaedae..33219ccb7a702cde0bbd80f6e9aa1f05821a045b 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data3.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data3.json
@@ -2,6 +2,11 @@
   "alias": [
     "storage3"
   ],
+  "group_storage": {
+    "name": "storage3",
+    "rate": 100000000000,
+    "size": 360003477176320
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
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/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 79955ce2648fde1c1e5ad8165c54e08b5687ffc1..ece4656e493f40f29e8b99001dbc6995fa0ae814 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -18,6 +18,12 @@
       "port": "port-channel4",
       "rate": 20000000000,
       "uid": "granche-srv2"
+    },
+    "port-channel5": {
+      "kind": "server",
+      "port": "port-channel5",
+      "rate": 10000000000,
+      "uid": "pve-3"
     }
   },
   "ip": "172.17.47.222",
@@ -84,8 +90,14 @@
           "uid": "port-channel4"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/19",
+          "uid": "port-channel5"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/20",
+          "uid": "port-channel5"
         },
         {
           "kind": "server",
diff --git a/data/grid5000/sites/lille/servers/gardin.json b/data/grid5000/sites/lille/servers/pve-3.json
similarity index 70%
rename from data/grid5000/sites/lille/servers/gardin.json
rename to data/grid5000/sites/lille/servers/pve-3.json
index f3f18c49a9fc2716ebc2f309f1f60d4a9d3cf6cf..2fa8d3dd8209e1b95fad91e7c4e53a145d6e3c09 100644
--- a/data/grid5000/sites/lille/servers/gardin.json
+++ b/data/grid5000/sites/lille/servers/pve-3.json
@@ -1,9 +1,16 @@
 {
   "kind": "physical",
   "network_adapters": {
+    "adm": {
+      "ip": "172.17.47.9"
+    },
     "bmc": {
       "ip": "172.17.46.9",
       "mac": "54:48:10:f4:f9:0c"
+    },
+    "default": {
+      "ip": "172.16.47.9",
+      "mac": "24:6e:96:dc:f4:2c"
     }
   },
   "pdu": [
@@ -19,6 +26,6 @@
   "redfish": true,
   "serial": "2SYTKQ2",
   "type": "server",
-  "uid": "gardin",
+  "uid": "pve-3",
   "warranty": "2025-06-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
index adedd8dca0f343b79bcc5ce7aed96a5e9b84c33f..1c01c2899e5b271babf86f809cac8b300994a4a3 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
index 896b5c92fc8a8fd63a158327899f3abfc9b55fda..00450af561e89d3390269a1aa2804d824d3a884c 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
index f698f26af0ce2a7cfb18c235c097f4f7388210aa..1f416ce2350559b8018ebbc0c9e14d83a44ac645 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
index 36304776264e783a67b9da7f6a0ebca98a2393e6..8a29f1e70d55dd93515c4d6841a662a5b4496ba9 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
index f80e89a38c25a2da5b70b6ff3badc13a34de020a..ee1d7e401a894ee195130d7b0c3e3dd93e8e3408 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
index 9151a481fcc64b31e58e2bb85f6bf62325ed4c81..a37aa0ca27f596492f7f58e299a2e62cbccc4426 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
index 4cd0b0618a89648d54d8d43c5fed907165116c3b..3b3045aec8b09e67dc1029a4f0da09fda277bfa1 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
index c7021c37d6bc2c81bea0540b24690d1b24d132ef..1a09f3820ce03428d7327dee34906d22ff3bfe10 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
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/nancy/servers/talc-data.json b/data/grid5000/sites/nancy/servers/talc-data.json
index 0d5d88b83d9b11ff1c1e76fdc8dd653f1b896cb5..b316ffcbc32ded25ea33605a63a54fe9248c5de3 100644
--- a/data/grid5000/sites/nancy/servers/talc-data.json
+++ b/data/grid5000/sites/nancy/servers/talc-data.json
@@ -1,12 +1,7 @@
 {
   "alias": [
-    "storage3"
+
   ],
-  "group_storage": {
-    "name": "storage3",
-    "rate": 10000000000,
-    "size": 180000000000000
-  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {
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/nantes/clusters/ecotype/nodes/ecotype-1.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
index 6daa1adf29f6fdbd1c6f81fb8bbf26b28cddb07d..d112af6b583b5743b221162fa356f95a7a8ba9d5 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
index 00c6acb8d49e8a075d4eb1c7c4f0c2b2326485b8..b59cc5f8ea586a486df69e78672c7a967ef23289 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
index 27219c1a82c8560ccad257b6924d2216ef8e4a6a..94b6978e09615120ada9584dabaffc5d381d1ee0 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
index 2df8edc9185f1282956473b622b1293bfcfd5e79..4f0aeb9945b7a09c5618e5297213ae9ac34639ef 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
index 9177e003e0af7ebaca1ecc217bd0e4b63df7f10f..68214a004d1c2eeabc3509a81d3c1df2196e737c 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
index 3e67f67cdec95e4ca321e5a5586685e8944f4eae..362f1ef50e14a8061fe1e70c68c03e8550413ea8 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
index 41b233ae4d793b46511feca859ecfa5bead63af4..a835073509e32c128db3ffe85755b8090b3f09be 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
index 0272c51db31ef953173e82270bcc282f586eeee0..5c088a8b929b7e3c86680d2a5713ae8f3f1afdf1 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
index 2fd2e3e3e63660ecf36946ed571a3b7bcca9a233..d5f6339f7ddffdfa2714a96b73c146698e0d5d88 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
index 9cbc6b2fa90a4896ba09f736e92f569782b9e115..6ee6a2fbf52fcf31fc9eee53fb396c4aeeb181c6 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
index 3d699fe608fba518e1686eafcb57c9cda2d5d535..bb40a0ec0fc657f64869f7d50e3940549dd5c15e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
index 41499639360af86f55cd054eac3cadbbc189351f..561185bff102edb1bedba67f202cb2770c50d2f9 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
index 22e4e2f3fe28f24855eab5ea64749a67bcb67f28..258c0d5130eaa4d6760fe75c3a5390fa8350782a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
index 7d807a4b56a4db29a0dc50065271c91eaa773660..e9a92284afb5714898f02170a747bb8a3f517111 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
index 554f985c835f6b6bc5b00fddf39aa27d39ca2a4c..b5eb615b5a5f52b1fb6ac6e01a1e0b1a05dd0182 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
index 4dddbf85d20a18776cc22ddb62223e15a22dee0a..03422d932482b29546d3695a115f7bb8a23ae940 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
index d1e6f1a349b15c02d0d180f8cf026137eb33a296..f083815f4f9f34c7b5065517f89f0edc6391e6e8 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
index 175c12563c648654d0b09697c3d85404889797af..64217622f70bc2ddb83186ae9299b54ce38bb653 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
index ac53d3030f113dd03756fadb4f3a3572c8665189..435a8e2ea10ad98c1daad6e8a336b74a899e495e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
index 527a49085d096260a22b76912b7c102549fb0521..b158337fc956f080e063548c3294e23f79d91b3a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
index 13cd028e4b1c0ce7b068219d57d21e15c0210026..77928764f5d33b811f6b25dbfc33b68f9c6d0849 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
index 4938edb482eaa3285f11bbd97e6ea5343caadf52..80d6efe67c946956271759a79760282fac6cc447 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
index 83eb49f809fd43007fdd00a2bf73a0b51a6d319a..644ee0b0b29f1a1c949ed0ee073ff1a247ea9dd3 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
index 70e27ef98f67c54a5f041e47182a6a9f3cba2830..7ec10035acdd522cfa1288eb011d77bb4fe5e010 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
index 7c9793f2103476897d563c2fd500b44dfdd37b66..02638ad0d3e28578d8917430346664fc2d9c191e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
index 343ccbce9eaa3ec5157ef6ff757100579f9e7936..f3262497b7254620791914a8992d834c393400af 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
index 5232ed946ba3094b7c6d65edbb24bf2479ad3286..e182dded551c0a0ea73846bddcbf8dbcefbe73af 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
index 5e0d776a49ace7cfe45a4e837772d23d63cacdc9..a35f00761b862a238f9da2441ae9b9c042a4b6f5 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
index 3052afa8969d182e93e9be6781231312ff5dcf63..9afa56db9614b609bc30f91f75d12b0b27724d0a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
index ab1e640cb5959ec6fe4fc4e2c5afaf2c60779cea..e6ef81f4e6dfcef1fa69cf7a609f9848adfb51a1 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
index 9d2ecb46dece6532a7cd1b904dc236f7ba5894ca..b89105eebaadf7c601150af0dbbff4829c20fbde 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
index fd68e9d3cde7e77fbecf2c215c0f00e5b9b0c1b3..f540aa2d9ced03b880377ffca9bcfadd73747ce8 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
index c01220a3dbc8ead6a01fb60a186ace13938da85d..2e9ff871d15296a86eae2888e167d36c2e047c68 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
index 988aebcf2356a4e8fc541910e45eb827b0ab629e..7db9761797fdd286b3125e454e36fc1354d5ed69 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
index de67d61fe196ca9a99ad44dbab14fc620f0645e5..28f71ee6aaa9a9618c592135ce3919e53ebf4b47 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
index 20c0315976810830fbf286de13b89fe2d4ae3f19..34a7ade55fc79ebcaa3333974b578bead5bec346 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
index c2126e82508ce8b589abadbfea8cc9a213b7de1a..1ac0804551f9b2457b54f853f2cf61941ae8b098 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
index 9a45a251fd68ac59f3ff59128a0cb119693f01d6..d9cfc86d368f065534c6c5f47fb52f19cac02819 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
index 5cba9306344688d8a0abd3c6bbb0a35aa213da2e..aba3689993c2d6fa966c57ac03db896263d75295 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
index ba4111261282b4cbcb0bcd99c0f59077eb952af7..6768283fd356ef62125e0c27760179b87386b51e 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
index 535fae21184bb70dcbc208bc91ace0a7e07e94f9..d7e8515520162c2c0b42fb099493bfe887c4f884 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
index 43356e54fe4d95a19af1a9f350b4dd9a79fe215c..c99bb254a1a657a31383c43f931e94595155a83d 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
index 88e0fafe7866ab6898a6dbfe8e4a434f75e9a6fc..a3d404e98bc06072d12d724c7b329ffecc5f0e74 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
index e71f4fee4a37d715ead353b7b63b8d37ea150313..db513232bd6c5c5cf796c2eebf943a5ffce5e202 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
index e25b72fe21b3412d786e4c00b1845856daf92f2c..a442df3415285ba37454c4a5afa2fd7bb61ff5a6 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
index 1a378ceaaea812bc42d51cf97481b063a84eb35a..7b6ee0aacfb99847356303fb022d8df7d0a1580a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
index 6d4c5ce9363537b6407010b43bb42e8b30c2a851..1c2cc60edae0c8f0db42167ac427e12c6ffc4a41 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
index dcfda977871e6df5143ef905e12f03d5c4c704df..4ed6959435a15fa3bc06c3a9496078a252041e31 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "06/27/2022",
+    "release_date": "12/12/2023",
     "vendor": "Dell Inc.",
-    "version": "2.15.0"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.83.83.83",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2017-07-11",
     "manufacturer": "Dell Inc.",
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/abacus27/nodes/abacus27-1.json b/data/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.json
index c0620bd001771e4e09ce6282f608e83b5cf4dcbc..eda1a490c18f92a19b84e616055b3b0c025aba2d 100644
--- a/data/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.json
@@ -35,7 +35,7 @@
         "fp-64": 30000000000000
       },
       "power_default_limit": "310.00 W",
-      "vbios_version": "96.00.74.00.11",
+      "vbios_version": "96.00.AF.00.02",
       "vendor": "Nvidia"
     },
     "nvidia1": {
@@ -52,7 +52,7 @@
         "fp-64": 30000000000000
       },
       "power_default_limit": "310.00 W",
-      "vbios_version": "96.00.74.00.11",
+      "vbios_version": "96.00.AF.00.02",
       "vendor": "Nvidia"
     },
     "nvidia2": {
diff --git a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
index 4e433514e00d795f17618c0e9ba5545c5e994100..8df3f37f77b3a0991ed3c54c0ef125ece65796ac 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
@@ -5,13 +5,416 @@
   "kavlan": true,
   "manufactured_at": "2020-12-05",
   "metrics": [
-
+    {
+      "description": "Front node ambient temperature reported by BMC, in celsius",
+      "name": "bmc_ambient_temp_celsius",
+      "period": 5000,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Power consumption of node reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Voltage of PSU 1 reported by BMC, in volt",
+      "labels": {
+        "psu": "1"
+      },
+      "name": "bmc_psu_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Voltage of PSU 2 reported by BMC, in volt",
+      "labels": {
+        "psu": "2"
+      },
+      "name": "bmc_psu_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Current of PSU 1 reported by BMC, in amp",
+      "labels": {
+        "psu": "1"
+      },
+      "name": "bmc_psu_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Current of PSU 2 reported by BMC, in amp",
+      "labels": {
+        "psu": "2"
+      },
+      "name": "bmc_psu_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
+      "name": "bmc_node_power_watthour_total",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 1A reported by BMC, in rpm",
+      "labels": {
+        "fan": "1a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 1B reported by BMC, in rpm",
+      "labels": {
+        "fan": "1b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 2A reported by BMC, in rpm",
+      "labels": {
+        "fan": "2a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 2B reported by BMC, in rpm",
+      "labels": {
+        "fan": "2b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 3A reported by BMC, in rpm",
+      "labels": {
+        "fan": "3a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 3B reported by BMC, in rpm",
+      "labels": {
+        "fan": "3b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 4A reported by BMC, in rpm",
+      "labels": {
+        "fan": "4a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 4B reported by BMC, in rpm",
+      "labels": {
+        "fan": "4b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 5A reported by BMC, in rpm",
+      "labels": {
+        "fan": "5a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 5B reported by BMC, in rpm",
+      "labels": {
+        "fan": "5b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 6A reported by BMC, in rpm",
+      "labels": {
+        "fan": "6a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 6B reported by BMC, in rpm",
+      "labels": {
+        "fan": "6b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 7A reported by BMC, in rpm",
+      "labels": {
+        "fan": "7a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 7B reported by BMC, in rpm",
+      "labels": {
+        "fan": "7b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 8A reported by BMC, in rpm",
+      "labels": {
+        "fan": "8a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 8B reported by BMC, in rpm",
+      "labels": {
+        "fan": "8b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of CPU 1 reported by BMC, in celsius",
+      "labels": {
+        "cpu": "1"
+      },
+      "name": "bmc_cpu_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of CPU 2 reported by BMC, in celsius",
+      "labels": {
+        "cpu": "2"
+      },
+      "name": "bmc_cpu_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of exhausted air reported by BMC, in celsius",
+      "name": "bmc_exhaust_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
   ],
   "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",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.json b/data/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.json
index 71e5d372a8e271687cb9ec848d4aa36bdfbc35d9..1bdb7df1bd78342a13519490bd1ec0c93d69755a 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.json
@@ -210,7 +210,7 @@
       "device": "eth0",
       "driver": "i40e",
       "enabled": true,
-      "firmware_version": "7.10 0x800075da 19.5.12",
+      "firmware_version": "9.50 0x8000f253 23.0.8",
       "interface": "Ethernet",
       "ip": "172.16.109.31",
       "ip6": "2001:660:4406:700:e::1f",
@@ -233,7 +233,7 @@
       "device": "eth1",
       "driver": "igb",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.5.12",
+      "firmware_version": "1.67, 0x8000121e, 23.0.8",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "78:ac:44:15:dc:ec",
@@ -250,7 +250,7 @@
       "device": "eth2",
       "driver": "igb",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.5.12",
+      "firmware_version": "1.67, 0x8000121e, 23.0.8",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "78:ac:44:15:dc:ed",
@@ -267,7 +267,7 @@
       "device": "eth3",
       "driver": "i40e",
       "enabled": false,
-      "firmware_version": "7.10 0x800075da 19.5.12",
+      "firmware_version": "9.50 0x8000f253 23.0.8",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "78:ac:44:15:dc:ce",
@@ -332,7 +332,7 @@
     {
       "by_id": "/dev/disk/by-id/wwn-0x500a075129665976",
       "by_path": "/dev/disk/by-path/pci-0000:04:00.0-ata-1",
-      "firmware_version": "D3DJ004",
+      "firmware_version": "D3DJ008",
       "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAV480TDS",
@@ -344,10 +344,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
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..c89292bee6514540d5941421897d2f59427f86e4 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
@@ -79,10 +79,12 @@
     }
   ],
   "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",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
index f398151288d4dc068c50f83fed8e1c0e6c38bcf9..93fc8a9e31e08b4c1147bba49565577173419819 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
@@ -288,10 +288,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
index d8cd4e26fbcad3e6cd83b48fbccf4c2cd349ec3e..3257f3e2317d7e64b8bbcdcd4c9e42a8e67205a2 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
@@ -288,10 +288,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
index 67ce6b72ebe6c40bb362284679f5f27ba78f596d..cb00a9a9550866baab4d86442c0afdd31320c098 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
@@ -271,10 +271,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
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/esterel5/esterel5.json b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
new file mode 100644
index 0000000000000000000000000000000000000000..40d5351452f6e8914e984952544b6ced422a4f0a
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
@@ -0,0 +1,93 @@
+{
+  "boot_type": "bios",
+  "created_at": "Tue, 25 Feb 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2016-06-08",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge T630",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 3 GPUs GeForce GTX 1080, 128GB RAM, 1862GB HDD, 1489GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201706,
+  "queues": [
+    "admin",
+    "production"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel5",
+  "warranty_end": "2021-06-08"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..279b123d3b6422643ef7cc502b58b311a3b80947
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
@@ -0,0 +1,272 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-06-08",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "HHS9DD2",
+    "warranty_end": "2021-06-08"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.5",
+      "ip6": "2001:660:4406:800:4::5",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ab",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "esterel5-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/14",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ac",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.35.5100",
+      "guid": "0xe41d2d0300508681",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.5",
+      "kavlan": false,
+      "mac": "e4:1d:2d:03:00:50:86:81",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel5-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.5",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ad",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel5-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 35200000000,
+    "node_flops": 704000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2200000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
+    "vendor": "Intel",
+    "version": "E5-2630 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da05237da001ef5b1a60da52fd9",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da05237da001efabb4d24dc5b3f",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H730 Adp",
+      "size": 1599741100032,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 604800,
+    "queues": [
+      "admin",
+      "production"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel5-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..be57458d79d7da741bbc603d0a6a2452a92aa643
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
@@ -0,0 +1,272 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-03-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "987KXJ2",
+    "warranty_end": "2022-03-30"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.6",
+      "ip6": "2001:660:4406:800:4::6",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9a",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "esterel5-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/15",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9b",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5120",
+      "guid": "0x248a070300f05191",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.6",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:f0:51:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel5-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.6",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel5-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 35200000000,
+    "node_flops": 704000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2200000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
+    "vendor": "Intel",
+    "version": "E5-2630 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909b777e55a3d0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909ca6905c1450",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H730 Adp",
+      "size": 1599741100032,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 604800,
+    "queues": [
+      "admin",
+      "production"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel5-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json b/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json
new file mode 100644
index 0000000000000000000000000000000000000000..7171e7c7aae3cb035a014f00f1159f3fa238c892
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json
@@ -0,0 +1,93 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 06 Mar 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2017-05-23",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge T630",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 4 GPUs GeForce GTX 1080 Ti, 128GB RAM, 931GB HDD, 372GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201805,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel7",
+  "warranty_end": "2022-05-23"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..b44ebe98ec57b1a1a4166b480793fdbdee6ac00d
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json
@@ -0,0 +1,329 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-05-23",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "BB6T5K2",
+    "warranty_end": "2022-05-23"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia3",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.8",
+      "ip6": "2001:660:4406:800:4::8",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:11",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel7-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/17",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:12",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5000",
+      "guid": "0x248a070300fb51d1",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.8",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:fb:51:d1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel7-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.8",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:13",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel7-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel7",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 33600000000,
+    "node_flops": 537600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "E5-2620 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c148002f61567d1024a677",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 999653638144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1480020e920b809a7ae57",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 399431958528,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel7-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..49eb1dbc05fc21ef6a5099f096b032988b483c5d
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json
@@ -0,0 +1,329 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-05-23",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "BB6Q5K2",
+    "warranty_end": "2022-05-23"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia3",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.9",
+      "ip6": "2001:660:4406:800:4::9",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:cc",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel7-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/18",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:cd",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5000",
+      "guid": "0x248a070300fb5091",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.9",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:fb:50:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel7-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.9",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:ce",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel7-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel7",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 33600000000,
+    "node_flops": 537600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "E5-2620 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1d4002f6154b62e16b462",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 999653638144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1d40020e9202d121ae4dc",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 399431958528,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel7-2"
+}
\ No newline at end of file
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/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
new file mode 100644
index 0000000000000000000000000000000000000000..a7ffddbcf1ca84036cab6ed45e1744034e3782eb
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
@@ -0,0 +1,66 @@
+{
+  "boot_type": "bios",
+  "created_at": "Mon, 24 Feb 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": true,
+  "manufactured_at": "2019-07-30",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge C6420",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6240, 18 cores/CPU, 384GB RAM, 558GB HDD, 893GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201907,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "mercantour5",
+  "warranty_end": "2026-07-31"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e3c8c0cb61f654e8c284eb994f1cd486fb843c8
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -0,0 +1,266 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 36,
+    "nb_procs": 2,
+    "nb_threads": 72,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2019-07-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F8FVSY2",
+    "warranty_end": "2026-07-31"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.196.42",
+      "kavlan-11": "10.7.229.42",
+      "kavlan-12": "10.11.229.42",
+      "kavlan-13": "10.15.229.42",
+      "kavlan-14": "10.19.229.42",
+      "kavlan-16": "10.27.229.42",
+      "kavlan-17": "10.31.229.42",
+      "kavlan-18": "10.35.229.42",
+      "kavlan-2": "192.168.212.42",
+      "kavlan-20": "10.43.229.42",
+      "kavlan-21": "10.47.229.42",
+      "kavlan-3": "192.168.228.42",
+      "kavlan-4": "10.32.4.42",
+      "kavlan-5": "10.32.68.42",
+      "kavlan-6": "10.32.132.42",
+      "kavlan-7": "10.32.196.42",
+      "kavlan-8": "10.33.4.42",
+      "kavlan-9": "10.33.68.42"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:880:3::2a",
+      "kavlan-11": "2001:660:4406:1a0:803::2a",
+      "kavlan-12": "2001:660:4406:2a0:803::2a",
+      "kavlan-13": "2001:660:4406:4a0:803::2a",
+      "kavlan-14": "2001:660:4406:5a0:803::2a",
+      "kavlan-16": "2001:660:4406:7a0:803::2a",
+      "kavlan-17": "2001:660:4406:9a0:803::2a",
+      "kavlan-18": "2001:660:4406:8a0:803::2a",
+      "kavlan-2": "2001:660:4406:881:3::2a",
+      "kavlan-20": "2001:660:4406:3a0:803::2a",
+      "kavlan-21": "2001:660:4406:6a0:803::2a",
+      "kavlan-3": "2001:660:4406:882:3::2a",
+      "kavlan-4": "2001:660:4406:890:3::2a",
+      "kavlan-5": "2001:660:4406:891:3::2a",
+      "kavlan-6": "2001:660:4406:892:3::2a",
+      "kavlan-7": "2001:660:4406:893:3::2a",
+      "kavlan-8": "2001:660:4406:894:3::2a",
+      "kavlan-9": "2001:660:4406:895:3::2a"
+    }
+  },
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
+      "interface": "Ethernet",
+      "ip": "172.16.130.42",
+      "ip6": "2001:660:4406:800:3::2a",
+      "kavlan": true,
+      "mac": "6c:2b:59:9c:4a:32",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "mercantour5-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-3",
+      "switch_port": "1/1/28",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0x98039b0300e903e1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.42",
+      "kavlan": false,
+      "mac": "98:03:9b:03:00:e9:03:e1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour5-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.42",
+      "kavlan": false,
+      "mac": "6c:2b:59:9c:48:65",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour5-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 83200000000,
+    "node_flops": 2995200000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 25952256,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "Gold 6240"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9a320761ff0b",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H330 Mini",
+      "size": 599550590976,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9b290daa83e8",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H330 Mini",
+      "size": 959119884288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "mercantour5-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9e9ea1ea84a313f22f5e7e0e12761e6eed639ba
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -0,0 +1,266 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 36,
+    "nb_procs": 2,
+    "nb_threads": 72,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2019-07-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "D8FVSY2",
+    "warranty_end": "2026-07-31"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.196.43",
+      "kavlan-11": "10.7.229.43",
+      "kavlan-12": "10.11.229.43",
+      "kavlan-13": "10.15.229.43",
+      "kavlan-14": "10.19.229.43",
+      "kavlan-16": "10.27.229.43",
+      "kavlan-17": "10.31.229.43",
+      "kavlan-18": "10.35.229.43",
+      "kavlan-2": "192.168.212.43",
+      "kavlan-20": "10.43.229.43",
+      "kavlan-21": "10.47.229.43",
+      "kavlan-3": "192.168.228.43",
+      "kavlan-4": "10.32.4.43",
+      "kavlan-5": "10.32.68.43",
+      "kavlan-6": "10.32.132.43",
+      "kavlan-7": "10.32.196.43",
+      "kavlan-8": "10.33.4.43",
+      "kavlan-9": "10.33.68.43"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:880:3::2b",
+      "kavlan-11": "2001:660:4406:1a0:803::2b",
+      "kavlan-12": "2001:660:4406:2a0:803::2b",
+      "kavlan-13": "2001:660:4406:4a0:803::2b",
+      "kavlan-14": "2001:660:4406:5a0:803::2b",
+      "kavlan-16": "2001:660:4406:7a0:803::2b",
+      "kavlan-17": "2001:660:4406:9a0:803::2b",
+      "kavlan-18": "2001:660:4406:8a0:803::2b",
+      "kavlan-2": "2001:660:4406:881:3::2b",
+      "kavlan-20": "2001:660:4406:3a0:803::2b",
+      "kavlan-21": "2001:660:4406:6a0:803::2b",
+      "kavlan-3": "2001:660:4406:882:3::2b",
+      "kavlan-4": "2001:660:4406:890:3::2b",
+      "kavlan-5": "2001:660:4406:891:3::2b",
+      "kavlan-6": "2001:660:4406:892:3::2b",
+      "kavlan-7": "2001:660:4406:893:3::2b",
+      "kavlan-8": "2001:660:4406:894:3::2b",
+      "kavlan-9": "2001:660:4406:895:3::2b"
+    }
+  },
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
+      "interface": "Ethernet",
+      "ip": "172.16.130.43",
+      "ip6": "2001:660:4406:800:3::2b",
+      "kavlan": true,
+      "mac": "6c:2b:59:9c:3f:3a",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "mercantour5-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-3",
+      "switch_port": "1/1/29",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0xb8599f0300863081",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.43",
+      "kavlan": false,
+      "mac": "b8:59:9f:03:00:86:30:81",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour5-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.43",
+      "kavlan": false,
+      "mac": "6c:2b:59:9c:3c:51",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour5-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 83200000000,
+    "node_flops": 2995200000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 25952256,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "Gold 6240"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f0815397002f58570040731379",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H330 Mini",
+      "size": 599550590976,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f0815397002f5857a14a070b34",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H330 Mini",
+      "size": 959119884288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "mercantour5-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..0775fe61000f1db15ad692db9d077d5f9b0b617f
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -0,0 +1,266 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 36,
+    "nb_procs": 2,
+    "nb_threads": 72,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2019-07-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "G8FVSY2",
+    "warranty_end": "2026-07-31"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.196.44",
+      "kavlan-11": "10.7.229.44",
+      "kavlan-12": "10.11.229.44",
+      "kavlan-13": "10.15.229.44",
+      "kavlan-14": "10.19.229.44",
+      "kavlan-16": "10.27.229.44",
+      "kavlan-17": "10.31.229.44",
+      "kavlan-18": "10.35.229.44",
+      "kavlan-2": "192.168.212.44",
+      "kavlan-20": "10.43.229.44",
+      "kavlan-21": "10.47.229.44",
+      "kavlan-3": "192.168.228.44",
+      "kavlan-4": "10.32.4.44",
+      "kavlan-5": "10.32.68.44",
+      "kavlan-6": "10.32.132.44",
+      "kavlan-7": "10.32.196.44",
+      "kavlan-8": "10.33.4.44",
+      "kavlan-9": "10.33.68.44"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:880:3::2c",
+      "kavlan-11": "2001:660:4406:1a0:803::2c",
+      "kavlan-12": "2001:660:4406:2a0:803::2c",
+      "kavlan-13": "2001:660:4406:4a0:803::2c",
+      "kavlan-14": "2001:660:4406:5a0:803::2c",
+      "kavlan-16": "2001:660:4406:7a0:803::2c",
+      "kavlan-17": "2001:660:4406:9a0:803::2c",
+      "kavlan-18": "2001:660:4406:8a0:803::2c",
+      "kavlan-2": "2001:660:4406:881:3::2c",
+      "kavlan-20": "2001:660:4406:3a0:803::2c",
+      "kavlan-21": "2001:660:4406:6a0:803::2c",
+      "kavlan-3": "2001:660:4406:882:3::2c",
+      "kavlan-4": "2001:660:4406:890:3::2c",
+      "kavlan-5": "2001:660:4406:891:3::2c",
+      "kavlan-6": "2001:660:4406:892:3::2c",
+      "kavlan-7": "2001:660:4406:893:3::2c",
+      "kavlan-8": "2001:660:4406:894:3::2c",
+      "kavlan-9": "2001:660:4406:895:3::2c"
+    }
+  },
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
+      "interface": "Ethernet",
+      "ip": "172.16.130.44",
+      "ip6": "2001:660:4406:800:3::2c",
+      "kavlan": true,
+      "mac": "6c:2b:59:9c:4a:6d",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "mercantour5-3.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-3",
+      "switch_port": "1/1/30",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0x98039b0300e90431",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.44",
+      "kavlan": false,
+      "mac": "98:03:9b:03:00:e9:04:31",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour5-3-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.44",
+      "kavlan": false,
+      "mac": "6c:2b:59:9c:46:df",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour5-3-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 83200000000,
+    "node_flops": 2995200000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 25952256,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "Gold 6240"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9a470547b034",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H330 Mini",
+      "size": 599550590976,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9b6f1068ff7a",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H330 Mini",
+      "size": 959119884288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "mercantour5-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..cb2d48c8683ba20e84c29378b65cb6a2584c09ce
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -0,0 +1,266 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 36,
+    "nb_procs": 2,
+    "nb_threads": 72,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2019-07-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "H8FVSY2",
+    "warranty_end": "2026-07-31"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.196.45",
+      "kavlan-11": "10.7.229.45",
+      "kavlan-12": "10.11.229.45",
+      "kavlan-13": "10.15.229.45",
+      "kavlan-14": "10.19.229.45",
+      "kavlan-16": "10.27.229.45",
+      "kavlan-17": "10.31.229.45",
+      "kavlan-18": "10.35.229.45",
+      "kavlan-2": "192.168.212.45",
+      "kavlan-20": "10.43.229.45",
+      "kavlan-21": "10.47.229.45",
+      "kavlan-3": "192.168.228.45",
+      "kavlan-4": "10.32.4.45",
+      "kavlan-5": "10.32.68.45",
+      "kavlan-6": "10.32.132.45",
+      "kavlan-7": "10.32.196.45",
+      "kavlan-8": "10.33.4.45",
+      "kavlan-9": "10.33.68.45"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:880:3::2d",
+      "kavlan-11": "2001:660:4406:1a0:803::2d",
+      "kavlan-12": "2001:660:4406:2a0:803::2d",
+      "kavlan-13": "2001:660:4406:4a0:803::2d",
+      "kavlan-14": "2001:660:4406:5a0:803::2d",
+      "kavlan-16": "2001:660:4406:7a0:803::2d",
+      "kavlan-17": "2001:660:4406:9a0:803::2d",
+      "kavlan-18": "2001:660:4406:8a0:803::2d",
+      "kavlan-2": "2001:660:4406:881:3::2d",
+      "kavlan-20": "2001:660:4406:3a0:803::2d",
+      "kavlan-21": "2001:660:4406:6a0:803::2d",
+      "kavlan-3": "2001:660:4406:882:3::2d",
+      "kavlan-4": "2001:660:4406:890:3::2d",
+      "kavlan-5": "2001:660:4406:891:3::2d",
+      "kavlan-6": "2001:660:4406:892:3::2d",
+      "kavlan-7": "2001:660:4406:893:3::2d",
+      "kavlan-8": "2001:660:4406:894:3::2d",
+      "kavlan-9": "2001:660:4406:895:3::2d"
+    }
+  },
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
+      "interface": "Ethernet",
+      "ip": "172.16.130.45",
+      "ip6": "2001:660:4406:800:3::2d",
+      "kavlan": true,
+      "mac": "6c:2b:59:9a:05:c4",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "mercantour5-4.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-3",
+      "switch_port": "1/1/31",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0x98039b0300e90111",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.45",
+      "kavlan": false,
+      "mac": "98:03:9b:03:00:e9:01:11",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour5-4-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.45",
+      "kavlan": false,
+      "mac": "6c:2b:59:99:fd:38",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour5-4-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 83200000000,
+    "node_flops": 2995200000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 25952256,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "Gold 6240"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081534c002f58582d04fe677b",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H330 Mini",
+      "size": 599550590976,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x64cd98f081534c002f58597f12fc7111",
+      "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H330 Mini",
+      "size": 959119884288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "mercantour5-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
new file mode 100644
index 0000000000000000000000000000000000000000..f71460db0dd7b0f886b16bac223fa957978a4578
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
@@ -0,0 +1,66 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 27 Feb 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2020-10-05",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7542, 32 cores/CPU, 1024GB RAM, 223GB SSD, 1786GB SSD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 202010,
+  "queues": [
+    "admin",
+    "production"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "mercantour6",
+  "warranty_end": "2027-10-07"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..9bdf00b885f7d8d3d9f9f725c08f84e36122e6d3
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
@@ -0,0 +1,259 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 64,
+    "nb_procs": 2,
+    "nb_threads": 128,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/03/2025",
+    "vendor": "Dell Inc.",
+    "version": "2.18.1"
+  },
+  "bmc_version": "7.20.10.05",
+  "chassis": {
+    "manufactured_at": "2020-10-05",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R7525",
+    "serial": "425FY63",
+    "warranty_end": "2027-10-07"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 1099511627776
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 68719476736,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "tg3",
+      "enabled": true,
+      "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "ip": "172.16.130.46",
+      "ip6": "2001:660:4406:800:3::2e",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:2b:b6",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "mercantour6-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-3",
+      "switch_port": "1/1/17",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:2b:b7",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0x043f72030017fd91",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.46",
+      "kavlan": false,
+      "mac": "04:3f:72:03:00:17:fd:91",
+      "management": false,
+      "model": "MT27520 Family [ConnectX-3 Pro]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour6-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.46",
+      "kavlan": false,
+      "mac": "70:b5:e8:d7:6a:4a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour6-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour6",
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 46400000000,
+    "node_flops": 2969600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 16777216,
+    "clock_speed": 2900000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Zen 2",
+    "microcode": "0x830107d",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7542 32-Core Processor",
+    "vendor": "AMD",
+    "version": 7542
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80d622090027c144d0ef5cacdf",
+      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
+      "firmware_version": 5.16,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H745 Frnt",
+      "size": 239444426752,
+      "storage": "SSD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80d622090027c149ae2f2d9cb4",
+      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0",
+      "firmware_version": 5.16,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H745 Frnt",
+      "size": 1918239768576,
+      "storage": "SSD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 604800,
+    "queues": [
+      "admin",
+      "production"
+    ],
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "mercantour6-1"
+}
\ No newline at end of file
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/musa/nodes/musa-1.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
index 7b0891ad48381c23439de9d1d5df818f7bbe59fb..1fe334adad18c69b9b83139200910a5ddf4dbd05 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 21600,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
index 999ba92171cd3cc7720b9b9072bacdcc57f737ad..f12de964b9981d5e47d7acf4f81c4f89d0f9e519 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 21600,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index aacb9d0cd5ebeb9f49c51368c19da3b1e5c88336..460ae0d05c6248fa78bf24fee540b8b084de7722 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 86400,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index b665fc2f27dc7835be93dd65f218878157c7ce5e..9f7556e7ba1f679b7368fc7bc03fc83ba778a8b8 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 86400,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 76577ac6f765c51107ca011d9eabf981459e20f6..09c6cbe56671da056a191c919a389d0bc359e6f7 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 172800,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index 4f850a9d1b1acfc78221077e63aeac01b4aa0437..376414baf9f95e98fea7bc36b8c464ef67adc189 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 172800,
     "queues": [
       "admin",
       "production"
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/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index e3e4cddaca844fc0ed6be267912e8d926ccbb9e9..86774f608b1d6ea53af92166f444b33eb75dd9ec 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -219,10 +219,14 @@
           "uid": "lag4"
         },
         {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/42",
+          "uid": "sw-6"
         },
         {
           "kind": "other",
-          "rate": 1000000000,
+          "rate": 10000000000,
           "snmp_name": "1/1/43",
           "uid": "LABO"
         },
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 0927e9ee665f8b04203c03a9abdf6fa5e6a70d5f..679677ecb1dcb3d6dc095e2ffab641bc2773782c 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -58,9 +58,6 @@
           "uid": "pve-dmz-south-1-bmc"
         },
         {
-          "kind": "other",
-          "snmp_name": "1/1/11",
-          "uid": "srv3-bmc"
         },
         {
           "kind": "other",
@@ -96,9 +93,6 @@
         {
         },
         {
-          "kind": "server",
-          "snmp_name": "1/1/27",
-          "uid": "srv-data"
         },
         {
         },
@@ -169,6 +163,12 @@
           "rate": 10000000000,
           "snmp_name": "1/1/49",
           "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/50",
+          "uid": "swadmin-5"
         }
       ],
       "rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
index e180495f99eea640931584d03b4ba13f17ece19f..828c2915f276fca8282a6421c119e6a6d1064523 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -99,6 +99,10 @@
           "uid": "mercantour2-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/17",
+          "uid": "mercantour6-1"
         },
         {
         },
@@ -121,12 +125,28 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/28",
+          "uid": "mercantour5-1"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/29",
+          "uid": "mercantour5-2"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/30",
+          "uid": "mercantour5-3"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/31",
+          "uid": "mercantour5-4"
         },
         {
         },
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..af4c7525a370b5e0a17edb094ddf4ee613eb589d
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json
@@ -0,0 +1,113 @@
+{
+  "ip": "172.17.143.240",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/13",
+          "uid": "esterel1-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/14",
+          "uid": "esterel5-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/15",
+          "uid": "esterel5-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/16",
+          "uid": "esterel6-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/17",
+          "uid": "esterel7-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/18",
+          "uid": "esterel7-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/19",
+          "uid": "esterel27-1"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/26",
+          "uid": "swadmin-6"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-6",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..582edbf0da87faadd3bea29a6e78f7655b81a525
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -0,0 +1,106 @@
+{
+  "ip": "172.17.143.229",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "musa-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "musa-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "musa-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "musa-4-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "musa-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "musa-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "esterel10-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/8",
+          "uid": "esterel10-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/9",
+          "uid": "esterel10-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/10",
+          "uid": "esterel41-1-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/24",
+          "uid": "sw-2"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-2",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-3.json b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..159f6ea038ad2f5fdac100befa4db5af6aaa12c7
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
@@ -0,0 +1,147 @@
+{
+  "ip": "172.17.143.227",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "uvb-11-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "uvb-12-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "mercantour1-15-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "mercantour1-16-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "mercantour1-11-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "mercantour1-12-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "mercantour1-7-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/8",
+          "uid": "mercantour1-8-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/9",
+          "uid": "mercantour1-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/10",
+          "uid": "mercantour1-4-bmc"
+        },
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/12",
+          "uid": "mercantour2-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/13",
+          "uid": "mercantour1-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/14",
+          "uid": "mercantour1-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/15",
+          "uid": "mercantour1-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/16",
+          "uid": "mercantour1-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/17",
+          "uid": "mercantour1-10-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/18",
+          "uid": "mercantour1-9-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/19",
+          "uid": "mercantour1-14-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/20",
+          "uid": "mercantour1-13-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/21",
+          "uid": "uvb-10-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/22",
+          "uid": "uvb-9-bmc"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/24",
+          "uid": "sw-2"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/26",
+          "uid": "swadmin-4"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-3",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-4.json b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..86cb27645fa25cee3875fd198ead7c646e47e3b4
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
@@ -0,0 +1,106 @@
+{
+  "ip": "172.17.143.225",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "mercantour2-4-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "mercantour2-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "mercantour2-8-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "mercantour2-7-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "musa-5-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/21",
+          "uid": "mercantour6-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/22",
+          "uid": "mercantour2-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/23",
+          "uid": "mercantour2-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/24",
+          "uid": "mercantour2-2-bmc"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "swadmin-3"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-4",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..364dd724680cd8414d27f748404a0968f17ff013
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
@@ -0,0 +1,79 @@
+{
+  "ip": "172.17.143.223",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "sw-2"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-5",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..3bb0c06cd6624b5230c7960bb90e10a923dbcf71
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
@@ -0,0 +1,100 @@
+{
+  "ip": "172.17.143.221",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "esterel1-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "esterel5-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "esterel5-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "esterel6-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "esterel7-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "esterel7-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "esterel27-1-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "sw-6"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-6",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/srv-data.json b/data/grid5000/sites/sophia/servers/srv-data.json
deleted file mode 100644
index a1cdf5a1b4aa70c28c54f3bf031114db58f22523..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/servers/srv-data.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "alias": [
-    "storage11"
-  ],
-  "group_storage": {
-    "name": "storage11",
-    "rate": 1000000000,
-    "size": 30000000000000
-  },
-  "kind": "physical",
-  "network_adapters": {
-    "bmc": {
-      "ip": "172.17.143.5",
-      "mac": "14:18:77:45:b8:63",
-      "mounted": true
-    },
-    "default": {
-      "ip": "172.16.143.5",
-      "mac": "14:18:77:45:B8:5F",
-      "mounted": true
-    }
-  },
-  "redfish": true,
-  "serial": "276S992",
-  "type": "server",
-  "uid": "srv-data",
-  "warranty": "2022-11-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/srv3.json b/data/grid5000/sites/sophia/servers/srv3.json
deleted file mode 100644
index b700e4701f7ec35ae3613843e5921332da7ff974..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/servers/srv3.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "kind": "physical",
-  "network_adapters": {
-    "adm": {
-      "ip": "172.17.143.6",
-      "mac": "d0:94:66:09:4b:e2",
-      "mounted": true
-    },
-    "bmc": {
-      "ip": "172.17.143.16",
-      "mac": "50:9a:4c:ac:2e:48",
-      "mounted": true
-    },
-    "default": {
-      "ip": "172.16.143.6",
-      "mac": "d0:94:66:09:4b:de",
-      "mounted": true
-    }
-  },
-  "redfish": true,
-  "serial": "HPKWGL2",
-  "type": "server",
-  "uid": "srv3",
-  "warranty": "2024-09-12"
-}
\ No newline at end of file
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/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 914bc86997fd42458047abe51d9e37c0eb75c11a..fd7a67a3f9a85b5ec23f9746e78c5221b6814eec 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a0",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a1",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 6d2d36c35812d17578c795b88df7058dc08af552..9871b084d12189d77db428b05f2af2c69792fe4e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:8c",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:8d",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 00b76ded21268eb0a17ba636770054355570bc2a..01f6e5a28781f1a20333730850673d82def093b3 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.32.2004 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:71:19:48",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.32.2004 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:71:19:49",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 466f8452674e1ca247b2f984f5cdb399573efd25..5bef2aadba352b06946da74a219d341df3a3be1c 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:44",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:45",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index b9d59a8dd9640671e2518fb28d1a396d51d2b49c..4d69204716fe7c8a52895aec588c095975353692 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:71:19:48",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:71:19:49",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 042129caa0bae1a8fa5f8fab4f74c52615898ffe..37856c962dd02cc9a6d59fef560be0473867dea4 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a4",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a5",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index 9505c536cd0eee5cda97d1802e85c1ad0686a629..2d414ecc5fcb010db743a37af172c9dc8096846d 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:50",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:51",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index eb5478d70beeb340c967b129795efec372a99c42..525fca22321a5076b3edd50ec44b2a6523d5cbec 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:6c",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:6d",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index e507bc9ee0c1ffc573072b23e8e04487b0410f40..2006387d5ea4ec3f2ea9dd855975b769568aab3f 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a8",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:d7:a9",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 3474ca133d7150a74e1760f1e62e7a369b427d1a..e0024397ad622134721524c5b1be502708955094 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -227,6 +227,40 @@
       "sriov_totalvfs": 64,
       "vendor": "Intel"
     },
+    {
+      "device": "eth6",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:e8",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f0np0",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth7",
+      "driver": "mlx5_core",
+      "enabled": false,
+      "firmware_version": "22.36.1010 (MT_0000000437)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "88:e9:a4:d4:e7:e9",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "ens2f1np1",
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
+    },
     {
       "device": "bmc",
       "enabled": true,
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/input/grid5000/access/group.yaml b/input/grid5000/access/group.yaml
index 4195d4d9a50cf8a05a9425f5027ebfc6bcb272e3..dce252466ee45bc38297efc8b38eb3574d3849ef 100644
--- a/input/grid5000/access/group.yaml
+++ b/input/grid5000/access/group.yaml
@@ -25,13 +25,11 @@ inria_nancy_group: ['%mc-nancy', coast]
 inria_lyon_group: ['%mc-lyon', avalon, chroma, emeraude, maracas ]
 
 # GROUP FOR ALL INRIA
-## economic activity group with access to mc with the same level as other inria team
-economic_activity_inria: [hive, inriastartupstudio, sonaide, feelim, iss-idiscover, iss-manta]
 ## group of guest site that have access to inria mc with the same level as other inria team
 guest_inria: [inria-chile, inria-dsi, inria-sidf, swh, tadaam]
 
 ## all inria (and friends of inria) groups
-inria_group:  ['@inria_rennes_group', '@inria_nancy_group', '@inria_lyon_group', '@economic_activity_inria', '@guest_inria', '%mc-sophia', '%mc-lyon', '%mc-lille', '%mc-grenoble', '%mc-paris', '%mc-saclay', '%mc-bordeaux']
+inria_group:  ['@inria_rennes_group', '@inria_nancy_group', '@inria_lyon_group', '@guest_inria', '%mc-economic-activity', '%mc-sophia', '%mc-lyon', '%mc-lille', '%mc-grenoble', '%mc-paris', '%mc-saclay', '%mc-bordeaux', '%mc-siege']
 
 # OTHER GROUP WITH (MINIMAL) ACCESS TO MC
 
diff --git a/input/grid5000/access/rennes.yaml b/input/grid5000/access/rennes.yaml
index 888bebcd0ba6abedd388528c8a5461d2f4d83f25..4be44bf4d79d1066eacfc51e265acbbc7c4e794c 100644
--- a/input/grid5000/access/rennes.yaml
+++ b/input/grid5000/access/rennes.yaml
@@ -37,14 +37,18 @@ roazhon8: *sairpico-shared
 abacus1: *sairpico-shared
 abacus2: *sairpico-shared
 
-## LINKMEDIA
-abacus3: &linkmedia-exclusive
-    p1: [linkmedia, '@admin']
+## LINKMEDIA & ARTISHAU
+abacus3: &linkmedia-artishau-exclusive
+    p1: [linkmedia, artishau, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+abacus10: *linkmedia-artishau-exclusive
+abacus18: *linkmedia-artishau-exclusive
+abacus21: *linkmedia-artishau-exclusive
+
+## ARTISHAU
+abacus26: &artishau-exclusive
+    p1: [artishau, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
-abacus10: *linkmedia-exclusive
-abacus18: *linkmedia-exclusive
-abacus21: *linkmedia-exclusive
-abacus26: *linkmedia-exclusive
 
 ## SIROCCO
 abacus5: &sirocco-exclusive
@@ -97,3 +101,4 @@ abacus9: *inria-rennes
 abacus14: *inria-rennes
 abacus16: *inria-rennes
 abacus25: *inria-rennes
+abacus28: *inria-rennes
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index 1c425962c57ab150a1aa707de385fd2d9ee14534..9b8946e01c3468318b5ee144899e823706e5a45f 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -8,12 +8,22 @@ musa:
     p4: ['@other_groups_with_access']
 
 # SHARED MODE
-mercantour2:
+# Common clusters of Sophia Inria Center
+mercantour2: &inria-sophia
     p1: ['@inria_sophia_group', '@admin']
     p3: ['@inria_group']
     p4: ['@other_groups_with_access']
+esterel10: *inria-sophia
 
 # DEDICATED MODE
+esterel5:
+    p1: [stars, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
+mercantour6:
+    p1: [coati, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
 esterel41:
     p1: [evergreen, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 41ed1faa773770623298979d680126e906ccfc37..f298f28fad2baf1081322347672483fd3eea6a2c 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2,6 +2,24 @@
 sites:
   grenoble:
     clusters:
+      chartreuse2:
+        nodes:
+          chartreuse2-1:
+            chassis:
+              manufactured_at: 2016-11-14
+              warranty_end: 2021-11-13
+          chartreuse2-2:
+            chassis:
+              manufactured_at: 2016-11-14
+              warranty_end: 2021-11-13
+          chartreuse2-3:
+            chassis:
+              manufactured_at: 2016-11-14
+              warranty_end: 2021-11-13
+          chartreuse2-4:
+            chassis:
+              manufactured_at: 2016-11-14
+              warranty_end: 2021-11-13
       dahu:
         nodes:
           dahu-1:
@@ -248,6 +266,8 @@ sites:
             chassis:
               manufactured_at: 2018-07-17
               warranty_end: 2023-07-17
+  louvain:
+    clusters: {}
   luxembourg:
     clusters:
       petitprince:
@@ -1310,10 +1330,6 @@ sites:
             chassis:
               manufactured_at: 2018-04-10
               warranty_end: 2023-04-10
-          grvingt-33:
-            chassis:
-              manufactured_at: 2018-04-10
-              warranty_end: 2023-04-10
           grvingt-34:
             chassis:
               manufactured_at: 2018-04-10
@@ -2206,6 +2222,26 @@ sites:
             chassis:
               manufactured_at: 2017-11-15
               warranty_end: 2024-11-15
+      esterel5:
+        nodes:
+          esterel5-1:
+            chassis:
+              manufactured_at: 2016-06-08
+              warranty_end: 2021-06-08
+          esterel5-2:
+            chassis:
+              manufactured_at: 2017-03-30
+              warranty_end: 2022-03-30
+      esterel7:
+        nodes:
+          esterel7-1:
+            chassis:
+              manufactured_at: 2017-05-23
+              warranty_end: 2022-05-23
+          esterel7-2:
+            chassis:
+              manufactured_at: 2017-05-23
+              warranty_end: 2022-05-23
       mercantour2:
         nodes:
           mercantour2-1:
@@ -2240,6 +2276,30 @@ sites:
             chassis:
               manufactured_at: 2015-09-02
               warranty_end: 2020-09-02
+      mercantour5:
+        nodes:
+          mercantour5-1:
+            chassis:
+              manufactured_at: 2019-07-30
+              warranty_end: 2026-07-31
+          mercantour5-2:
+            chassis:
+              manufactured_at: 2019-07-30
+              warranty_end: 2026-07-31
+          mercantour5-3:
+            chassis:
+              manufactured_at: 2019-07-30
+              warranty_end: 2026-07-31
+          mercantour5-4:
+            chassis:
+              manufactured_at: 2019-07-30
+              warranty_end: 2026-07-31
+      mercantour6:
+        nodes:
+          mercantour6-1:
+            chassis:
+              manufactured_at: 2020-10-05
+              warranty_end: 2027-10-07
       uvb:
         nodes:
           uvb-10:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 1c3c8ac88054d230ea32979813d855f33b15c45f..e5f4398b7156898fc0f18c6d631d573eb75d636c 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -14,6 +14,7 @@ disk_vendor_model_mapping:
       - PERC H730P Mini
       - PERC H345 Front
       - PERC H745P MX
+      - PERC H745 Frnt
       - PERC H740P Mini
       - DELLBOSS VD
     HPE:
@@ -44,6 +45,7 @@ disk_vendor_model_mapping:
       - ST600MM0088
       - ST600MP0005
       - ST600MP0036
+      - ST600MM0069
       - ST2000NX0463
       - ST4000NM0295
       - ST8000NM0185
@@ -54,6 +56,7 @@ disk_vendor_model_mapping:
       - PX04SMB040
       - PX05SVB048Y
       - MG04SCA40ENY
+      - AL14SEB120N
       - AL15SEB060NY
       - KRM5XVUG1T92
       - KPM5XVUG1T92
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 65ad9274d07434b8b8ba98e03a60c4dbeebeecbf..4a765cfb88d35e013d2b07f927fbe38f52609a3a 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -29,6 +29,7 @@ ipv4:
       grenoble kinovis eth0 0 0 12 0
       grenoble kinovis eth1 0 0 12 6
       grenoble kinovis eth2 0 0 12 12
+      grenoble chartreuse2 eth0 0 0 10 4
       lille chifflot eth0 0 0 4 0
       lille chifflot eth1 0 0 4 100
       lille chiclet eth0 0 0 7 0
@@ -121,15 +122,19 @@ ipv4:
       sophia mercantour3 eth0 0 0 2 24
       sophia mercantour4 eth0 0 0 2 40
       sophia mercantour5 eth0 0 0 2 41
+      sophia mercantour5 ib0  0 0 2 41
       sophia mercantour6 eth0 0 0 2 45
+      sophia mercantour6 ib0 0 0 2 45
       sophia mercantour7 eth0 0 0 2 46
       sophia esterel1 eth0 0 0 3 0
       sophia esterel2 eth0 0 0 3 1
       sophia esterel3 eth0 0 0 3 2
       sophia esterel4 eth0 0 0 3 3
       sophia esterel5 eth0 0 0 3 4
+      sophia esterel5 ib0 0 0 3 4
       sophia esterel6 eth0 0 0 3 6
       sophia esterel7 eth0 0 0 3 7
+      sophia esterel7 ib0 0 0 3 7
       sophia esterel8 eth0 0 0 3 9
       sophia esterel9 eth0 0 0 3 10
       sophia esterel10 eth1 0 0 3 11
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..268192ecfdd77c639a2b340a53d90865c9389c23
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -0,0 +1,41 @@
+---
+model: Dell PowerEdge C6320
+created_at: 2025-01-13
+kavlan: true 
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  chartreuse2-[1-4]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell 
+      clock_speed: 2400000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+    storage_devices:
+      pci-0000:02:00.0-sas-phy0-lun-0:
+        interface: SAS
+        id: disk0
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: chartreuse2
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a03e257fef2837bddfef6a539742e2ae25f28f5a
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml
@@ -0,0 +1,164 @@
+---
+metrics:
+
+  - name: bmc_ambient_temp_celsius
+    description: Front node ambient temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: FIXME #Inlet Temp
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: FIXME #Pwr Consumption
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "temp"}
+    description: Temperature of Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 14 #Temp
+
+  - name: bmc_other_power_watt
+    labels: {"id": "pwrconsumption"}
+    description: Power consumption of Pwr Consumption reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 59 #Pwr Consumption
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 99 #FAN_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 100 #FAN_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 101 #FAN_3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 102 #FAN_4
+
+  - name: bmc_other_current_amp
+    labels: {"id": "inputcurrent"}
+    description: Current of Input Current reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 114 #Input Current
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "inputvoltage"}
+    description: Voltage of Input Voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 115 #Input Voltage
+
+  - name: bmc_cpu_power_watt
+    labels: {"id": "cpuusage"}
+    description: Usage of CPU Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 167 #CPU Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "iousage"}
+    description: Usage of IO Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 168 #IO Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "memusage"}
+    description: Usage of MEM Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 169 #MEM Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "sysusage"}
+    description: Usage of SYS Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 170 #SYS Usage
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7afeb44f74f4712f1049c1b3450b2b4b31ad7bbc
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 504GSG2
+  main_memory:
+    ram_size: 34359738368
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.5
+      mac: 7c:d3:0a:bf:38:d8
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 7c:d3:0a:bf:38:d6
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.5
+      mac: 7c:d3:0a:bf:38:d4
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+    vendor: Intel
+    version: E5-2640 v4
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000397583beef9"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: DM06
+      model: AL14SEB120N
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c89accfb22cfcaef1cf80728f87590271f7cb04b
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 501NSG2
+  main_memory:
+    ram_size: 34359738368
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.6
+      mac: 7c:d3:0a:bf:40:28
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 7c:d3:0a:bf:40:26
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.6
+      mac: 7c:d3:0a:bf:40:24
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+    vendor: Intel
+    version: E5-2640 v4
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000397582b2a1d"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: DM06
+      model: AL14SEB120N
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..123672288f488de7a5c4c5a345eee97c699d36bc
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-3:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 503FSG2
+  main_memory:
+    ram_size: 34359738368
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.7
+      mac: 7c:d3:0a:bf:41:0c
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 7c:d3:0a:bf:41:0a
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.7
+      mac: 7c:d3:0a:bf:41:08
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+    vendor: Intel
+    version: E5-2640 v4
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x500003975839a991"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: DM06
+      model: AL14SEB120N
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b142cf4dd75e51c017b4fc1ca6feda64922af26a
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-4:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 505MSG2
+  main_memory:
+    ram_size: 34359738368
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.8
+      mac: 7c:d3:0a:bf:3f:f2
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 7c:d3:0a:bf:3f:f0
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.8
+      mac: 7c:d3:0a:bf:3f:ee
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+    vendor: Intel
+    version: E5-2640 v4
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000397583a5e3d"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: DM06
+      model: AL14SEB120N
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
index 654be4f5c53d590d9a9f8123f880ee768fdaf90f..d9530e4ef149ea06ad0ea0b0990ee18aa2e2c900 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
@@ -1,7 +1,7 @@
 ---
 model: HPE Proliant DL380 Gen11
 created_at: 2025-02-10
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false
 queues:
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..03c90530a6f9ec3c37a21be92fe25da2ac9cca9c
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml
@@ -0,0 +1,63 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7b64964ac66d961db97453675ed6827df0c79780
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml
@@ -0,0 +1,24 @@
+---
+imag-1b-F1-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG44LS104S
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.246
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        48:
+          uid: imag-1b-F1-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..da4a4bdaf4e175b7b5ff005c867e3001ed458ba4
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
@@ -0,0 +1,27 @@
+---
+imag-1b-F2-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG44LS105K
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.247
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        #40:
+        #  uid: imag-1b-F1-prod-01-mgmt
+        #  kind: switch
+        48:
+          uid: imag-1b-F2-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..97cbe6f756eab3bb24b000df935b1fb1cc0e3570
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
@@ -0,0 +1,30 @@
+---
+imag-1b-F3-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG43LS10CD
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.248
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        #36:
+        #  uid: imag-1b-F2-prod-01-mgmt
+        #  kind: switch
+        #40:
+        #  uid: imag-1b-F3-prod-01-mgmt
+        #  kind: switch
+        48:
+          uid: imag-1b-F3-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index f44a3ed55657dd8fef57927577d57e70fa9a7291..71d1e0074e4c5699859c210a8bb1279d98883f23 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -25,12 +25,16 @@ imag-1b-F3-prod-01:
           kind: channel
         5:
           uid: chartreuse2-1
+          rate: 10_000_000_000
         6:
           uid: chartreuse2-3
+          rate: 10_000_000_000
         7:
           uid: chartreuse2-2
+          rate: 10_000_000_000
         8:
           uid: chartreuse2-4
+          rate: 10_000_000_000
         22:
           uid: nessie-1
         39:
diff --git a/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml b/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a03013244e47c9943f24b27054f79efe81c3b0ad
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml
@@ -0,0 +1,56 @@
+---
+opa-grenoble:
+  model: Intel Omni-Path Edge Switch 100 Series/H1048-OPF
+  warranty: nil
+  serial: nil
+  kind: hpcswitch
+  managed_by_us: false
+  site: grenoble
+  snmp_community: public
+  backplane_bps: 1_200_000_000_000
+  linecards:
+    1:
+      backplane_bps: 1_200_000_000_000
+      rate: 100_000_000_000
+      kind: node
+      ports:
+        1: dahu-1-ib0
+        2: dahu-2-ib0
+        3: dahu-3-ib0
+        4: dahu-4-ib0
+        5: dahu-5-ib0
+        6: dahu-6-ib0
+        7: dahu-7-ib0
+        8: dahu-8-ib0
+        9: dahu-9-ib0
+        10: dahu-10-ib0
+        11: dahu-11-ib0
+        12: dahu-12-ib0
+        13: dahu-13-ib0
+        14: dahu-14-ib0
+        15: dahu-15-ib0
+        16: dahu-16-ib0
+        17: dahu-17-ib0
+        18: dahu-18-ib0
+        19: dahu-19-ib0
+        20: dahu-20-ib0
+        21: dahu-21-ib0
+        22: dahu-22-ib0
+        23: dahu-23-ib0
+        24: dahu-24-ib0
+        25: dahu-25-ib0
+        26: dahu-26-ib0
+        27: dahu-27-ib0
+        28: dahu-28-ib0
+        29: dahu-29-ib0
+        30: dahu-30-ib0
+        31: dahu-31-ib0
+        32: dahu-32-ib0
+        45: yeti-1-ib0
+        46: yeti-2-ib0
+        47: yeti-3-ib0
+        48: yeti-4-ib0
+        49: troll-1-ib0
+        50: troll-2-ib0
+        51: troll-3-ib0
+        52: troll-4-ib0
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5f8916902d0b04a1945106ffc647c93c725d470f
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml
@@ -0,0 +1,22 @@
+---
+skinovis2-admin-01:
+  model: Dell PowerConnect 6248
+  warranty: 2024-12-01
+  serial: nil
+  kind: switch
+  # this switch has no SSH for now
+  managed_by_us: false
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.244
+  backplane_bps: 10_000_000_000
+  linecards:
+    1:
+      backplane_bps: 10_000_000_000
+      rate: 1_000_000_000
+      ports:
+        48:
+          uid: skinovis2-prod-01
+          kind: switch
+          trunk: false
+
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
index f89536ec48297a261caeac8348fdeef55520dd1b..52250d0e5c5a387b8d35931ad8e8247b5d52176c 100644
--- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
@@ -12,7 +12,7 @@ skinovis2-prod-01:
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      kavlan_pattern: "%LINECARD%/%PORT%"
+      kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 25_000_000_000
       backplane_bps: 400_000_000_000
       kind: node
@@ -22,69 +22,69 @@ skinovis2-prod-01:
           kind: switch
           rate: 1_000_000_000
           trunk: false
-        41:
-          uid: camera-1
-          kind: other
-        42:
-          uid: camera-2
-          kind: other
-        43:
-          uid: camera-3
-          kind: other
-        44:
-          uid: camera-4
-          kind: other
-        45:
-          uid: camera-5
-          kind: other
-        46:
-          uid: camera-6
-          kind: other
-        47:
-          uid: camera-7
-          kind: other
-        48:
-          uid: camera-8
-          kind: other
-        49:
-          uid: camera-9
-          kind: other
-        50:
-          uid: camera-10
-          kind: other
-        51:
-          uid: camera-11
-          kind: other
-        52:
-          uid: camera-12
-          kind: other
-        53:
-          uid: camera-13
-          kind: other
-        54:
-          uid: camera-14
-          kind: other
-        55:
-          uid: camera-15
-          kind: other
-        56:
-          uid: camera-16
-          kind: other
-        57:
-          uid: camera-17
-          kind: other
-        58:
-          uid: camera-18
-          kind: other
-        59:
-          uid: camera-19
-          kind: other
-        59:
-          uid: camera-20
-          kind: other
-        60:
-          uid: camera-21
-          kind: other
+        #41:
+        #  uid: camera-1
+        #  kind: other
+        #42:
+        #  uid: camera-2
+        #  kind: other
+        #43:
+        #  uid: camera-3
+        #  kind: other
+        #44:
+        #  uid: camera-4
+        #  kind: other
+        #45:
+        #  uid: camera-5
+        #  kind: other
+        #46:
+        #  uid: camera-6
+        #  kind: other
+        #47:
+        #  uid: camera-7
+        #  kind: other
+        #48:
+        #  uid: camera-8
+        #  kind: other
+        #49:
+        #  uid: camera-9
+        #  kind: other
+        #50:
+        #  uid: camera-10
+        #  kind: other
+        #51:
+        #  uid: camera-11
+        #  kind: other
+        #52:
+        #  uid: camera-12
+        #  kind: other
+        #53:
+        #  uid: camera-13
+        #  kind: other
+        #54:
+        #  uid: camera-14
+        #  kind: other
+        #55:
+        #  uid: camera-15
+        #  kind: other
+        #56:
+        #  uid: camera-16
+        #  kind: other
+        #57:
+        #  uid: camera-17
+        #  kind: other
+        #58:
+        #  uid: camera-18
+        #  kind: other
+        #59:
+        #  uid: camera-19
+        #  kind: other
+        #59:
+        #  uid: camera-20
+        #  kind: other
+        #60:
+        #  uid: camera-21
+        #  kind: other
         83:
           uid: port-channel1
           kind: channel
diff --git a/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml b/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1f3870d32ff84211cad9430e9b252004350177a8
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml
@@ -0,0 +1,38 @@
+---
+sw-ib-mellanox:
+  model: Mellanox IB switch
+  warranty: nil
+  serial: nil
+  kind: hpcswitch
+  managed_by_us: false
+  site: grenoble
+  snmp_community: public
+  linecards:
+    1:
+      rate: 100_000_000_000
+      kind: node
+      ports:
+        1: drac-1-ib0
+        2: drac-2-ib0
+        3: drac-3-ib0
+        4: drac-4-ib0
+        5: drac-5-ib0
+        6: drac-6-ib0
+        7: drac-7-ib0
+        8: drac-8-ib0
+        9: drac-9-ib0
+        10: drac-10-ib0
+        11: drac-11-ib0
+        12: drac-12-ib0
+        13: drac-1-ib1
+        14: drac-2-ib1
+        15: drac-3-ib1
+        16: drac-4-ib1
+        17: drac-5-ib1
+        18: drac-6-ib1
+        19: drac-7-ib1
+        20: drac-8-ib1
+        21: drac-9-ib1
+        22: drac-10-ib1
+        23: drac-11-ib1
+        24: drac-12-ib1
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index d2ffbf5304a6b4369b6eafb464acaa621e0fa986..2bc53dc78b794f7da63773e81130f1666e42bbf5 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/input/grid5000/sites/grenoble/servers/physical.yaml
@@ -7,6 +7,7 @@ digsed:
   network_adapters:
     default:
       ip: 172.16.31.4
+      mac: EC:F4:BB:CF:C2:98
     adm:
       ip: 172.17.31.4
     bmc:
@@ -14,7 +15,7 @@ digsed:
 
 dighyp1:
   kind: physical
-  alias: [adminfront, af]
+  alias: []
   warranty: 2024-10-19
   serial: 5SS15M2
   network_adapters:
@@ -50,6 +51,7 @@ digwatt:
   network_adapters:
     default:
       ip: 172.16.31.9
+      mac: F8:F2:1E:23:EF:20
     bmc:
       ip: 172.17.30.9
     adm:
@@ -57,7 +59,7 @@ digwatt:
 
 dignfs:
   kind: physical
-  alias: []
+  alias: [storage1-old]
   warranty: 2025-10-06
   serial: 57JV173
   network_adapters:
@@ -68,16 +70,12 @@ dignfs:
       mac: 2C:EA:7F:42:45:35
     adm:
       ip: 172.17.31.12
-  group_storage:
-    name: storage1
-    size: 55000000000000
-    rate: 50000000000
 
 pve-1:
   kind: physical
   warranty: 2031-07-11
   serial: CZJD1700JN
-  alias: [ntp]
+  alias: [ntp, adminfront]
   network_adapters:
     default:
       ip: 172.16.31.13
@@ -117,6 +115,10 @@ srv-data:
       mac: 5C:ED:8C:F4:A1:EE
     adm:
       ip: 172.17.31.15
+  group_storage:
+    name: storage1
+    size: 162_001_569_447_936
+    rate: 25_000_000_000
 
 srv-data2:
   kind: physical
@@ -132,6 +134,10 @@ srv-data2:
       mac: 5C:ED:8C:F4:64:78
     adm:
       ip: 172.17.31.16
+  group_storage:
+    name: storage2
+    size: 162_001_569_447_936
+    rate: 25_000_000_000
 
 srv-data3:
   kind: physical
@@ -147,3 +153,7 @@ srv-data3:
       mac: 5C:ED:8C:F4:A2:22
     adm:
       ip: 172.17.31.17
+  group_storage:
+    name: storage3
+    size: 360_003_477_176_320
+    rate: 100_000_000_000
diff --git a/input/grid5000/sites/grenoble/servers/user-machines.yaml b/input/grid5000/sites/grenoble/servers/user-machines.yaml
index 749c2c03c090c6d5e07b82a9a1ea02c082be7e2b..852c045f09f380f1017afa609cbcf2286674e2cf 100644
--- a/input/grid5000/sites/grenoble/servers/user-machines.yaml
+++ b/input/grid5000/sites/grenoble/servers/user-machines.yaml
@@ -1,8 +1,3 @@
-pneyron-spack-vm:
-  kind: virtual
-  expire: 2024-03
-  network_adapters: {default: {ip: 172.16.29.1}}
-
 orichard-nix-datamove:
   kind: physical
   alias: [nix-datamove]
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 3ea3c987d4c0d64c455a72adf2b4ba05b784fef8..2042511cd49e74a5fef5029c89b4b736f9957a8a 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -81,6 +81,12 @@ sw-chiclet-2:
         18:
           uid: port-channel4
           kind: channel
+        19:
+          uid: port-channel5
+          kind: channel
+        20:
+          uid: port-channel5
+          kind: channel
         21: 
           uid: gwol-north
           kind: server
@@ -115,3 +121,8 @@ sw-chiclet-2:
       uid: granche-srv2
       kind: server
       rate: 20000000000
+    port-channel5:
+      port: port-channel5
+      uid: pve-3
+      kind: server
+      rate: 10000000000
diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml
index 19ac45f0c7092575932c39745c522298f424ab13..d3803c691b42015aa6a30c2cdbc191a1067eac6e 100644
--- a/input/grid5000/sites/lille/servers/physical.yaml
+++ b/input/grid5000/sites/lille/servers/physical.yaml
@@ -16,11 +16,16 @@ chiterne:
     - uid: pdu-b2p2
       port: 9
 
-gardin:
+pve-3:
   kind: physical
   warranty: 2025-06-25
   serial: 2SYTKQ2
   network_adapters:
+    default:
+      ip: 172.16.47.9
+      mac: 24:6e:96:dc:f4:2c
+    adm:
+      ip: 172.17.47.9
     bmc:
       ip: 172.17.46.9
       mac: 54:48:10:f4:f9:0c
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
index d416e76fa5fce06b1d331614fa9519a5455ff305..17980344929604997bdbff2de146e3007353aed7 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
@@ -160,9 +160,9 @@ spirou-1:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
index 51998062ed490aa2f92a1a139be18939753bf205..7b47b9419a20c4aaf3f46c29870172b5758fdc3c 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
@@ -160,9 +160,9 @@ spirou-2:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
index 01ae4daca0a2e2fa0e90a5e067f1f4e17fbb2e8d..fc0098b8b232277969f55abf81762e45c52844ae 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
@@ -160,9 +160,9 @@ spirou-3:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
index 7b5c09fc6ba892c58a62e1af6a2681aed7ecc4b2..7bae9fde31b6e429755c8c577712ea6571d60942 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
@@ -160,9 +160,9 @@ spirou-4:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
index eea42338c26cb02e2c8a511d3e112e626f025c95..0d498493ac5ecb5e3601e5c83eeba4fabb7cce88 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
@@ -160,9 +160,9 @@ spirou-5:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
index 9db2fa947abd8590b6475c401e8a6459c49c0ea8..b7c07b17f69e98801ad95f8f55d2b897a4d82c8c 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
@@ -160,9 +160,9 @@ spirou-6:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
index 2034495d103f52b6f1167f42df01a4416e14c8bb..a3911e88cc399d16ebd0b67c8ec63e284d43a5cd 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
@@ -160,9 +160,9 @@ spirou-7:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
index 1d5fa0a082a7d757018b804a41dece19c075b66c..a2482484951e51b7b2e2a3d150aa66614fb99967 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
@@ -160,9 +160,9 @@ spirou-8:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/nancy/servers/physical.yaml b/input/grid5000/sites/nancy/servers/physical.yaml
index 36a66fa741c81d7268625ed35d4818064b5d3348..8c1783dcb58da586d197bd8f34a16374651517c4 100644
--- a/input/grid5000/sites/nancy/servers/physical.yaml
+++ b/input/grid5000/sites/nancy/servers/physical.yaml
@@ -26,8 +26,7 @@ srv-data2:
 
 talc-data:
   kind: physical
-  alias:
-    - storage3
+  alias: []
   warranty: 2022-11
   serial: 92ZLL82
   network_adapters:
@@ -35,11 +34,6 @@ talc-data:
       ip: 172.16.79.21
     bmc:
       ip: 172.17.79.21
-  group_storage:
-    name: storage3
-    size: 180000000000000
-    rate: 10000000000
-
 
 talc-data-baie2:
   kind: storage
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index f26dfc17264e4f50c286db561cf08bec3700947f..4fe50911eb60df420d0fd1ab7fc24fe38be155e4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -8,10 +8,10 @@ ecotype-1:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index 0da08afc7f655549ea2b279e7f7cd4097226185e..9efeaf19a2cd364706b401dee2f37ce011cd5029 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -8,10 +8,10 @@ ecotype-10:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index 6998bcf509ee0a087e3562bbce1dc5fc305fb5e6..cebd8df208a94148339b341f529994356319d6f5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -8,10 +8,10 @@ ecotype-11:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index d21844ad5b045d413c9ca0b80423fcd9aa55dcce..7fe265a3cd79a455a0aaf6e0c4114e81a9a1179e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -8,10 +8,10 @@ ecotype-12:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index c0b7f5085cc7adfc4403ef8200a823991e9e741a..74d06b50e6e39393e3d1d86e7da8da222fe27be0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -8,10 +8,10 @@ ecotype-13:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index 73bcbaa3db4d22062526370a927428d7bba3b6e5..a5ceef6f1324375516b1524e140a071d3b3b0ddf 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -8,10 +8,10 @@ ecotype-14:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index 3143d72e891ee0fe48d826185f9a7db98858f026..7b2b2277049b95aecdc0d0d608eeb7d87a59b549 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -8,10 +8,10 @@ ecotype-15:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index 24f369f7b9a95834e4222459e5de2548fdd513da..5209cc2b3354f61d54fcc50c3e8b2f67364d50b6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -8,10 +8,10 @@ ecotype-16:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index bf632d8605de1bcc0f24accab6ab90e286cf574c..49b3c4beb0396e3030cb11514c5ddce57da5c422 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -8,10 +8,10 @@ ecotype-17:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index 4a28e35f06835b755976037992af79a1675cc452..a27f74d32d1a234b477e321640f39340eff03f9a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -8,10 +8,10 @@ ecotype-18:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index 1964f5e06ade0aa821951d558c296709e3c1a9c3..478b54fa21f66b16d223ade3936f435e31cd636f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -8,10 +8,10 @@ ecotype-19:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index be047fdc5b78775696082dc50a99013e875a4ff5..3ac0be821d69ac8984ce514857f468fc346677e8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -8,10 +8,10 @@ ecotype-2:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index 9a8300619b664d3a37964d830a75049acc6d6536..8b481699a6c4ca48d6505059b50f2096d1487eef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -8,10 +8,10 @@ ecotype-20:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index 53532cc732e5d4b85f966679e4b6b42a6129f29a..f4d3104e31d3435b9f32f18adf5029e71bdb8fc9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -8,10 +8,10 @@ ecotype-21:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index c809a6a6c2b353b1b43c0053d7bc06f640f29aff..4394be5a6e511df28705b8589ba4efc0715d650a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -8,10 +8,10 @@ ecotype-22:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index 86ddd4dae76ea860b6c01b49994c1f6954707d9a..02a7a4f244366756071c2ba6c8bf140f31a8cb71 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -8,10 +8,10 @@ ecotype-23:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index 79b439bfc96c0cac5298b930cc9c4aa32552e6d7..2d2a60854c97c4029320ef309bff92e90bf83831 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -8,10 +8,10 @@ ecotype-24:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index 1bc11730d6cc78df04ab219b7a9fdf1ad5769939..adfcdb47e7fabca916bde7a47fefd5ef047ad9a9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -8,10 +8,10 @@ ecotype-25:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index c8dc9d7eb1744d2cfe7e5dd60ec3a8d80ff74869..876ce8c68e7a8ed5de43fc2b3f46846ca5a2f111 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -8,10 +8,10 @@ ecotype-26:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index 6ce521ba29ecedd33f70f19b28c2ca3dfe30de4a..8e3771503ef7907e0f6f336b643d08069633f4ca 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -8,10 +8,10 @@ ecotype-27:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index e6e4b55f8943d39c2e70e4ddb310ae4c1db35bda..8e5de9038a938dbc570c870fd77ff740c05d23c0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -8,10 +8,10 @@ ecotype-28:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index bfb6915ae8f6b97b64869eee139c2220a5df5273..0aeb29b8fabc5f8b2cbdbac802e23a1fa8f5ba06 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -8,10 +8,10 @@ ecotype-29:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index 2c5484c19eec9660e206508d0dc9bee151fb8e81..fe75d1118eecd8b6cb1050f38cc3ea0db26bd5a6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -8,10 +8,10 @@ ecotype-3:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 650529e597d8ab6d8718bb25024dc2717e1e4e6f..1b4d69eeda1eb0e7bed720e1f4ba05209745e28d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -8,10 +8,10 @@ ecotype-30:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index 9ec98a779f4e713417a7c127cafb96814f8e2a85..ee85b01a4f05a50f9cfdad6d47c59af983d2ca24 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -8,10 +8,10 @@ ecotype-31:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index 47947476aa2ea1ef0e5ce2501b78e03e9810547a..fd181e8949d02d7db6b66266a8b735326140d12b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -8,10 +8,10 @@ ecotype-32:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index a9e45d66492ce91abaa66aa7ae19cf8cb6f9b3ab..37d48ddfc0107a3f3b8127a0017d802f43cc7e26 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -8,10 +8,10 @@ ecotype-33:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index 7453939a65f2041404eb4b3ca98f56f3dc1c781c..abbb81a2f1d8fb7c0e0e5c04da110ccd1831fe26 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -8,10 +8,10 @@ ecotype-34:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index fe8630c16554d5e54ec175732f7c3d2745f5a436..eb7b9ac6e25879dede9b112caef6eca63abe7a51 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -8,10 +8,10 @@ ecotype-35:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 6ca0af044038ec38082005d458f7cdfc3548e1c9..a6fe3699308e203450cf5c4b9eaaae557e6226d5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -8,10 +8,10 @@ ecotype-36:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index 267fb2a255ffc7e1a1b490785e50d369d5795007..a7b7e37e38c38702c3a53fd59be85f65cb228058 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -8,10 +8,10 @@ ecotype-37:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index a3a42c3cdd03f1648a6702267ad711bc393105bf..d4de7a2d583476c01c5efdcf6dbb0adab8153167 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -8,10 +8,10 @@ ecotype-38:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index 201a7402e22f1ca96be91293ecbe3f0cb0951361..69a7f9fce2e770a24283257573edeed9a3758a42 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -8,10 +8,10 @@ ecotype-39:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index c389b9f77beed5bd00bc176d6cde368eaffe2521..3b6a25ab172e0d7bd8c524ec21ce24d642496bb4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -8,10 +8,10 @@ ecotype-4:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index d24af1129138b2667818c600295c646c9b04e327..14dc3c293795ec442a414689f9dde1e6a1525154 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -8,10 +8,10 @@ ecotype-40:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index 8d148848b4ba3569a70e8357e575bc610d0f7883..9ba9c30684ee42512787863e3faa410e90bb3b83 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -8,10 +8,10 @@ ecotype-41:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 7addc34ff38c0ad81e9ca28b173f50efcfd2e6e3..fcb5408c38a41fcdf178c7d1652d64499d0c7a74 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -8,10 +8,10 @@ ecotype-42:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 067e24d2378b4d20649a842f4bc29eb0c0806e1d..0ba7d04ccfdccf0205d9ff1d34ad833749482fcc 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -8,10 +8,10 @@ ecotype-43:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 11da2b00ff3673eadd0204c9b84f952b82793a3a..0c170b945d11cfb201f77f9eb4488b3ed6497cf5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -8,10 +8,10 @@ ecotype-44:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index 2eb933b5cb5c6073836b181d3acd33d90589c12f..52b1fc6f41d47d1172ba53716da046662ad15dcf 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -8,10 +8,10 @@ ecotype-45:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index d1e63b3b5ed26e66b009f6c488a39b7dd6896b63..84f8bcd73eb87ea08ab7be4fbe9b7d6f1e3863a4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -8,10 +8,10 @@ ecotype-46:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 04324a857f2119911163695267e373332f6e5385..a8581186fc31f711983694741994f96737267c07 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -8,10 +8,10 @@ ecotype-47:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index 54632ee607482b044675bffd020bcd97238aa601..6bfd23968b210f64c972b8e21e2ca445fe47700e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -8,10 +8,10 @@ ecotype-48:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index 44329880518c37bce625f42737e1e0911fba7624..20387a7580b6acb00806204fa37c4438d76c869c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -8,10 +8,10 @@ ecotype-5:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index 822d8f6f0848b572238a67ca251fd11c7e46d1cc..18d5d3d3cf2d22fe916ec3ea6c1bf8f1f3e7eaf1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -8,10 +8,10 @@ ecotype-6:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index 5a19bbc0b62fb801e4a833eab48fff5390eaa12d..c47f4af964fec9341f2c6e32b3a3c38b5f1fee3f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -8,10 +8,10 @@ ecotype-7:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 897ca0de319428f68643cb112a984b313f690c12..e43a298e6c2927ad4736e21b554a11c555535d6e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -8,10 +8,10 @@ ecotype-8:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index bac9ecfc5fafa4ddc1d07b16d9093d22f5c018a7..720a63e4c3c6e856c8c945ccbc278a3187e03a7b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -8,10 +8,10 @@ ecotype-9:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 06/27/2022
+    release_date: 12/12/2023
     vendor: Dell Inc.
-    version: 2.15.0
-  bmc_version: 2.83.83.83
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R630
diff --git a/input/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.yaml b/input/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.yaml
index 0acb4b0633b41dec513494c7ca9bd1206e9c596e..fbd82f539b8feed6fcb3a2f30697d759127b14a1 100644
--- a/input/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus27/nodes/abacus27-1.yaml
@@ -23,7 +23,7 @@ abacus27-1:
       memory: 100485038080
       model: H100 NVL
       power_default_limit: 310.00 W
-      vbios_version: 96.00.74.00.11
+      vbios_version: 96.00.AF.00.02
       vendor: Nvidia
     nvidia1:
       cpu_affinity: 1
@@ -31,7 +31,7 @@ abacus27-1:
       memory: 100485038080
       model: H100 NVL
       power_default_limit: 310.00 W
-      vbios_version: 96.00.74.00.11
+      vbios_version: 96.00.AF.00.02
       vendor: Nvidia
     nvidia2:
       cpu_affinity: 1
diff --git a/input/grid5000/sites/rennes/clusters/abacus28/abacus28.yaml b/input/grid5000/sites/rennes/clusters/abacus28/abacus28.yaml
index c2ff5dbb2e5f1e73d412c38fe4d71cb961d5fda4..ee5dfe20e8de6ca53c5cd57379d91c3ed0451831 100644
--- a/input/grid5000/sites/rennes/clusters/abacus28/abacus28.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus28/abacus28.yaml
@@ -6,13 +6,13 @@ boot_type: uefi
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   abacus28-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Cascade Lake-SP
       clock_speed: 2100000000
diff --git a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e6f6fe5eeb2a4fb189683e160c8c3f36d34551e3
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
@@ -0,0 +1,307 @@
+---
+metrics:
+
+  - name: bmc_ambient_temp_celsius
+    description: Front node ambient temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == System Board Pwr Consumption }}
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS1 Current 1 }}
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS2 Current 2 }}
+
+  - name: bmc_node_power_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt-hour
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8a"}
+    description: Speed of Fan 8A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8b"}
+    description: Speed of Fan 8B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_exhaust_temp_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400      
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.yaml b/input/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.yaml
index 40a47b1af8a38bf6a4aee6a6672115fdab7b26d2..9467878a19bade8e809f6d75dbfcc2ef41d92cba 100644
--- a/input/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus28/nodes/abacus28-1.yaml
@@ -95,7 +95,7 @@ abacus28-1:
       management: true
     eth0:
       driver: i40e
-      firmware_version: 7.10 0x800075da 19.5.12
+      firmware_version: 9.50 0x8000f253 23.0.8
       interface: Ethernet
       ip: 172.16.109.31
       mac: 78:ac:44:15:dc:cc
@@ -108,7 +108,7 @@ abacus28-1:
       vendor: Intel
     eth1:
       driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.5.12
+      firmware_version: 1.67, 0x8000121e, 23.0.8
       interface: Ethernet
       mac: 78:ac:44:15:dc:ec
       management: false
@@ -119,7 +119,7 @@ abacus28-1:
       vendor: Intel
     eth2:
       driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.5.12
+      firmware_version: 1.67, 0x8000121e, 23.0.8
       interface: Ethernet
       mac: 78:ac:44:15:dc:ed
       management: false
@@ -130,7 +130,7 @@ abacus28-1:
       vendor: Intel
     eth3:
       driver: i40e
-      firmware_version: 7.10 0x800075da 19.5.12
+      firmware_version: 9.50 0x8000f253 23.0.8
       interface: Ethernet
       mac: 78:ac:44:15:dc:ce
       management: false
@@ -162,7 +162,7 @@ abacus28-1:
     pci-0000:04:00.0-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x500a075129665976"
       by_path: "/dev/disk/by-path/pci-0000:04:00.0-ata-1"
-      firmware_version: D3DJ004
+      firmware_version: D3DJ008
       model: MTFDDAV480TDS
       size: 480103981056
       storage: SSD
diff --git a/input/grid5000/sites/sophia/clusters/esterel10/esterel10.yaml b/input/grid5000/sites/sophia/clusters/esterel10/esterel10.yaml
index 2a2e070d51387d685e9c86a63f16ba0a495ab890..64cdbc08d5bb00f041c69901cbef970bc0749937 100644
--- a/input/grid5000/sites/sophia/clusters/esterel10/esterel10.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel10/esterel10.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel10-[1-3]:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Broadwell
       clock_speed: 2200000000
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..77f0b81b9fa7404345e98401f1f391dc3d6569de
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge T630
+created_at: 2025-02-25
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - production
+nodes:
+  esterel5-[1-2]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 604800
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 2200000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:03:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: SAS
+      pci-0000:03:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: SSD
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel5
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a59d3e58fa6e79bb6cb8b10b5f983dfcdf43b110
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml
@@ -0,0 +1,64 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..01a1d9cc4a46fe3b8d755cf2003233df8ca78204
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel5-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: HHS9DD2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.5
+      mac: 18:66:da:55:25:ad
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.5
+      mac: 18:66:da:55:25:ab
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:55:25:ac
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.35.5100
+      guid: '0xe41d2d0300508681'
+      interface: InfiniBand
+      ip: 172.18.131.5
+      mac: e4:1d:2d:03:00:50:86:81
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz
+    vendor: Intel
+    version: E5-2630 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da05237da001ef5b1a60da52fd9"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1999307276288
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da05237da001efabb4d24dc5b3f"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1599741100032
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..423dcca349679cfe65159b1ca899b0b0145ac2ad
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel5-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: 987KXJ2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.6
+      mac: 18:66:da:97:71:9c
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.6
+      mac: 18:66:da:97:71:9a
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:97:71:9b
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5120
+      guid: '0x248a070300f05191'
+      interface: InfiniBand
+      ip: 172.18.131.6
+      mac: 24:8a:07:03:00:f0:51:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz
+    vendor: Intel
+    version: E5-2630 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909b777e55a3d0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1999307276288
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909ca6905c1450"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1599741100032
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml b/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..77f2f0e1eb5a524c939a6e9fd493d15c0c9b7655
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge T630
+created_at: 2025-03-06
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  esterel7-[1-2]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 2100000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:03:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: RAID
+      pci-0000:03:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: RAID
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel7
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a59d3e58fa6e79bb6cb8b10b5f983dfcdf43b110
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml
@@ -0,0 +1,64 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ab6cae58b341ace4c18cac454fcb1541525314e3
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml
@@ -0,0 +1,179 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel7-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: BB6T5K2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 0
+      device: "/dev/nvidia1"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia3:
+      cpu_affinity: 1
+      device: "/dev/nvidia3"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_a3:
+      size: 8589934592
+      technology: dram
+    dimm_a4:
+      size: 8589934592
+      technology: dram
+    dimm_a5:
+      size: 8589934592
+      technology: dram
+    dimm_a6:
+      size: 8589934592
+      technology: dram
+    dimm_a7:
+      size: 8589934592
+      technology: dram
+    dimm_a8:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+    dimm_b3:
+      size: 8589934592
+      technology: dram
+    dimm_b4:
+      size: 8589934592
+      technology: dram
+    dimm_b5:
+      size: 8589934592
+      technology: dram
+    dimm_b6:
+      size: 8589934592
+      technology: dram
+    dimm_b7:
+      size: 8589934592
+      technology: dram
+    dimm_b8:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.8
+      mac: 18:66:da:a2:51:13
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.8
+      mac: 18:66:da:a2:51:11
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:a2:51:12
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5000
+      guid: '0x248a070300fb51d1'
+      interface: InfiniBand
+      ip: 172.18.131.8
+      mac: 24:8a:07:03:00:fb:51:d1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz
+    vendor: Intel
+    version: E5-2620 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c148002f61567d1024a677"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 999653638144
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c1480020e920b809a7ae57"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 399431958528
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.yaml b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..89d7004a159ba6bda9a0aa3114d9e576b51b6940
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.yaml
@@ -0,0 +1,179 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel7-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: BB6Q5K2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 0
+      device: "/dev/nvidia1"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia3:
+      cpu_affinity: 1
+      device: "/dev/nvidia3"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_a3:
+      size: 8589934592
+      technology: dram
+    dimm_a4:
+      size: 8589934592
+      technology: dram
+    dimm_a5:
+      size: 8589934592
+      technology: dram
+    dimm_a6:
+      size: 8589934592
+      technology: dram
+    dimm_a7:
+      size: 8589934592
+      technology: dram
+    dimm_a8:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+    dimm_b3:
+      size: 8589934592
+      technology: dram
+    dimm_b4:
+      size: 8589934592
+      technology: dram
+    dimm_b5:
+      size: 8589934592
+      technology: dram
+    dimm_b6:
+      size: 8589934592
+      technology: dram
+    dimm_b7:
+      size: 8589934592
+      technology: dram
+    dimm_b8:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.9
+      mac: 18:66:da:a2:43:ce
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.9
+      mac: 18:66:da:a2:43:cc
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:a2:43:cd
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5000
+      guid: '0x248a070300fb5091'
+      interface: InfiniBand
+      ip: 172.18.131.9
+      mac: 24:8a:07:03:00:fb:50:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz
+    vendor: Intel
+    version: E5-2620 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c1d4002f6154b62e16b462"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 999653638144
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c1d40020e9202d121ae4dc"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 399431958528
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2ce78d4a72b1015f93e50237ff9f0f455d53a413
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -0,0 +1,40 @@
+---
+model: Dell PowerEdge C6420
+created_at: 2025-02-24
+kavlan: true
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  mercantour5-[1-4]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Cascade Lake-SP
+      clock_speed: 2_600_000_000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+    storage_devices:
+      pci-0000:3b:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: SAS
+      pci-0000:3b:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: SSD
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: mercantour5
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5ff64ee31bfa329df172d7ac8856bc4c027257b2
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml
@@ -0,0 +1,9 @@
+---
+nodes:
+  mercantour5-[1-4]:
+    network_adapters:
+      ib0:
+        enabled: true
+        mountable: true
+        mounted: true
+        netmask: 255.255.240.0
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c11d0073c1eaf21ed82b43e7c5efa5407ecd189
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bcc59d2e7aa44a53994cf7a6b4ef9c89b3ec93ae
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 36
+    nb_procs: 2
+    nb_threads: 72
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F8FVSY2
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.42
+      mac: 6c:2b:59:9c:48:65
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.42
+      mac: 6c:2b:59:9c:4a:32
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0x98039b0300e903e1'
+      interface: InfiniBand
+      ip: 172.18.130.42
+      mac: 98:03:9b:03:00:e9:03:e1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 25952256
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+    vendor: Intel
+    version: Gold 6240
+  storage_devices:
+    pci-0000:3b:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9a320761ff0b"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 599550590976
+      storage: HDD
+    pci-0000:3b:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9b290daa83e8"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 959119884288
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2715e1692f02521f92e3828a2d291325d74fa13a
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 36
+    nb_procs: 2
+    nb_threads: 72
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: D8FVSY2
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.43
+      mac: 6c:2b:59:9c:3c:51
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.43
+      mac: 6c:2b:59:9c:3f:3a
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0xb8599f0300863081'
+      interface: InfiniBand
+      ip: 172.18.130.43
+      mac: b8:59:9f:03:00:86:30:81
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 25952256
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+    vendor: Intel
+    version: Gold 6240
+  storage_devices:
+    pci-0000:3b:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f0815397002f58570040731379"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 599550590976
+      storage: HDD
+    pci-0000:3b:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f0815397002f5857a14a070b34"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 959119884288
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c7145a76261ae277e1398408f0a6a45ff8f69a9d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-3:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 36
+    nb_procs: 2
+    nb_threads: 72
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: G8FVSY2
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.44
+      mac: 6c:2b:59:9c:46:df
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.44
+      mac: 6c:2b:59:9c:4a:6d
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0x98039b0300e90431'
+      interface: InfiniBand
+      ip: 172.18.130.44
+      mac: 98:03:9b:03:00:e9:04:31
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 25952256
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+    vendor: Intel
+    version: Gold 6240
+  storage_devices:
+    pci-0000:3b:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9a470547b034"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 599550590976
+      storage: HDD
+    pci-0000:3b:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9b6f1068ff7a"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 959119884288
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..75917bef0b3f052b2190d75b8bc4636addd8aff1
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-4:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 36
+    nb_procs: 2
+    nb_threads: 72
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: H8FVSY2
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.45
+      mac: 6c:2b:59:99:fd:38
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.45
+      mac: 6c:2b:59:9a:05:c4
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0x98039b0300e90111'
+      interface: InfiniBand
+      ip: 172.18.130.45
+      mac: 98:03:9b:03:00:e9:01:11
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 25952256
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+    vendor: Intel
+    version: Gold 6240
+  storage_devices:
+    pci-0000:3b:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081534c002f58582d04fe677b"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 599550590976
+      storage: HDD
+    pci-0000:3b:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x64cd98f081534c002f58597f12fc7111"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H330 Mini
+      size: 959119884288
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..882f8d3827c1ae0a350b9eb376fa92078c8164ac
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge R7525
+created_at: 2025-02-27
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - production
+nodes:
+  mercantour6-1:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 604800
+    processor:
+      microarchitecture: 'Zen 2'
+      clock_speed: 2900000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:01:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: RAID
+      pci-0000:01:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: RAID
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: mercantour6
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c11d0073c1eaf21ed82b43e7c5efa5407ecd189
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f2cd8c57295de4bb4d9161abdab2603282ba8167
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml
@@ -0,0 +1,146 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour6-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 64
+    nb_procs: 2
+    nb_threads: 128
+    platform_type: x86_64
+  bios:
+    release_date: 02/03/2025
+    vendor: Dell Inc.
+    version: 2.18.1
+  bmc_version: 7.20.10.05
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R7525
+    serial: 425FY63
+  main_memory:
+    ram_size: 1099511627776
+  memory_devices:
+    dimm_a1:
+      size: 68719476736
+      technology: dram
+    dimm_a2:
+      size: 68719476736
+      technology: dram
+    dimm_a3:
+      size: 68719476736
+      technology: dram
+    dimm_a4:
+      size: 68719476736
+      technology: dram
+    dimm_a5:
+      size: 68719476736
+      technology: dram
+    dimm_a6:
+      size: 68719476736
+      technology: dram
+    dimm_a7:
+      size: 68719476736
+      technology: dram
+    dimm_a8:
+      size: 68719476736
+      technology: dram
+    dimm_b1:
+      size: 68719476736
+      technology: dram
+    dimm_b2:
+      size: 68719476736
+      technology: dram
+    dimm_b3:
+      size: 68719476736
+      technology: dram
+    dimm_b4:
+      size: 68719476736
+      technology: dram
+    dimm_b5:
+      size: 68719476736
+      technology: dram
+    dimm_b6:
+      size: 68719476736
+      technology: dram
+    dimm_b7:
+      size: 68719476736
+      technology: dram
+    dimm_b8:
+      size: 68719476736
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.46
+      mac: 70:b5:e8:d7:6a:4a
+      management: true
+    eth0:
+      driver: tg3
+      firmware_version: FFV23.11.4 bc 5720-v1.39
+      interface: Ethernet
+      ip: 172.16.130.46
+      mac: f4:02:70:b9:2b:b6
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: tg3
+      firmware_version: FFV23.11.4 bc 5720-v1.39
+      interface: Ethernet
+      mac: f4:02:70:b9:2b:b7
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0x043f72030017fd91'
+      interface: InfiniBand
+      ip: 172.18.130.46
+      mac: 04:3f:72:03:00:17:fd:91
+      management: false
+      model: MT27520 Family [ConnectX-3 Pro]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: acpi_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: acpi-cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 524288
+    cache_l3: 16777216
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x830107d'
+    model: AMD EPYC
+    other_description: AMD EPYC 7542 32-Core Processor
+    vendor: AMD
+    version: 7542
+  storage_devices:
+    pci-0000:01:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x670b5e80d622090027c144d0ef5cacdf"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
+      firmware_version: 5.16
+      model: PERC H745 Frnt
+      size: 239444426752
+      storage: SSD
+    pci-0000:01:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x670b5e80d622090027c149ae2f2d9cb4"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0"
+      firmware_version: 5.16
+      model: PERC H745 Frnt
+      size: 1918239768576
+      storage: SSD
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/musa/musa.yaml b/input/grid5000/sites/sophia/clusters/musa/musa.yaml
index 4333b375260cc2f0d2781b58cb2601c3bd4d48fb..61d47818dcb1bcbc3220ce080ae41492ba3b4fac 100644
--- a/input/grid5000/sites/sophia/clusters/musa/musa.yaml
+++ b/input/grid5000/sites/sophia/clusters/musa/musa.yaml
@@ -8,6 +8,15 @@ queues:
   - admin
   - production
 nodes:
+  musa-[1-2]:
+    supported_job_types:
+      max_walltime: 21600
+  musa-[3-4]:
+    supported_job_types:
+      max_walltime: 86400
+  musa-[5-6]:
+    supported_job_types:
+      max_walltime: 172800
   musa-[1-6]:
     chassis:
       manufactured_at: 2024-12-09
@@ -15,7 +24,6 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 604800
     processor:
       microarchitecture: Zen 4
       clock_speed: 2_900_000_000
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 9ad8b5b9ddadd0ce9b4e52dc58bfbb7311a8a697..a66e11650fe36eb6654dbbe146f3188c3de8e244 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -137,10 +137,14 @@ gw:
           uid: lag4
           kind: channel
           rate: 100000000000
+        42:
+          uid: sw-6
+          kind: switch
+          rate: 10000000000
         43:
           uid: LABO
           kind: other
-          rate: 1000000000
+          rate: 10000000000
         45:
           uid: sw-3
           kind: switch
@@ -187,4 +191,4 @@ gw:
       kind: server
       rate: 200000000000
       uid: srv-scratch3
-      port: lag7
\ No newline at end of file
+      port: lag7
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index 1d305ed5bd5ec016fc36ca5337ce4d1b1e0b291d..617ea7a19baa5e6554edfdb7ca941a1604056741 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -41,15 +41,9 @@ sw-2:
         10:
           uid: pve-dmz-south-1-bmc
           kind: other
-        11:
-          uid: srv3-bmc
-          kind: other
         12:
           uid: gwol-south-bmc
           kind: other
-        27:
-          uid: srv-data
-          kind: server
         33:
           uid: esterel10-2
           port: eth1
@@ -71,3 +65,7 @@ sw-2:
           uid: gw
           kind: router
           rate: 10000000000
+        50:
+          uid: swadmin-5
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 4a2e66db01143b8a829133d4bd6678afd5d9b3f3..0c2214f487a342ae7f2a892af60314b50b2089b8 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -42,6 +42,16 @@ sw-3:
           uid: mercantour2-3
         16:
           uid: mercantour2-4
+        17:
+          uid: mercantour6-1
+        28:
+          uid: mercantour5-1
+        29:
+          uid: mercantour5-2
+        30:
+          uid: mercantour5-3
+        31:
+          uid: mercantour5-4
         33:
           uid: mercantour2-2
         34:
diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..83fc73c15e82c5e30504a469887e2459d960f3c0
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-6.yaml
@@ -0,0 +1,39 @@
+---
+sw-6:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.240
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        13:
+          uid: esterel1-1
+        14:
+          uid: esterel5-1
+        15:
+          uid: esterel5-2
+        16:
+          uid: esterel6-1
+        17:
+          uid: esterel7-1
+        18:
+          uid: esterel7-2
+        19:
+          uid: esterel27-1
+        25:
+          uid: gw
+          kind: router
+          rate: 10000000000
+        26:
+          uid: swadmin-6
+          kind: switch
+          rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1268cbf5b76d61f17efd682ff0cc416e235381d4
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -0,0 +1,49 @@
+---
+swadmin-2:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.229
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: musa-1-bmc
+          kind: other
+        2:
+          uid: musa-2-bmc
+          kind: other
+        3:
+          uid: musa-3-bmc
+          kind: other
+        4:
+          uid: musa-4-bmc
+          kind: other
+        5:
+          uid: musa-5-bmc
+          kind: other
+        6:
+          uid: musa-6-bmc
+          kind: other
+        7:
+          uid: esterel10-1-bmc
+          kind: other
+        8:
+          uid: esterel10-2-bmc
+          kind: other
+        9:
+          uid: esterel10-3-bmc
+          kind: other
+        10:
+          uid: esterel41-1-bmc
+          kind: other
+        24:
+          uid: sw-2
+          kind: switch
diff --git a/input/grid5000/sites/sophia/networks/swadmin-3.yaml b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d4635f24bed2494431a2a25acd75ffdfbd7a04b9
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
@@ -0,0 +1,86 @@
+---
+swadmin-3:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.227
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+           uid: uvb-11-bmc
+           kind: other
+        2:
+           uid: uvb-12-bmc
+           kind: other
+        3:
+           uid: mercantour1-15-bmc
+           kind: other
+        4:
+           uid: mercantour1-16-bmc
+           kind: other
+        5:
+           uid: mercantour1-11-bmc
+           kind: other
+        6:
+           uid: mercantour1-12-bmc
+           kind: other
+        7:
+           uid: mercantour1-7-bmc
+           kind: other
+        8:
+           uid: mercantour1-8-bmc
+           kind: other
+        9:
+           uid: mercantour1-3-bmc
+           kind: other
+        10:
+           uid: mercantour1-4-bmc
+           kind: other
+        12:
+           uid: mercantour2-5-bmc
+           kind: other
+        13:
+           uid: mercantour1-2-bmc
+           kind: other
+        14:
+           uid: mercantour1-1-bmc
+           kind: other
+        15:
+           uid: mercantour1-6-bmc
+           kind: other
+        16:
+           uid: mercantour1-5-bmc
+           kind: other
+        17:
+           uid: mercantour1-10-bmc
+           kind: other
+        18:
+           uid: mercantour1-9-bmc
+           kind: other
+        19:
+           uid: mercantour1-14-bmc
+           kind: other
+        20:
+           uid: mercantour1-13-bmc
+           kind: other
+        21:
+           uid: uvb-10-bmc
+           kind: other
+        22:
+           uid: uvb-9-bmc
+           kind: other
+        24:
+           uid: sw-2
+           kind: switch
+        26:
+          uid: swadmin-4
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-4.yaml b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1d17abe0fc9980277a04521a94aa8a3c9cce853b
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
@@ -0,0 +1,48 @@
+---
+swadmin-4:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.225
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: mercantour2-4-bmc
+          kind: other
+        2:
+          uid: mercantour2-3-bmc
+          kind: other
+        3:
+          uid: mercantour2-8-bmc
+          kind: other
+        4:
+          uid: mercantour2-7-bmc
+          kind: other
+        5:
+          uid: musa-5-bmc
+          kind: other
+        21:
+          uid: mercantour6-1-bmc
+          kind: other
+        22:
+          uid: mercantour2-6-bmc
+          kind: other
+        23:
+          uid: mercantour2-1-bmc
+          kind: other
+        24:
+          uid: mercantour2-2-bmc
+          kind: other
+        25:
+          uid: swadmin-3
+          kind: switch
+          rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/swadmin-5.yaml b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d99ee57173e43412d4e294814c532581c3859cf7
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
@@ -0,0 +1,20 @@
+---
+swadmin-5:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.223
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        25:
+          uid: sw-2
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7f02aff3c3010e625de23e3bc9b080f03c5348f2
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
@@ -0,0 +1,41 @@
+---
+swadmin-6:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.221
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: esterel1-1-bmc
+          kind: other
+        2:
+          uid: esterel5-1-bmc
+          kind: other
+        3:
+          uid: esterel5-2-bmc
+          kind: other
+        4:
+          uid: esterel6-1-bmc
+          kind: other
+        5:
+          uid: esterel7-1-bmc
+          kind: other
+        6:
+          uid: esterel7-2-bmc
+          kind: other
+        7:
+          uid: esterel27-1-bmc
+          kind: other
+        25:
+          uid: sw-6
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/servers/physical.yaml b/input/grid5000/sites/sophia/servers/physical.yaml
index 0878c66e1209a0148bd5be805c2678fd81febaf3..e6274fd0911b4e433a44113a442169ae54200db0 100644
--- a/input/grid5000/sites/sophia/servers/physical.yaml
+++ b/input/grid5000/sites/sophia/servers/physical.yaml
@@ -1,42 +1,4 @@
 ---
-srv3:
-  kind: physical
-  warranty: 2024-09-12
-  serial: HPKWGL2
-  network_adapters:
-    default:
-      mounted: true
-      ip: 172.16.143.6
-      mac: d0:94:66:09:4b:de
-    adm:
-      mounted: true
-      ip: 172.17.143.6
-      mac: d0:94:66:09:4b:e2
-    bmc:
-      mounted: true
-      ip: 172.17.143.16
-      mac: 50:9a:4c:ac:2e:48
-
-srv-data:
-  kind: physical
-  alias:
-    - storage11
-  warranty: 2022-11-27
-  serial: 276S992
-  network_adapters:
-    default:
-      mounted: true
-      ip: 172.16.143.5
-      mac: 14:18:77:45:B8:5F
-    bmc:
-      mounted: true
-      ip: 172.17.143.5
-      mac: 14:18:77:45:b8:63
-  group_storage:
-    name: storage11
-    size: 30000000000000
-    rate: 1000000000
-
 srv-data1:
   kind: physical
   alias:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
index 5c1ec2eeda13babb1f6be4db7bc03677d3cbf18d..bb38e97a305857f72f0e29150065b9bb7d751422 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
@@ -48,6 +48,14 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
+      eth6:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth7:
+        enabled: false
+        mountable: false
+        mounted: false
     storage_devices:
       pci-0000:47:00.0-scsi-0:2:1:0:
         id: disk0
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
index e5c5986071713ba8f07e2bfe38ef62a2838036be..e19e0cbed441c36d7a5e827e3846786237b05817 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
@@ -142,6 +142,28 @@ fleckenstein-1:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a0
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a1
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
index fb1201b7ea103b196926dff04fb67852ed6bff47..0c700cbae7e69ac0ff3605bda8ce3db1e2e15ea6 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
@@ -142,6 +142,28 @@ fleckenstein-10:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:8c
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:8d
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
index 761df1616585e6951dcd5581aba3550d936848f0..8512e81c89eb5b0dbad77b8b8495fbca6e1fa3ef 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
@@ -142,6 +142,28 @@ fleckenstein-2:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.32.2004 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:71:19:48
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.32.2004 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:71:19:49
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
index 8feb4e923f014679353734677c84425b0eaed771..552a7a526f95fdb61db7f11d23f0a1e208313474 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
@@ -142,6 +142,28 @@ fleckenstein-3:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:44
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:45
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
index 8712e1372d8ab7c4615919a097549e76b917af0f..f0230e072991a35b70fd7d98ced897d7e0f15a30 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
@@ -142,6 +142,28 @@ fleckenstein-4:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:71:19:48
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:71:19:49
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
index 81e7f185dcea06be7a0ec0c727708bbd2cefc493..683e0439b7e6e23bd8061bde00c25609dff2785b 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
@@ -142,6 +142,28 @@ fleckenstein-5:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a4
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a5
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
index a244f3ad144933f01cdc929d4510a7db38980e14..160bee7700a0d36e0feb391ced8d756232ad331c 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
@@ -142,6 +142,28 @@ fleckenstein-6:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:50
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:51
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
index 77290826d859747a6c3a147647464c63e7194d20..9c7f258cb72f808b30a99be5dc58f7d7735dc4f6 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
@@ -142,6 +142,28 @@ fleckenstein-7:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:6c
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:6d
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
index b62e7355000512c92cf63ecd36fa3dd4db07c592..0a9c6544d675ab837908d537a08fac7e179e7574 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
@@ -142,6 +142,28 @@ fleckenstein-8:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a8
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:d7:a9
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
index 17a7f27b7f701f6955e7455dc7ad0ed774f6e393..c5a6e2b1f4755f372fbf91ec23bac8176caf86f8 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
@@ -142,6 +142,28 @@ fleckenstein-9:
       sriov: true
       sriov_totalvfs: 64
       vendor: Intel
+    eth6:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:e8
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f0np0
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
+    eth7:
+      driver: mlx5_core
+      firmware_version: 22.36.1010 (MT_0000000437)
+      interface: Ethernet
+      mac: 88:e9:a4:d4:e7:e9
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: ens2f1np1
+      sriov: true
+      sriov_totalvfs: 8
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 42d54af414e9f5df21678c87e6b5b1500d2401f0..3b79a488c71e616eb7033f31cee17df8e21a2008 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -71,6 +71,10 @@ vlans:
       local grenoble servan eth0 0 0 4 0
       local grenoble servan fpga0 0 0 4 10
       local grenoble servan fpga1 0 0 4 20
+      local grenoble kinovis eth0 0 0 5 0
+      local grenoble kinovis eth1 0 0 5 10
+      local grenoble kinovis eth2 0 0 5 20
+      local grenoble chartreuse2 eth0 0 0 6 0
       local lille chifflot eth0 0 0 4 0
       local lille chifflot eth1 0 0 5 0
       local lille chiclet eth0 0 0 6 0
@@ -216,8 +220,13 @@ vlans:
       global grenoble servan fpga0 0 0 35 10
       global grenoble servan fpga1 0 0 35 20
       global rennes paradoxe eth0 0 0 36 0
-      global sophia uvb eth0 0 0 40 0
-      global sophia musa eth0 0 0 39 0
+      global sophia mercantour1 eth0 0 0 37 0
+      global sophia mercantour2 eth0 0 0 37 16
+      global sophia mercantour3 eth0 0 0 37 24
+      global sophia mercantour4 eth0 0 0 37 40
+      global sophia mercantour5 eth0 0 0 37 41
+      global sophia mercantour6 eth0 0 0 37 45
+      global sophia mercantour7 eth0 0 0 37 46
       global sophia esterel1 eth0 0 0 38 0
       global sophia esterel2 eth0 0 0 38 1
       global sophia esterel3 eth0 0 0 38 2
@@ -259,13 +268,8 @@ vlans:
       global sophia esterel39 eth0 0 0 38 52
       global sophia esterel40 eth0 0 0 38 53
       global sophia esterel41 eth0 0 0 38 55
-      global sophia mercantour1 eth0 0 0 37 0
-      global sophia mercantour2 eth0 0 0 37 16
-      global sophia mercantour3 eth0 0 0 37 24
-      global sophia mercantour4 eth0 0 0 37 40
-      global sophia mercantour5 eth0 0 0 37 41
-      global sophia mercantour6 eth0 0 0 37 45
-      global sophia mercantour7 eth0 0 0 37 46
+      global sophia musa eth0 0 0 39 0
+      global sophia uvb eth0 0 0 40 0
       global nancy gruss eth2 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
@@ -284,6 +288,10 @@ vlans:
       global rennes roazhon7 eth0 0 0 53 10
       global rennes roazhon8 eth0 0 0 53 20
       global rennes roazhon9 eth0 0 0 53 30
+      global grenoble kinovis eth0 0 0 54 0
+      global grenoble kinovis eth1 0 0 54 10
+      global grenoble kinovis eth2 0 0 54 20
+      global grenoble chartreuse2 eth0 0 0 55 0
       routed grenoble yeti eth0 0 4 0 0
       routed grenoble dahu eth0 0 4 1 0
       routed grenoble troll eth0 0 4 2 0
@@ -291,6 +299,10 @@ vlans:
       routed grenoble servan eth0 0 4 4 0
       routed grenoble servan fpga0 0 4 4 10
       routed grenoble servan fpga1 0 4 4 20
+      routed grenoble kinovis eth0 0 4 5 0
+      routed grenoble kinovis eth1 0 4 5 10
+      routed grenoble kinovis eth2 0 4 5 20
+      routed grenoble chartreuse2 eth0 0 4 6 0
       routed lille chifflot eth0 0 8 4 0
       routed lille chifflot eth1 0 8 5 0
       routed lille chiclet eth0 0 8 6 0
diff --git a/lib/refrepo/csv_importer.rb b/lib/refrepo/csv_importer.rb
index 461433328b1820690d066e4d3f5d234b794a5748..8396e4c7db9c0d210ed743680f0ab49ef73cec98 100644
--- a/lib/refrepo/csv_importer.rb
+++ b/lib/refrepo/csv_importer.rb
@@ -34,8 +34,8 @@ queues:
 nodes:
   #{cluster}-#{nodes_count == 1 ? '1' : "[1-#{nodes_count}]"}:
     chassis:
-      manufactured_at: 1970-01-01 # TODO: Put date.
-      warranty_end: 1970-01-01 # TODO: Put date.
+      manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
+      warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
     supported_job_types:
       deploy: true
       besteffort: true
diff --git a/lib/refrepo/data_loader.rb b/lib/refrepo/data_loader.rb
index ed19e5ea02463b4eaf45e4ce9f909b35e995d09b..0b56bb4ce9b54ed425251abe683d781808225629 100644
--- a/lib/refrepo/data_loader.rb
+++ b/lib/refrepo/data_loader.rb
@@ -12,7 +12,7 @@ def load_data_hierarchy
     # Recursively list the .yaml files.
     # The order in which the results are returned depends on the system (http://ruby-doc.org/core-2.2.3/Dir.html).
     # => List deepest files first as they have lowest priority when hash keys are duplicated.
-    list_of_files = Dir['**/*.json'].sort_by { |x| -x.count('/') }
+    list_of_files = Dir['**/*.json'].sort_by { |x| [-x.count('/'), x] }
 
     list_of_files.each do |filename|
       # Load JSON
diff --git a/lib/refrepo/g5kchecks_importer.rb b/lib/refrepo/g5kchecks_importer.rb
index d5b280d0c4a29c513e35c30c9fbe6dcf7ac5b912..5e5bb94c57f8034f8c4f5148d722b1de2b24a1db 100644
--- a/lib/refrepo/g5kchecks_importer.rb
+++ b/lib/refrepo/g5kchecks_importer.rb
@@ -1,6 +1,6 @@
 require 'refrepo/hash/hash'
 
-INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 ibp130s0 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100)
+INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 ibp130s0 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100)
 
 def g5kchecks_importer(sourcedir)
   puts "Importing source files from #{sourcedir} into input directory..."
diff --git a/lib/refrepo/gen/puppet/clusters.rb b/lib/refrepo/gen/puppet/clusters.rb
index d75dfcf55f1732315c3580fbcdb591725eca6489..692f3240011eb3b0278e18683651f7f9b7426999 100644
--- a/lib/refrepo/gen/puppet/clusters.rb
+++ b/lib/refrepo/gen/puppet/clusters.rb
@@ -17,7 +17,7 @@ def generate_puppet_clusters(options)
             puts "Add #{s_uid}"
             hiera[s_uid] = {}
         end
-        s_hash['clusters'].sort_by{|c_uid, _c_hash| [c_uid[/(\D+)/, 1], c_uid[/(\d+)/, 1].to_i]}.each do |c_uid, c_hash|
+        s_hash['clusters'].sort_by{|c_uid, _c_hash| split_cluster_node(c_uid) }.each do |c_uid, c_hash|
             if ! hiera[s_uid].key? c_uid
                 puts "  Add #{s_uid}"
                 hiera[s_uid][c_uid] = {}
@@ -46,4 +46,4 @@ def generate_puppet_clusters(options)
 
     outfile = File.open("#{options[:conf_dir]}clusters.yaml", "w")
     outfile.write({'grid5000::clusters' => hiera}.to_yaml)
-end
\ No newline at end of file
+end
diff --git a/lib/refrepo/gen/puppet/oarsub-simplifier-aliases.rb b/lib/refrepo/gen/puppet/oarsub-simplifier-aliases.rb
index 29a6d27be0612a2e71ebbecb6a20324cfd7caadb..c50c8fe6faa85da3e416a9383de70018f332e32d 100644
--- a/lib/refrepo/gen/puppet/oarsub-simplifier-aliases.rb
+++ b/lib/refrepo/gen/puppet/oarsub-simplifier-aliases.rb
@@ -61,7 +61,7 @@ def generate_all_sites_aliases
       aliases[site][cluster] = "cluster='#{cluster}'"
       aliases[site]["#{cluster}-%d"] = "host='#{cluster}-%d.#{site}.grid5000.fr'"
     end
-    aliases[site] = aliases[site].sort_by { |cluster, _| [cluster[/(\D+)/, 1], cluster[/(\d+)/, 1].to_i] }.to_h
+    aliases[site] = aliases[site].sort_by { |cluster, _| split_cluster_node(cluster) }.to_h
   end
 
   aliases = aliases.sort_by { |site, _| site }.to_h
diff --git a/lib/refrepo/gen/puppet/webfish.rb b/lib/refrepo/gen/puppet/webfish.rb
index ad234f0295abff4f188122b4c5ec06c88be1c392..7fdf0ed813d3244a39fed1c6b674938540f9683d 100644
--- a/lib/refrepo/gen/puppet/webfish.rb
+++ b/lib/refrepo/gen/puppet/webfish.rb
@@ -101,7 +101,7 @@ def gen_json_files(allBmc, options)
     dir = "#{options[:output_dir]}/platforms/production/modules/generated/files/grid5000/webfish"
     checks_dir_creation(dir)
     allBmc.sort_by{ |s_site, _d_site| s_site}.each do |s_site, _d_array|
-        actualFile = allBmc[s_site].sort_by{|k, _| [k[/(\D+)/, 1], k[/(\d+)/, 1].to_i, k[/-(\d+)/, 1].to_i]}.to_h
+        actualFile = allBmc[s_site].sort_by{|k, _| split_cluster_node(k) }.to_h
         siteLocation = dir + "/" + s_site
         checks_dir_creation(siteLocation)
         fileLocation =  siteLocation + "/webfish.json"
@@ -109,4 +109,4 @@ def gen_json_files(allBmc, options)
             f.write(JSON.pretty_generate(actualFile))
         end
     end
-end
\ No newline at end of file
+end
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 242b92695e8c3b0d523cc31c12b6ac0eee64b2c8..70cbc542478d9e92b5be7a12fcf33d6df300eff0 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
       #
@@ -154,7 +196,7 @@ def generate_reference_api
         node["storage_devices"] = node["storage_devices"].sort_by{ |_sd, v| v['id'] }.map { |a| a[1] }
 
         node["network_adapters"].each { |key, _hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash
-        node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1", "ibs3", "ibs4", "ibp130s0", "bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
+        node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6","eth7", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1", "ibs3", "ibs4", "ibp130s0", "bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
         node["memory_devices"].each { |key, _hash| node["memory_devices"][key]["device"] = key; } # Add "device: dimm_a1" within the hash
         node["memory_devices"] = node["memory_devices"].sort_by { |d, _|
           [d.gsub(/dimm_(\d+)/, '\1').to_i,
@@ -165,6 +207,16 @@ 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
+      first_node = cluster['nodes'].values.select { |x| not x['status'] == 'retired' }.sort_by { |x| split_cluster_node(x['uid']) }.first # use first non-retired node
+      cluster['nodes_description'] = gen_node_description(first_node)
+
+      # Write cluster info w/o nodes entries
+      write_json(cluster_path.join("#{cluster_uid}.json"),
+                 cluster.reject {|k, _v| k == "nodes"})
+
     end
 
   end
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index b921ac24a708b9c0d1856bcd77f36728f213cb91..12ec69699e921ee65f101f0b82f064089efa867e 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -189,7 +189,7 @@ class SiteHardwareGenerator < WikiGenerator
       site_accelerators += cluster_hash.select { |_k, v| v['accelerators'] != '' }.count
     }
 
-    hardware[site].sort_by{|cluster_uid, _cluster_hash| [cluster_uid[/(\D+)/, 1], cluster_uid[/(\d+)/, 1].to_i]}.to_h.each { |cluster_uid, cluster_hash|
+    hardware[site].sort_by{|cluster_uid, _cluster_hash| split_cluster_node(cluster_uid) }.to_h.each { |cluster_uid, cluster_hash|
       cluster_nodes = cluster_hash.keys.flatten.count
       queue = cluster_hash.map { |_k, v| v['queue']}.first
       access_conditions = []
@@ -253,7 +253,7 @@ class SiteHardwareGenerator < WikiGenerator
       else
         text_data << "\n= Clusters in the #{queue} queue ="
       end
-      clusters.sort_by{|cluster_uid, _cluster_hash| [cluster_uid[/(\D+)/, 1], cluster_uid[/(\d+)/, 1].to_i]}.to_h.each { |cluster_uid, cluster_hash|
+      clusters.sort_by{|cluster_uid, _cluster_hash| split_cluster_node(cluster_uid) }.to_h.each { |cluster_uid, cluster_hash|
         subclusters = cluster_hash.keys.count != 1
         cluster_nodes = cluster_hash.keys.flatten.count
         cluster_cpus = cluster_hash.map { |k, v| k.count * v['cpus_per_node'] }.reduce(:+)
diff --git a/lib/refrepo/gpu_ref.rb b/lib/refrepo/gpu_ref.rb
index f3b8ca0ebf0df7be881b894fd321342efb77432b..b047ccaff1f2cfdfffdfb5f7c3e0fd7448bb677a 100644
--- a/lib/refrepo/gpu_ref.rb
+++ b/lib/refrepo/gpu_ref.rb
@@ -20,6 +20,18 @@ class GPURef
         'fp-64' => 420000000000,
       },
     },
+    'GeForce GTX 1080' => {
+      'cores'              => 2560,
+      'compute_capability' => '6.1',
+      'short_name'         => 'GTX 1080',
+      'alias'              => 'gtx1080',
+      'microarchitecture'  => 'Pascal',
+      'performance'        => {
+        'fp-16' => 138600000000,
+        'fp-32' => 8872000000000,
+        'fp-64' => 277200000000,
+      },
+    },
     'GeForce GTX 1080 Ti' => {
       'cores'              => 3584,
       'compute_capability' => '6.1',
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 11daefda2fb5bbe86120ddd47c228208b0e190c5..df08b5111e207255dd39a975c4393ad3026c6e80 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
     case cpu_name
     when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
       return 16
-    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
+    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
       return 32
     end
     raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index d8522435d53977475cd70df8458b0634819e6e1f..e36217d4b4fc3db03f5d9fd3bd30c42d6cbb0ac8 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -117,6 +117,9 @@ drac:
   enP1p1s0f3: eth3
   enP9p7s0f0: eth4
   enP9p7s0f1: eth5
+chartreuse2:
+  enp129s0f0: eth0
+  enp129s0f1: eth1
 econome:
   eno1: eth2
   eno2: eth3
@@ -134,6 +137,8 @@ fleckenstein:
   ens1f1: eth3
   ens1f2: eth4
   ens1f3: eth5
+  ens2f0np0: eth6
+  ens2f1np1: eth7
 gemini:
   enp1s0f0: eth0
   enp1s0f1: eth1
@@ -224,6 +229,14 @@ kinovis:
 mercantour2:
   enp1s0f0np0: eth0
   eno2: eth1
+mercantour5:
+  enp1s0f0np0: eth0
+  ibp94s0: ib0
+mercantour6:
+  enp1s0f0np0: eth0
+  eno1: eth0
+  eno2: eth1
+  ibp65s0: ib0
 montcalm:
   ens10f0np0: eth0
   ens10f1np1: eth1
@@ -365,6 +378,18 @@ vianden:
   eno8303: eth4
   eno8403: eth5
   enp158s0np0: eth6
+esterel5:
+  eno1: eth0
+  eno2: eth1
+  enp1s0f0np0: eth0
+  enp1s0f1: eth1
+  ibp130s0: ib0
+esterel7:
+  eno1: eth0
+  eno2: eth1
+  enp1s0f0np0: eth0
+  enp1s0f1: eth1
+  ibp130s0: ib0
 esterel10:
   eno1: eth0
   eno2: eth1
diff --git a/lib/refrepo/utils.rb b/lib/refrepo/utils.rb
index aa7c1f5e2fce0d09e644f89bd553eed8abb839af..772ed3b3f398bcd90f5a9f891726849b9e884f45 100644
--- a/lib/refrepo/utils.rb
+++ b/lib/refrepo/utils.rb
@@ -52,3 +52,7 @@ class Hash
     h2
   end
 end
+
+def split_cluster_node(k)
+  [k[/([a-z]+)/, 1], k[/[a-z](\d+)/, 1].to_i, k[/-(\d+)/, 1].to_i]
+end
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 7bec915ae91a44eaacfaf3a8cda266bbdc74a1ab..e40944ff354a819d807500b07c1313c801bd7eae 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -420,6 +420,8 @@ rennes:
     - ~storage_devices.pci-0000:64:00.0-scsi-0:2:3:0.model
     - ~storage_devices.pci-0000:64:00.0-scsi-0:2:3:0.firmware_version
 sophia:
+  esterel5-2: # different IB firmware version
+    - ~network_adapters.ib0.firmware_version
   esterel10-3: # 3 GPUs instead of 4
     - -gpu_devices.nvidia3
     - ~gpu_devices.nvidia1.cpu_affinity
@@ -434,6 +436,9 @@ sophia:
     - ~chassis.manufacturer
 #toulouse:
 strasbourg:
+  fleckenstein-[2-3]:
+    - ~network_adapters.eth6.firmware_version
+    - ~network_adapters.eth7.firmware_version
   fleckenstein-4:
     - ~bios.release_date
     - ~bmc_version
diff --git a/lib/refrepo/valid/homogeneity.rb b/lib/refrepo/valid/homogeneity.rb
index bf2910ce9ce02ee6412e95aa1454f135fa9ccb9b..128ab1de22d3b285653dc5117058137047c46d4d 100644
--- a/lib/refrepo/valid/homogeneity.rb
+++ b/lib/refrepo/valid/homogeneity.rb
@@ -71,7 +71,7 @@ eos
     ['~', /\.*fpga\.*/],
   ]
 
-  (0..5).each { |eth|
+  (0..7).each { |eth|
     keys = ignore_netkeys.gsub('.eth.', ".eth#{eth}.").gsub("\n", " ").split(" ")
     ignore_keys.push(* keys)